TDE
/
tde-packaging-gentoo
5
1
Fork 0
Code Issues 16 Pull Requests 2 Releases Wiki Activity

Fixed shortcomings of TDM ebuilds

Browse Source 
Signed-off-by: ormorph <roma251078@mail.ru>
pull/275/head
ormorph 2 years ago
parent d810c2294a
commit 34d0378bc1
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

6
trinity-base/tdm/metadata.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<maintainer type="person"> <maintainer type="project">
<email>fatzer2@gmail.com</email> <email>team-gentoo@trinitydesktop.org</email>
<name>Alexander Golubev</name> <name>Trinity Gentoo ebuilds project</name>
</maintainer> </maintainer>
<use> <use>
<flag name="xdmcp">Support for <pkg>x11-libs/libXdmcp</pkg></flag> <flag name="xdmcp">Support for <pkg>x11-libs/libXdmcp</pkg></flag>

8
trinity-base/tdm/tdm-14.0.12.ebuild
Unescape View File

@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase" TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core" TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/" TSM_EXTRACT_ALSO="translations/"
inherit trinity-meta-2 inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM" DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then if [[ ${PV} != *9999* ]] ; then
@ -52,7 +52,7 @@ src_configure() {
} }
src_install() { src_install() {
cmake_src_install trinity-meta-2_src_install
# Customize the tdmrc configuration # Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
@ -99,8 +99,8 @@ pkg_postinst() {
fi fi
fi fi
if [[ "$sak_ok" != yes ]]; then if [[ "$sak_ok" != yes ]]; then
sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
"${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed" "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true" ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc " ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else else

10
trinity-base/tdm/tdm-14.0.13.ebuild
Unescape View File

@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase" TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core" TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/" TSM_EXTRACT_ALSO="translations/"
inherit trinity-meta-2 inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM" DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then if [[ ${PV} != *9999* ]] ; then
@ -52,11 +52,11 @@ src_configure() {
} }
src_install() { src_install() {
cmake_src_install trinity-meta-2_src_install
# Customize the tdmrc configuration # Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ 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 # Install XSession upstream script seems to be debian-cpecific
cp "${FILESDIR}/${PN}-14.0.8-xsession.script" "${D}/${TDEDIR}/share/config/tdm/Xsession" || die cp "${FILESDIR}/${PN}-14.0.8-xsession.script" "${D}/${TDEDIR}/share/config/tdm/Xsession" || die
@ -99,8 +99,8 @@ pkg_postinst() {
fi fi
fi fi
if [[ "$sak_ok" != yes ]]; then if [[ "$sak_ok" != yes ]]; then
sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
"${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed" "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true" ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc " ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else else

8
trinity-base/tdm/tdm-9999.ebuild
Unescape View File

@ -7,7 +7,7 @@ EAPI="8"
TRINITY_MODULE_NAME="tdebase" TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_TYPE="core" TRINITY_MODULE_TYPE="core"
TSM_EXTRACT_ALSO="translations/" TSM_EXTRACT_ALSO="translations/"
inherit trinity-meta-2 inherit linux-info trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM" DESCRIPTION="Trinity login manager, similar to XDM and GDM"
if [[ ${PV} != *9999* ]] ; then if [[ ${PV} != *9999* ]] ; then
@ -52,7 +52,7 @@ src_configure() {
} }
src_install() { src_install() {
cmake_src_install trinity-meta-2_src_install
# Customize the tdmrc configuration # Customize the tdmrc configuration
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
@ -99,8 +99,8 @@ pkg_postinst() {
fi fi
fi fi
if [[ "$sak_ok" != yes ]]; then if [[ "$sak_ok" != yes ]]; then
sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \ sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSAK=false:' \
"${D}${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed" "${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true" ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true"
ewarn "in ${TDEDIR}/share/config/tdm/tdmrc " ewarn "in ${TDEDIR}/share/config/tdm/tdmrc "
else else

Write Preview
Loading…
Cancel
Save