summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2022-10-31 14:39:35 +0000
committerormorph <roma251078@mail.ru>2022-10-31 15:40:12 +0000
commit34d0378bc17e913b037ce9edccf0b6c7250ed840 (patch)
treec62c66d2e7b4bf6befaf22bc3a519a5e0e02e6c7
parentd810c2294aa64baa38626682d18dbc6d9acce348 (diff)
downloadtde-packaging-gentoo-34d0378bc17e913b037ce9edccf0b6c7250ed840.tar.gz
tde-packaging-gentoo-34d0378bc17e913b037ce9edccf0b6c7250ed840.zip
Fixed shortcomings of TDM ebuilds
Signed-off-by: ormorph <roma251078@mail.ru>
-rw-r--r--trinity-base/tdm/metadata.xml6
-rw-r--r--trinity-base/tdm/tdm-14.0.12.ebuild8
-rw-r--r--trinity-base/tdm/tdm-14.0.13.ebuild10
-rw-r--r--trinity-base/tdm/tdm-9999.ebuild8
4 files changed, 16 insertions, 16 deletions
diff --git a/trinity-base/tdm/metadata.xml b/trinity-base/tdm/metadata.xml
index 2a40b214..3cae580e 100644
--- a/trinity-base/tdm/metadata.xml
+++ b/trinity-base/tdm/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>fatzer2@gmail.com</email>
- <name>Alexander Golubev</name>
+ <maintainer type="project">
+ <email>team-gentoo@trinitydesktop.org</email>
+ <name>Trinity Gentoo ebuilds project</name>
</maintainer>
<use>
<flag name="xdmcp">Support for <pkg>x11-libs/libXdmcp</pkg></flag>
diff --git a/trinity-base/tdm/tdm-14.0.12.ebuild b/trinity-base/tdm/tdm-14.0.12.ebuild
index 7a6763b2..06cbc65e 100644
--- a/trinity-base/tdm/tdm-14.0.12.ebuild
+++ b/trinity-base/tdm/tdm-14.0.12.ebuild
@@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/"
-inherit trinity-meta-2
+inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then
@@ -52,7 +52,7 @@ src_configure() {
}
src_install() {
- cmake_src_install
+ trinity-meta-2_src_install
# Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
@@ -99,8 +99,8 @@ pkg_postinst() {
fi
fi
if [[ "$sak_ok" != yes ]]; then
- sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \
- "${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
+ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
+ "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else
diff --git a/trinity-base/tdm/tdm-14.0.13.ebuild b/trinity-base/tdm/tdm-14.0.13.ebuild
index 7a6763b2..e801ca1b 100644
--- a/trinity-base/tdm/tdm-14.0.13.ebuild
+++ b/trinity-base/tdm/tdm-14.0.13.ebuild
@@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/"
-inherit trinity-meta-2
+inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then
@@ -52,11 +52,11 @@ src_configure() {
}
src_install() {
- cmake_src_install
+ trinity-meta-2_src_install
# Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
- "${D}/${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
+ "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
# Install XSession upstream script seems to be debian-cpecific
cp "${FILESDIR}/${PN}-14.0.8-xsession.script" "${D}/${TDEDIR}/share/config/tdm/Xsession" || die
@@ -99,8 +99,8 @@ pkg_postinst() {
fi
fi
if [[ "$sak_ok" != yes ]]; then
- sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \
- "${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
+ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
+ "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index d1c8c352..a6fcc57a 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/"
-inherit trinity-meta-2
+inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then
@@ -52,7 +52,7 @@ src_configure() {
}
src_install() {
- cmake_src_install
+ trinity-meta-2_src_install
# Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
@@ -99,8 +99,8 @@ pkg_postinst() {
fi
fi
if [[ "$sak_ok" != yes ]]; then
- sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \
- "${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
+ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
+ "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else