diff options
Diffstat (limited to 'trinity-base/tdebase-starttde')
| -rw-r--r-- | trinity-base/tdebase-starttde/Manifest | 4 | ||||
| -rw-r--r-- | trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch | 112 | ||||
| -rw-r--r-- | trinity-base/tdebase-starttde/metadata.xml | 6 | ||||
| -rw-r--r-- | trinity-base/tdebase-starttde/tdebase-starttde-14.1.1-r1.ebuild (renamed from trinity-base/tdebase-starttde/tdebase-starttde-14.0.12.ebuild) | 8 | ||||
| -rw-r--r-- | trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild (renamed from trinity-base/tdebase-starttde/tdebase-starttde-14.0.11.ebuild) | 10 | ||||
| -rw-r--r-- | trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild | 5 |
6 files changed, 105 insertions, 40 deletions
diff --git a/trinity-base/tdebase-starttde/Manifest b/trinity-base/tdebase-starttde/Manifest index c0fd0924..d937bfda 100644 --- a/trinity-base/tdebase-starttde/Manifest +++ b/trinity-base/tdebase-starttde/Manifest @@ -1,2 +1,2 @@ -DIST tdebase-trinity-14.0.11.tar.xz 30554508 BLAKE2B f276a566f5cfd2ab66969209bdb0b273ce690c6ad6f12e869440e69f86ff7a6dc638aee6f2057c063796f87a30021896d152ebbcfb3f6b10958d0b759cff88dd SHA512 bd2894d07d8e03cc14f4ef0d99661aeb02d5a7b112ef007e758c926431587bfa9595ab477ec79c87ba2b5c5af36dfb3cd665faaa04a75f16eeab27a115874b1e -DIST tdebase-trinity-14.0.12.tar.xz 30570656 BLAKE2B cc230548e567f530c4c95fbd2a670a1aff2f617cb4319dbaff1f3537cb9dfea1c5136fa9cbd30a95017fbfa7fe267485c7dd2161661cf4ceca31795a9a815526 SHA512 b1071cb4ea8dedb3b4605c3a99e6d1cb28eb44634a2118607e32ea356b55ebaeab3566d98e29d2677f431da95ecaacd0a7b6f832aab2ee1f9851f27186fdde25 +DIST tdebase-trinity-14.1.1.tar.xz 30746484 BLAKE2B 4d2fdd9e3f5007c7482e938badad381a3e314b458b262dd346c05c91a9a4b974d8f1244152b833a34f7edad246bd4a8af0e054279a1556cebac6319a1a011a09 SHA512 d733f20719a0c9a949540e95f4d60fe03e096efbd7ac54187c5ee9b9f9b644318ee2dd9c8fd0d2e6eee660f7a7ad827e66bc06fb9a36c9e56e3ae16bdd47910c +DIST tdebase-trinity-14.1.2.tar.xz 30747536 BLAKE2B c3e23974735410e3f1276d4d7314bdc0801df5e02758d1a032499b0b1a965dfd8a5f6c5dc58f543a1f1fba9d0cf77b89483eb62df8a3a95ca954ed6e48b3ea9d SHA512 bf04541c15b345a615bf4c8f463c7af559ab17fea7b5ae399164d77c365d869fd211060448fb39c47df09beafb3edfbbe7b15ae140c239a8321f35d7dc16af95 diff --git a/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch b/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch index 8d91f88c..0b53033c 100644 --- a/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch +++ b/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch @@ -1,32 +1,90 @@ ---- starttde 2019-01-27 13:01:05.443907841 +0300 -+++ starttde.gentoo 2019-01-27 13:01:48.203621371 +0300 -@@ -178,7 +178,7 @@ - +diff --git a/starttde b/starttde +index 66360e228..512bff7d5 100755 +--- a/starttde ++++ b/starttde +@@ -3,18 +3,6 @@ + # DEFAULT TRINITY STARTUP SCRIPT + # + +-# This block might not be appropriate for all systems. +-# It should work for command line logins but graphical +-# login managers might already source these files. +-# Multiple sourcing is not a problem when the files are only +-# containers for environment variables and such. +-if [ -r /etc/xprofile ]; then +- . /etc/xprofile +-fi +-if [ -r $HOME/.xprofile ]; then +- . $HOME/.xprofile +-fi +- + # Some functions to parse and check path correctly ... + # Usage: is_in_path PATH /usr/bin + is_in_path() { +@@ -68,6 +56,31 @@ remove_from_path() { + eval export $var=${NPATH#:} + } + ++# Gentoo: In Gentoo $TDE_DIR/bin is in PATH by default, but it's located after /usr/bin, ++# so to avoid running kf5 apps instead of TDE's one make sure it goes first ++ ++TDE_BIN_DIR="$(dirname -- "$0")" ++if ! is_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin"; then ++ remove_from_path PATH "$TDE_BIN_DIR" ++ place_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin" ++fi ++unset TDE_BIN_DIR ++ ++# Gentoo: to avoid messing PATH that user might have set we moved .xprofile ++# import here rather from the very begining of the script ++# ++# This block might not be appropriate for all systems. ++# It should work for command line logins but graphical ++# login managers might already source these files. ++# Multiple sourcing is not a problem when the files are only ++# containers for environment variables and such. ++if [ -r /etc/xprofile ]; then ++ . /etc/xprofile ++fi ++if [ -r $HOME/.xprofile ]; then ++ . $HOME/.xprofile ++fi ++ + # Portable alternative to the file operator -nt (among shells) + is_newer() { + if test -n "$(find $1 -prune -newer $2 -print)" +@@ -205,19 +218,21 @@ fi + # Modify the following environment variables only as necessary. - + - if ! is_in_path PATH "$TDEDIR/games" ; then -+# if ! is_in_path PATH "$TDEDIR/games" ; then - # Respect the traditional path order. Don't blindly place $TDEDIR/games - # first in the path. Only place $TDEDIR/games before /usr/games. If packagers - # are adding $TDEDIR/games elsewhere, then they need to ensure the traditional -@@ -190,9 +190,9 @@ - else - export PATH=$TDEDIR/games:$PATH - fi +- # Respect the traditional path order. Don't blindly place $TDEDIR/games +- # first in the path. Only place $TDEDIR/games before /usr/games. If packagers +- # are adding $TDEDIR/games elsewhere, then they need to ensure the traditional +- # search patch is respected. +- # Is there a way we can check that $TDEDIR/games is always placed only just before +- # /usr/games in the search path? +- if is_in_path PATH "/usr/games"; then +- place_before_in_path PATH "$TDEDIR/games" "/usr/games" +- else +- export PATH=$TDEDIR/games:$PATH +- fi - fi ++# Gentoo: there is no */games/bin directories in gentoo ++# ++# if ! is_in_path PATH "$TDEDIR/games" ; then ++# # Respect the traditional path order. Don't blindly place $TDEDIR/games ++# # first in the path. Only place $TDEDIR/games before /usr/games. If packagers ++# # are adding $TDEDIR/games elsewhere, then they need to ensure the traditional ++# # search patch is respected. ++# # Is there a way we can check that $TDEDIR/games is always placed only just before ++# # /usr/games in the search path? ++# if is_in_path PATH "/usr/games"; then ++# place_before_in_path PATH "$TDEDIR/games" "/usr/games" ++# else ++# export PATH=$TDEDIR/games:$PATH ++# fi +# fi - -- if ! is_in_path PATH "$TDEDIR/bin" ]; then -+# if ! is_in_path PATH "$TDEDIR/bin" ]; then + + if ! is_in_path PATH "$TDEDIR/bin" ; then # Respect the traditional path order. Don't blindly place $TDEDIR/bin - # first in the path. Only place $TDEDIR/bin before /usr/bin. This order is - # consistent with tdelibs/tdesu/stub.cpp. If packagers are adding $TDEDIR/bin -@@ -204,7 +204,7 @@ - else - export PATH=$TDEDIR/bin:$PATH - fi -- fi -+# fi - - if [ -x /usr/bin/manpath ]; then - if [ "`manpath 2>/dev/null | grep \"$TDEDIR/share/man\"`" = "" ]; then diff --git a/trinity-base/tdebase-starttde/metadata.xml b/trinity-base/tdebase-starttde/metadata.xml index 6e9f5e4a..ef7d5590 100644 --- a/trinity-base/tdebase-starttde/metadata.xml +++ b/trinity-base/tdebase-starttde/metadata.xml @@ -1,8 +1,8 @@ <?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> </pkgmetadata> diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.12.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.1-r1.ebuild index 06d8808a..8215e74a 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.12.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.1-r1.ebuild @@ -1,5 +1,5 @@ -# Copyright 1999-2022 Gentoo Authors -# Copyright 2022 The Trinity Desktop Project +# Copyright 1999-2023 Gentoo Authors +# Copyright 2020-2023 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -11,7 +11,7 @@ inherit trinity-meta-2 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi RDEPEND="x11-apps/xmessage @@ -29,6 +29,8 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" +PATCHES=( "${FILESDIR}/${PN}-14-gentoo.patch" ) + src_prepare() { trinity-base-2_src_prepare } diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.11.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild index 6f11d6c5..3f0e1192 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.11.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors -# Copyright 2021 The Trinity Desktop Project +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2024 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" TRINITY_MODULE_NAME="tdebase" TRINITY_MODULE_TYPE="core" @@ -11,7 +11,7 @@ inherit trinity-meta-2 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi RDEPEND="x11-apps/xmessage @@ -29,6 +29,8 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" +PATCHES=( "${FILESDIR}/${PN}-14-gentoo.patch" ) + src_prepare() { trinity-base-2_src_prepare } diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild index dc653379..6560108d 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild @@ -7,11 +7,12 @@ EAPI="8" TRINITY_MODULE_NAME="tdebase" TRINITY_MODULE_TYPE="core" TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xdg-update migratekde3" +TRINITY_HANDBOOK="optional" inherit trinity-meta-2 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi RDEPEND="x11-apps/xmessage @@ -29,6 +30,8 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" +PATCHES=( "${FILESDIR}/${PN}-14-gentoo.patch" ) + src_prepare() { trinity-base-2_src_prepare } |