diff options
author | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
---|---|---|
committer | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
commit | 55d2aaa4eb5201ac97e269fc141e4ee1778379b8 (patch) | |
tree | 810ece5e004aa9e97e26a1ad988ed52552175fb6 /trinity-base/kdm | |
parent | 644110a847c5911c2eb04eb53c93031740561efc (diff) | |
download | tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.tar.gz tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.zip |
Clean up and fix TDE Gentoo overlay.
- Remove old v3.5.13 ebuilds and eclasses
- Change repo URL to official TGW
- Remove old HAL and traces (TDEHW is used now)
- Make split between TDE applications and tdebase consistent
- Move TQt into own category (for users filtering dev-qt/ out)
- Change to new TQTDIR var
- Move away from virtual/pam dependency
- Change to use new xorg-proto dependency
- Some cosmetic fixes and removal of unneeded files
- Remove some now obsolete patches
- Change to clean 9999 naming scheme for anything
- Add some potential workaround for newer portage versions
- Add own README
... thanks to Aggi from IRC for some fixes too.
Signed-off-by: Chris <xchrisx@uber.space>
Diffstat (limited to 'trinity-base/kdm')
-rw-r--r-- | trinity-base/kdm/Manifest | 2 | ||||
-rwxr-xr-x | trinity-base/kdm/files/kdm-3.5.13.1-xsession.script | 66 | ||||
-rwxr-xr-x | trinity-base/kdm/files/kdm-3.5.13.2-xsession.script | 66 | ||||
-rw-r--r-- | trinity-base/kdm/kdm-3.5.13.1.ebuild | 105 | ||||
-rw-r--r-- | trinity-base/kdm/kdm-3.5.13.2.ebuild | 103 | ||||
-rw-r--r-- | trinity-base/kdm/metadata.xml | 12 |
6 files changed, 0 insertions, 354 deletions
diff --git a/trinity-base/kdm/Manifest b/trinity-base/kdm/Manifest deleted file mode 100644 index 381340c4..00000000 --- a/trinity-base/kdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kdebase-3.5.13.1.tar.gz 29403228 SHA256 ddd4bd4b508ad027b9d1af2701c6ba64bfc9f8f1d32099e6dd5e7866714f759e SHA512 e1aac19c941a5f2b43a57928fdb43e5ebd646f49c60911d9d317550df96642870792c4e77ecd06e123244e2425ccd4bcb00f0a21011ba7e651d7fcf4553e79cf WHIRLPOOL 931debbf6a65c280221025dcbc02cbb3387b66eb72eddd28a510ee8f97075cd2cc96535dde25d0a32280c399e4a868e9c027772f5d28e7e79b7c1a9080c58034 -DIST kdebase-trinity-3.5.13.2.tar.xz 25890636 SHA256 b9d552226daff64437dfb9699669b95dd7ebc2ca7c43755ba71c10cc6c9ed789 SHA512 df545d44c7d4550d1d77ff6504572b622853c2b8d80062b1aee1a5bdca19f0e708cde35cff54cf2d5098f06a41bde0c89522a3958dea9bb18205dea87c11b797 WHIRLPOOL 79144273bc7985c59a593a3394b12a2053532d2c4c890ce96adad21f6de0413baf3c6270d6d06173ec4546b20d401aa0cc81603d01b8ee41dbdefc825b39b2b1 diff --git a/trinity-base/kdm/files/kdm-3.5.13.1-xsession.script b/trinity-base/kdm/files/kdm-3.5.13.1-xsession.script deleted file mode 100755 index 3106eea9..00000000 --- a/trinity-base/kdm/files/kdm-3.5.13.1-xsession.script +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/sh -# Xsession - run as user - -session=$1 - -# Note that the respective logout scripts are not sourced. -case $SHELL in - */bash) - [ -z "$BASH" ] && exec $SHELL $0 "$@" - set +o posix - [ -f /etc/profile ] && . /etc/profile - if [ -f $HOME/.bash_profile ]; then - . $HOME/.bash_profile - elif [ -f $HOME/.bash_login ]; then - . $HOME/.bash_login - elif [ -f $HOME/.profile ]; then - . $HOME/.profile - fi - ;; - */zsh) - [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" - emulate -R zsh - [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc - zhome=${ZDOTDIR:-$HOME} - # zshenv is always sourced automatically. - [ -f $zdir/zprofile ] && . $zdir/zprofile - [ -f $zhome/.zprofile ] && . $zhome/.zprofile - [ -f $zdir/zlogin ] && . $zdir/zlogin - [ -f $zhome/.zlogin ] && . $zhome/.zlogin - setopt shwordsplit noextendedglob - ;; - */csh|*/tcsh) - # [t]cshrc is always sourced automatically. - # Note that sourcing csh.login after .cshrc is non-standard. - xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` - $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp" - . $xsess_tmp - rm -f $xsess_tmp - ;; - *) # Plain sh, ksh, and anything we don't know. - [ -f /etc/profile ] && . /etc/profile - [ -f $HOME/.profile ] && . $HOME/.profile - ;; -esac - -[ -f /etc/xprofile ] && . /etc/xprofile -[ -f $HOME/.xprofile ] && . $HOME/.xprofile - -case $session in - "") - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - ;; - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - custom) - exec /bin/sh $HOME/.xsession - ;; - default) - exec /usr/trinity/3.5/bin/starttde - ;; - *) - eval exec "$session" - ;; -esac -exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/trinity-base/kdm/files/kdm-3.5.13.2-xsession.script b/trinity-base/kdm/files/kdm-3.5.13.2-xsession.script deleted file mode 100755 index 3106eea9..00000000 --- a/trinity-base/kdm/files/kdm-3.5.13.2-xsession.script +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/sh -# Xsession - run as user - -session=$1 - -# Note that the respective logout scripts are not sourced. -case $SHELL in - */bash) - [ -z "$BASH" ] && exec $SHELL $0 "$@" - set +o posix - [ -f /etc/profile ] && . /etc/profile - if [ -f $HOME/.bash_profile ]; then - . $HOME/.bash_profile - elif [ -f $HOME/.bash_login ]; then - . $HOME/.bash_login - elif [ -f $HOME/.profile ]; then - . $HOME/.profile - fi - ;; - */zsh) - [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" - emulate -R zsh - [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc - zhome=${ZDOTDIR:-$HOME} - # zshenv is always sourced automatically. - [ -f $zdir/zprofile ] && . $zdir/zprofile - [ -f $zhome/.zprofile ] && . $zhome/.zprofile - [ -f $zdir/zlogin ] && . $zdir/zlogin - [ -f $zhome/.zlogin ] && . $zhome/.zlogin - setopt shwordsplit noextendedglob - ;; - */csh|*/tcsh) - # [t]cshrc is always sourced automatically. - # Note that sourcing csh.login after .cshrc is non-standard. - xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` - $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp" - . $xsess_tmp - rm -f $xsess_tmp - ;; - *) # Plain sh, ksh, and anything we don't know. - [ -f /etc/profile ] && . /etc/profile - [ -f $HOME/.profile ] && . $HOME/.profile - ;; -esac - -[ -f /etc/xprofile ] && . /etc/xprofile -[ -f $HOME/.xprofile ] && . $HOME/.xprofile - -case $session in - "") - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - ;; - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - custom) - exec /bin/sh $HOME/.xsession - ;; - default) - exec /usr/trinity/3.5/bin/starttde - ;; - *) - eval exec "$session" - ;; -esac -exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/trinity-base/kdm/kdm-3.5.13.1.ebuild b/trinity-base/kdm/kdm-3.5.13.1.ebuild deleted file mode 100644 index 42cac2ed..00000000 --- a/trinity-base/kdm/kdm-3.5.13.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -TRINITY_MODULE_NAME="kdebase" - -inherit trinity-meta linux-info - -TSM_EXTRACT_ALSO="sak" - -DESCRIPTION="Trinity login manager, similar to xdm and gdm" -KEYWORDS="x86 amd64" -IUSE="pam xdmcp xcomposite sak" - -DEPEND="pam? ( trinity-base/tdebase-pam ) - xdmcp? ( x11-libs/libXdmcp ) - xcomposite? ( x11-libs/libXcomposite ) - sys-apps/dbus - x11-libs/libXrandr - x11-libs/libXtst - >=trinity-base/kcontrol-${PV}:${SLOT} - dev-libs/dbus-tqt" - -RDEPEND="${DEPEND} - >=trinity-base/kdepasswd-${PV}:${SLOT} - x11-apps/xinit - x11-apps/xmessage" - -pkg_setup() { - trinity-meta_pkg_setup; - use sak && TRINITY_SUBMODULE+=" tsak" -} - -src_configure() { - mycmakeargs=( - -DWITH_XTEST=ON - -DWITH_LIBART=ON - -DWITH_XRANDR=ON - -DWITH_SHADOW=ON - $(cmake-utils_use_with xcomposite XCOMPOSITE ) - $(cmake-utils_use_with xdmcp XDMCP ) - $(cmake-utils_use_with pam PAM ) - ) - - trinity-meta_src_configure -} - -src_install() { - cmake-utils_src_install - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}${TDEDIR}/share/config/kdm/kdmrc" || die "sed kdmrc failed" - - # install XSession upstream script seems to be debian-cpecific - cp "${FILESDIR}/${P}-xsession.script" "${D}/${TDEDIR}/share/config/kdm/Xsession" - -} - -pkg_postinst() { - local sak_ok - # set the default kdm face icon if it's not already set by the system admin - # because this is user-overrideable in that way, it's not in src_install - if [ ! -e "${ROOT}${TDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then - mkdir -p "${ROOT}${TDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${TDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${TDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [ ! -e "${ROOT}${TDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then - mkdir -p "${ROOT}${TDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${TDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${TDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - if use sak; then - sak_ok=yes - if ! linux_config_exists; then - ewarn "Can't check the linux kernel configuration." - ewarn "You might have some incompatible options enabled." - sak_ok=no - else - if ! linux_chkconfig_present INPUT_UINPUT; then - eerror "You build kdm with sak feature enabled. " - eerror "It requires the INPUT_UINPUT support enabled." - eerror "Please enable it:" - eerror " CONFIG_INPUT_UINPUT=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Input device support --->" - eerror " [*] Miscellaneous devices --->" - eerror " <*> User level driver support" - sak_ok=no - fi - fi - if [[ "$sak_ok" != yes ]]; then - sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \ - "${D}${TDEDIR}/share/config/kdm/kdmrc" || die "sed kdmrc failed" - ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true " - ewarn "in ${TDEDIR}/share/config/kdm/kdmrc " - else - ewarn "SAK feature is enabled. You can disable it yourself by setting UseSAK=false" - ewarn "in ${TDEDIR}/share/config/kdm/kdmrc " - fi - fi -} diff --git a/trinity-base/kdm/kdm-3.5.13.2.ebuild b/trinity-base/kdm/kdm-3.5.13.2.ebuild deleted file mode 100644 index 79759dab..00000000 --- a/trinity-base/kdm/kdm-3.5.13.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -TRINITY_MODULE_NAME="kdebase" - -inherit trinity-meta linux-info - -DESCRIPTION="Trinity login manager, similar to xdm and gdm" -KEYWORDS="~amd64 ~x86" -IUSE="pam xdmcp xcomposite sak" - -DEPEND="pam? ( trinity-base/tdebase-pam ) - xdmcp? ( x11-libs/libXdmcp ) - xcomposite? ( x11-libs/libXcomposite ) - sys-apps/dbus - x11-libs/libXrandr - x11-libs/libXtst - >=trinity-base/kcontrol-${PV}:${SLOT} - dev-libs/dbus-tqt" - -RDEPEND="${DEPEND} - >=trinity-base/kdepasswd-${PV}:${SLOT} - x11-apps/xinit - x11-apps/xmessage" - -pkg_setup() { - trinity-meta_pkg_setup; - use sak && TRINITY_SUBMODULE+=" tsak" -} - -src_configure() { - mycmakeargs=( - -DWITH_XTEST=ON - -DWITH_LIBART=ON - -DWITH_XRANDR=ON - -DWITH_SHADOW=ON - $(cmake-utils_use_with xcomposite XCOMPOSITE ) - $(cmake-utils_use_with xdmcp XDMCP ) - $(cmake-utils_use_with pam PAM ) - ) - - trinity-meta_src_configure -} - -src_install() { - cmake-utils_src_install - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}${TDEDIR}/share/config/kdm/kdmrc" || die "sed kdmrc failed" - - # install XSession upstream script seems to be debian-cpecific - cp "${FILESDIR}/${P}-xsession.script" "${D}/${TDEDIR}/share/config/kdm/Xsession" - -} - -pkg_postinst() { - local sak_ok - # set the default kdm face icon if it's not already set by the system admin - # because this is user-overrideable in that way, it's not in src_install - if [ ! -e "${ROOT}${TDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then - mkdir -p "${ROOT}${TDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${TDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${TDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [ ! -e "${ROOT}${TDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then - mkdir -p "${ROOT}${TDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${TDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${TDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - if use sak; then - sak_ok=yes - if ! linux_config_exists; then - ewarn "Can't check the linux kernel configuration." - ewarn "You might have some incompatible options enabled." - sak_ok=no - else - if ! linux_chkconfig_present INPUT_UINPUT; then - eerror "You build kdm with sak feature enabled. " - eerror "It requires the INPUT_UINPUT support enabled." - eerror "Please enable it:" - eerror " CONFIG_INPUT_UINPUT=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Input device support --->" - eerror " [*] Miscellaneous devices --->" - eerror " <*> User level driver support" - sak_ok=no - fi - fi - if [[ "$sak_ok" != yes ]]; then - sed -i -e 's:#\?\s*UseSAK=\(true\|false\)\?:UseSak=false:' \ - "${D}${TDEDIR}/share/config/kdm/kdmrc" || die "sed kdmrc failed" - ewarn "SAK feature is disabled. You can enable it yourself by setting UseSAK=true " - ewarn "in ${TDEDIR}/share/config/kdm/kdmrc " - else - ewarn "SAK feature is enabled. You can disable it yourself by setting UseSAK=false" - ewarn "in ${TDEDIR}/share/config/kdm/kdmrc " - fi - fi -} diff --git a/trinity-base/kdm/metadata.xml b/trinity-base/kdm/metadata.xml deleted file mode 100644 index 2a40b214..00000000 --- a/trinity-base/kdm/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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> - <use> - <flag name="xdmcp">Support for <pkg>x11-libs/libXdmcp</pkg></flag> - <flag name="sak">Adds SAK (Secure Attention Key) feature</flag> - </use> -</pkgmetadata> |