diff options
72 files changed, 200 insertions, 26 deletions
diff --git a/media-libs/libart_lgpl/libart_lgpl-14.0.7.ebuild b/media-libs/libart_lgpl/libart_lgpl-14.0.7.ebuild index 4922e40b..d4e3819b 100644 --- a/media-libs/libart_lgpl/libart_lgpl-14.0.7.ebuild +++ b/media-libs/libart_lgpl/libart_lgpl-14.0.7.ebuild @@ -6,7 +6,7 @@ EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="libart-lgpl" -inherit trinity-base-2 +inherit trinity-base-2 multilib-minimal DESCRIPTION="LGPL version of libart maintained by TDE" HOMEPAGE="https://trinitydesktop.org/" @@ -15,6 +15,19 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -src_configure() { +src_prepare() { + sed '/ART_SIZEOF_LONG/d' -i ${S}/art_config.h.in || die + cmake-utils_src_prepare +} + +multilib_src_configure() { cmake-utils_src_configure } + +multilib_src_compile() { + cmake-utils_src_compile +} + +multilib_src_install() { + cmake-utils_src_install +} diff --git a/media-libs/libart_lgpl/libart_lgpl-9999.ebuild b/media-libs/libart_lgpl/libart_lgpl-9999.ebuild index 631e1fb3..ce46338e 100644 --- a/media-libs/libart_lgpl/libart_lgpl-9999.ebuild +++ b/media-libs/libart_lgpl/libart_lgpl-9999.ebuild @@ -6,7 +6,7 @@ EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="libart-lgpl" -inherit trinity-base-2 +inherit trinity-base-2 multilib-minimal DESCRIPTION="LGPL version of libart maintained by TDE" HOMEPAGE="https://trinitydesktop.org/" @@ -14,6 +14,19 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="LGPL-2.1" SLOT="0" -src_configure() { +src_prepare() { + sed '/ART_SIZEOF_LONG/d' -i src/art_config.h.cmake || die + cmake-utils_src_prepare +} + +multilib_src_configure() { cmake-utils_src_configure } + +multilib_src_compile() { + cmake-utils_src_compile +} + +multilib_src_install() { + cmake-utils_src_install +} diff --git a/trinity-base/drkonqi/drkonqi-9999.ebuild b/trinity-base/drkonqi/drkonqi-9999.ebuild index 27250d24..dc3e966a 100644 --- a/trinity-base/drkonqi/drkonqi-9999.ebuild +++ b/trinity-base/drkonqi/drkonqi-9999.ebuild @@ -19,4 +19,6 @@ src_configure() { ) trinity-meta-2_src_configure -}
\ No newline at end of file +} + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kappfinder/kappfinder-9999.ebuild b/trinity-base/kappfinder/kappfinder-9999.ebuild index 496b5b0d..58fb36d8 100644 --- a/trinity-base/kappfinder/kappfinder-9999.ebuild +++ b/trinity-base/kappfinder/kappfinder-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild index 4f8df4b1..149a36b7 100644 --- a/trinity-base/kasteroids/kasteroids-9999.ebuild +++ b/trinity-base/kasteroids/kasteroids-9999.ebuild @@ -14,3 +14,5 @@ DESCRIPTION="Trinity Space Game" MY_DEPEND="~trinity-base/libtdegames-${PV}" DEPEND+=" ${MY_DEPEND}" RDEPEND+=" ${MY_DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kate/kate-9999.ebuild b/trinity-base/kate/kate-9999.ebuild index 5da8c377..efe0b432 100644 --- a/trinity-base/kate/kate-9999.ebuild +++ b/trinity-base/kate/kate-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Kate is an MDI texteditor." + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild index a2a173fd..6f899490 100644 --- a/trinity-base/katomic/katomic-9999.ebuild +++ b/trinity-base/katomic/katomic-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity Atomic Entertainment Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild index 51b962ec..75ee7011 100644 --- a/trinity-base/kbackgammon/kbackgammon-9999.ebuild +++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="A Backgammon program for Trinity" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild index fbf9f89f..0efb6427 100644 --- a/trinity-base/kbattleship/kbattleship-9999.ebuild +++ b/trinity-base/kbattleship/kbattleship-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="The Trinity Battleship clone" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild index 4e8b9a0b..16f6eeb6 100644 --- a/trinity-base/kblackbox/kblackbox-9999.ebuild +++ b/trinity-base/kblackbox/kblackbox-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity Blackbox Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild index e8341d68..3eb15c4a 100644 --- a/trinity-base/kbounce/kbounce-9999.ebuild +++ b/trinity-base/kbounce/kbounce-9999.ebuild @@ -16,3 +16,5 @@ DESCRIPTION="Trinity Bounce Ball Game" MY_DEPEND="~trinity-base/libtdegames-${PV}" DEPEND+=" ${MY_DEPEND}" RDEPEND+=" ${MY_DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild index 80511ecb..ff76e6e1 100644 --- a/trinity-base/kcontrol/kcontrol-9999.ebuild +++ b/trinity-base/kcontrol/kcontrol-9999.ebuild @@ -30,7 +30,7 @@ RDEPEND="${DEPEND} ~trinity-base/khotkeys-${PV} svg? ( media-libs/libart_lgpl )" -TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" +TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/" src_configure() { local mycmakeargs=( diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild index 763a2226..9e1a156d 100644 --- a/trinity-base/kdesktop/kdesktop-9999.ebuild +++ b/trinity-base/kdesktop/kdesktop-9999.ebuild @@ -27,7 +27,7 @@ RDEPEND="${COMMON_DEPEND} ~trinity-base/konqueror-${PV} pam? ( trinity-base/tdebase-pam )" -TSM_EXTRACT_ALSO="kcheckpass/" +TSM_EXTRACT_ALSO="kcheckpass/ translations/" src_configure() { mycmakeargs=( diff --git a/trinity-base/kenolaba/kenolaba-9999.ebuild b/trinity-base/kenolaba/kenolaba-9999.ebuild index bd97fd24..e4a01824 100644 --- a/trinity-base/kenolaba/kenolaba-9999.ebuild +++ b/trinity-base/kenolaba/kenolaba-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity: Board game inspired by Abalone" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild index e180a735..85bb4a78 100644 --- a/trinity-base/kfind/kfind-9999.ebuild +++ b/trinity-base/kfind/kfind-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity file find utility" DEPEND="~trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kfouleggs/kfouleggs-9999.ebuild b/trinity-base/kfouleggs/kfouleggs-9999.ebuild index 4376b45f..d4956f33 100644 --- a/trinity-base/kfouleggs/kfouleggs-9999.ebuild +++ b/trinity-base/kfouleggs/kfouleggs-9999.ebuild @@ -11,3 +11,6 @@ DESCRIPTION="KFoulEggs is an adaptation of the well-known (at least in Japan) Pu DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TRINITY_SUBMODULE="kfouleggs libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild index 3a6e2921..5fdfb7b7 100644 --- a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild +++ b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity: KGoldrunner is a game of action and puzzle solving" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild index 396e704d..16727b8e 100644 --- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild +++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild @@ -14,6 +14,8 @@ RDEPEND=" ~trinity-base/tdebase-tdeioslaves-${PV} || ( www-misc/htdig www-misc/hldig )" +TSM_EXTRACT_ALSO="translations/" + pkg_setup() { # Issue some warning if MAKEOPTS -j parameter is higher than 4 local makeopts_j diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild index 38f6b63c..dbc26dbc 100644 --- a/trinity-base/khotkeys/khotkeys-9999.ebuild +++ b/trinity-base/khotkeys/khotkeys-9999.ebuild @@ -14,6 +14,8 @@ DESCRIPTION="Trinity hotkey daemon" DEPEND="x11-libs/libXtst" RDEPEND="${DEPEND}" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild index 4811591b..81ccba2e 100644 --- a/trinity-base/kicker/kicker-9999.ebuild +++ b/trinity-base/kicker/kicker-9999.ebuild @@ -20,6 +20,8 @@ DEPEND="~trinity-base/libkonq-${PV} RDEPEND="${DEPEND} ~trinity-base/kmenuedit-${PV}" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_XFIXES="$(usex xcomposite)" diff --git a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild index 0296e5cf..4aa0976b 100644 --- a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild +++ b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity: Tactical one or two player game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/klickety/klickety-9999.ebuild b/trinity-base/klickety/klickety-9999.ebuild index c70789a1..4007308c 100644 --- a/trinity-base/klickety/klickety-9999.ebuild +++ b/trinity-base/klickety/klickety-9999.ebuild @@ -11,3 +11,6 @@ DESCRIPTION="Trinity: Klickety is an adaptation of the clickomania game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TRINITY_SUBMODULE="klickety libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/klines/klines-9999.ebuild b/trinity-base/klines/klines-9999.ebuild index 5e788361..3dd1477f 100644 --- a/trinity-base/klines/klines-9999.ebuild +++ b/trinity-base/klines/klines-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity: Kolor Lines - a little game about balls and how to get rid DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kmahjongg/kmahjongg-9999.ebuild b/trinity-base/kmahjongg/kmahjongg-9999.ebuild index b3c6d74e..855c7198 100644 --- a/trinity-base/kmahjongg/kmahjongg-9999.ebuild +++ b/trinity-base/kmahjongg/kmahjongg-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Mahjongg for Trinity" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kmail/kmail-9999.ebuild b/trinity-base/kmail/kmail-9999.ebuild index c5e69c76..24a02113 100644 --- a/trinity-base/kmail/kmail-9999.ebuild +++ b/trinity-base/kmail/kmail-9999.ebuild @@ -30,7 +30,8 @@ RDEPEND="${COMMON_DEPEND} crypt? ( app-crypt/pinentry ) ~trinity-base/tdebase-tdeioslaves-${PV} mbox? ( ~trinity-base/tdepim-tdeioslaves-${PV} ) - imap? ( ~trinity-base/tdepim-tdeioslaves-${PV}[sasl=] )" + imap? ( ~trinity-base/tdepim-tdeioslaves-${PV}[sasl=] ) + sasl? ( ~trinity-base/tdebase-tdeioslaves-${PV}[sasl=] )" TSM_EXTRACT_ALSO=" ktnef/ @@ -39,8 +40,9 @@ TSM_EXTRACT_ALSO=" libtdenetwork/ certmanager/lib/ libtdepim/ - korganizer/korganizerinterface.h - korganizer/kcalendarinterface.h + korganizer/kcalendariface.h + korganizer/korganizeriface.h + libkpimidentities/ libkpgp/ libkmime/ libksieve/ @@ -52,4 +54,4 @@ pkg_postinst () { elog "To do so, just emerge app-crypt/pinentry with \"tqt\" USE" elog "and use \"eselect pinentry set pinentry-tqt\" to use it." fi -}
\ No newline at end of file +} diff --git a/trinity-base/kmenuedit/kmenuedit-9999.ebuild b/trinity-base/kmenuedit/kmenuedit-9999.ebuild index fbfd3aae..a4492f99 100644 --- a/trinity-base/kmenuedit/kmenuedit-9999.ebuild +++ b/trinity-base/kmenuedit/kmenuedit-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity menu editor" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kmines/kmines-9999.ebuild b/trinity-base/kmines/kmines-9999.ebuild index 755cf8d7..57cd03c4 100644 --- a/trinity-base/kmines/kmines-9999.ebuild +++ b/trinity-base/kmines/kmines-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="KMines is a classic mine sweeper game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/knetattach/knetattach-9999.ebuild b/trinity-base/knetattach/knetattach-9999.ebuild index 26ab7450..56de279d 100644 --- a/trinity-base/knetattach/knetattach-9999.ebuild +++ b/trinity-base/knetattach/knetattach-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity network wizard" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/knetwalk/knetwalk-9999.ebuild b/trinity-base/knetwalk/knetwalk-9999.ebuild index fee4f07e..0ee054ca 100644 --- a/trinity-base/knetwalk/knetwalk-9999.ebuild +++ b/trinity-base/knetwalk/knetwalk-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/knewsticker/knewsticker-9999.ebuild b/trinity-base/knewsticker/knewsticker-9999.ebuild index 723b7fa3..6fd381f8 100644 --- a/trinity-base/knewsticker/knewsticker-9999.ebuild +++ b/trinity-base/knewsticker/knewsticker-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="kicker plugin: rss news ticker" DEPEND="~trinity-base/librss-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="librss" diff --git a/trinity-base/knode/knode-9999.ebuild b/trinity-base/knode/knode-9999.ebuild index 284c5464..63656dd9 100644 --- a/trinity-base/knode/knode-9999.ebuild +++ b/trinity-base/knode/knode-9999.ebuild @@ -15,4 +15,4 @@ DEPEND=" ~trinity-base/libkcal-${PV}" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="libtdepim/" +TSM_EXTRACT_ALSO="libtdepim/ libemailfunctions/ libkpgp/ libkmime/" diff --git a/trinity-base/kolf/kolf-9999.ebuild b/trinity-base/kolf/kolf-9999.ebuild index da38333c..3ee8a3ab 100644 --- a/trinity-base/kolf/kolf-9999.ebuild +++ b/trinity-base/kolf/kolf-9999.ebuild @@ -14,3 +14,5 @@ DESCRIPTION="Minigolf Game by Trinity" MY_DEPEND="~trinity-base/libtdegames-${PV}" DEPEND+=" ${MY_DEPEND}" RDEPEND+=" ${MY_DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild index c2151748..80c20b14 100644 --- a/trinity-base/konqueror/konqueror-9999.ebuild +++ b/trinity-base/konqueror/konqueror-9999.ebuild @@ -21,4 +21,4 @@ RDEPEND="${DEPEND} ~trinity-base/kfind-${PV} java? ( virtual/jre )" -TSM_EXTRACT_ALSO="kdesktop" +TSM_EXTRACT_ALSO="kdesktop translations/" diff --git a/trinity-base/konquest/konquest-9999.ebuild b/trinity-base/konquest/konquest-9999.ebuild index 0a4fbc27..d258ee6b 100644 --- a/trinity-base/konquest/konquest-9999.ebuild +++ b/trinity-base/konquest/konquest-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Galactic Strategy Trinity Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild index 178ddb8c..76861317 100644 --- a/trinity-base/konsole/konsole-9999.ebuild +++ b/trinity-base/konsole/konsole-9999.ebuild @@ -20,6 +20,8 @@ RDEPEND="${DEPEND} x11-apps/bdftopcf sudo? ( app-admin/sudo )" +TSM_EXTRACT_ALSO="translations/" + src_configure() { local mycmakeargs=( -DWITH_XRENDER=ON diff --git a/trinity-base/kontact/kontact-9999.ebuild b/trinity-base/kontact/kontact-9999.ebuild index d0cf89cd..346e16f8 100644 --- a/trinity-base/kontact/kontact-9999.ebuild +++ b/trinity-base/kontact/kontact-9999.ebuild @@ -12,9 +12,17 @@ DESCRIPTION="Trinity personal information manager" COMMON_DEPEND="~trinity-base/libtdepim-${PV} ~trinity-base/libkpimidentities-${PV} ~trinity-base/libkholidays-${PV} - ~trinity-base/knotes-${PV}" + ~trinity-base/knotes-${PV} + =trinity-base/korganizer-${PV}" DEPEND+=" $COMMON_DEPEND" RDEPEND+=" $COMMON_DEPEND" -TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/" +TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/ plugins/ korganizer/ kaddressbook/ \ + kmail/ knotes/ knode/ akregator/ karm/ libemailfunctions/ libkpimidentities/" + +src_prepare() { + sed -i '/kmail/d' kontact/plugins/CMakeLists.txt || die + sed -i '/specialdates/d' kontact/plugins/CMakeLists.txt || die + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kpat/kpat-9999.ebuild b/trinity-base/kpat/kpat-9999.ebuild index 7dbb6f00..023f33db 100644 --- a/trinity-base/kpat/kpat-9999.ebuild +++ b/trinity-base/kpat/kpat-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity patience game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild index 3f6ada3f..684b5697 100644 --- a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild +++ b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild @@ -9,4 +9,4 @@ inherit trinity-meta-2 DESCRIPTION="Trinity user settings wizard." -TSM_EXTRACT_ALSO="libkonq/" +TSM_EXTRACT_ALSO="libkonq/ translations/" diff --git a/trinity-base/kpoker/kpoker-9999.ebuild b/trinity-base/kpoker/kpoker-9999.ebuild index f8903db3..ce721daa 100644 --- a/trinity-base/kpoker/kpoker-9999.ebuild +++ b/trinity-base/kpoker/kpoker-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity poker game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kreversi/kreversi-9999.ebuild b/trinity-base/kreversi/kreversi-9999.ebuild index cb7f8bfe..fd0f0504 100644 --- a/trinity-base/kreversi/kreversi-9999.ebuild +++ b/trinity-base/kreversi/kreversi-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity Board Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksame/ksame-9999.ebuild b/trinity-base/ksame/ksame-9999.ebuild index cdfd19f2..97d2d18e 100644 --- a/trinity-base/ksame/ksame-9999.ebuild +++ b/trinity-base/ksame/ksame-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity: Same Game - a little game about balls and how to get rid o DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kshisen/kshisen-9999.ebuild b/trinity-base/kshisen/kshisen-9999.ebuild index 5b18e0b7..54aad206 100644 --- a/trinity-base/kshisen/kshisen-9999.ebuild +++ b/trinity-base/kshisen/kshisen-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="A Trinity game similiar to Mahjongg" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksirtet/ksirtet-9999.ebuild b/trinity-base/ksirtet/ksirtet-9999.ebuild index 278da505..9a419c0c 100644 --- a/trinity-base/ksirtet/ksirtet-9999.ebuild +++ b/trinity-base/ksirtet/ksirtet-9999.ebuild @@ -11,3 +11,6 @@ DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TRINITY_SUBMODULE="ksirtet libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksmiletris/ksmiletris-9999.ebuild b/trinity-base/ksmiletris/ksmiletris-9999.ebuild index 35778ebb..83c28e8a 100644 --- a/trinity-base/ksmiletris/ksmiletris-9999.ebuild +++ b/trinity-base/ksmiletris/ksmiletris-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity SmileTris" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksnake/ksnake-9999.ebuild b/trinity-base/ksnake/ksnake-9999.ebuild index 19799dc1..92152b7f 100644 --- a/trinity-base/ksnake/ksnake-9999.ebuild +++ b/trinity-base/ksnake/ksnake-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity Tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksokoban/ksokoban-9999.ebuild b/trinity-base/ksokoban/ksokoban-9999.ebuild index 3dfdd06f..0fa388bf 100644 --- a/trinity-base/ksokoban/ksokoban-9999.ebuild +++ b/trinity-base/ksokoban/ksokoban-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="The japanese warehouse keeper game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kspaceduel/kspaceduel-9999.ebuild b/trinity-base/kspaceduel/kspaceduel-9999.ebuild index 7ab1b658..987a5906 100644 --- a/trinity-base/kspaceduel/kspaceduel-9999.ebuild +++ b/trinity-base/kspaceduel/kspaceduel-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity Space Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild index 0877a743..d8042e1e 100644 --- a/trinity-base/ksplashml/ksplashml-9999.ebuild +++ b/trinity-base/ksplashml/ksplashml-9999.ebuild @@ -14,6 +14,8 @@ IUSE="xinerama" DEPEND="xinerama? ( x11-base/xorg-proto )" RDEPEND="${DEPEND}" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_XINERAMA="$(usex xinerama)" diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild index 56c7746c..f420376b 100644 --- a/trinity-base/ksysguard/ksysguard-9999.ebuild +++ b/trinity-base/ksysguard/ksysguard-9999.ebuild @@ -14,6 +14,8 @@ IUSE="dell-laptop lm-sensors" DEPEND="lm-sensors? ( sys-apps/lm-sensors )" RDEPEND="${DEPEND}" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_I8K="$(usex dell-laptop)" diff --git a/trinity-base/ktip/ktip-9999.ebuild b/trinity-base/ktip/ktip-9999.ebuild index ecdd6735..b6d43ad1 100644 --- a/trinity-base/ktip/ktip-9999.ebuild +++ b/trinity-base/ktip/ktip-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity tip-of-the-day displayer" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/ktron/ktron-9999.ebuild b/trinity-base/ktron/ktron-9999.ebuild index fee4f07e..0ee054ca 100644 --- a/trinity-base/ktron/ktron-9999.ebuild +++ b/trinity-base/ktron/ktron-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ktuberling/ktuberling-9999.ebuild b/trinity-base/ktuberling/ktuberling-9999.ebuild index c3f68b79..4656176d 100644 --- a/trinity-base/ktuberling/ktuberling-9999.ebuild +++ b/trinity-base/ktuberling/ktuberling-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="A Trinity potato game for kids" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kxkb/kxkb-9999.ebuild b/trinity-base/kxkb/kxkb-9999.ebuild index 611dcaca..a994416d 100644 --- a/trinity-base/kxkb/kxkb-9999.ebuild +++ b/trinity-base/kxkb/kxkb-9999.ebuild @@ -14,6 +14,8 @@ RDEPEND="${DEPEND} x11-misc/xkeyboard-config x11-apps/setxkbmap" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/libkonq/libkonq-9999.ebuild b/trinity-base/libkonq/libkonq-9999.ebuild index 336e8a65..27740145 100644 --- a/trinity-base/libkonq/libkonq-9999.ebuild +++ b/trinity-base/libkonq/libkonq-9999.ebuild @@ -10,3 +10,5 @@ inherit trinity-meta-2 need-arts optional DESCRIPTION="The embeddable part of konqueror" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/libtdegames/libtdegames-9999.ebuild b/trinity-base/libtdegames/libtdegames-9999.ebuild index 103a0af1..0bb41583 100644 --- a/trinity-base/libtdegames/libtdegames-9999.ebuild +++ b/trinity-base/libtdegames/libtdegames-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 DESCRIPTION="Base library common to many Trinity games" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/lskat/lskat-9999.ebuild b/trinity-base/lskat/lskat-9999.ebuild index dd0574f9..60723aa6 100644 --- a/trinity-base/lskat/lskat-9999.ebuild +++ b/trinity-base/lskat/lskat-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity card game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/nsplugins/nsplugins-9999.ebuild b/trinity-base/nsplugins/nsplugins-9999.ebuild index c7463619..399e4f1b 100644 --- a/trinity-base/nsplugins/nsplugins-9999.ebuild +++ b/trinity-base/nsplugins/nsplugins-9999.ebuild @@ -12,3 +12,5 @@ DESCRIPTION="Netscape plugins support for Konqueror." DEPEND="x11-libs/libXt dev-libs/glib" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/tdebase-data/tdebase-data-9999.ebuild b/trinity-base/tdebase-data/tdebase-data-9999.ebuild index 767b1c77..a9e7d64b 100644 --- a/trinity-base/tdebase-data/tdebase-data-9999.ebuild +++ b/trinity-base/tdebase-data/tdebase-data-9999.ebuild @@ -9,4 +9,6 @@ inherit trinity-meta-2 TRINITY_SUBMODULE="l10n pics applnk" -DESCRIPTION="Icons, localization data and .desktop files from tdebase."
\ No newline at end of file +DESCRIPTION="Icons, localization data and .desktop files from tdebase." + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/tdebase-pam/files/tde-elogind.pam-7 b/trinity-base/tdebase-pam/files/tde-elogind.pam-7 new file mode 100644 index 00000000..9baa77df --- /dev/null +++ b/trinity-base/tdebase-pam/files/tde-elogind.pam-7 @@ -0,0 +1,12 @@ +#%PAM-1.0 + +auth required pam_nologin.so +auth include system-auth + +account include system-auth + +password include system-auth + +session include system-auth + +session optional pam_elogind.so diff --git a/trinity-base/tdebase-pam/tdebase-pam-7.ebuild b/trinity-base/tdebase-pam/tdebase-pam-7.ebuild index 95f704e7..6a4d676c 100644 --- a/trinity-base/tdebase-pam/tdebase-pam-7.ebuild +++ b/trinity-base/tdebase-pam/tdebase-pam-7.ebuild @@ -9,12 +9,16 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" +IUSE="elogind" DEPEND="sys-libs/pam" RDEPEND="${DEPEND}" src_install() { - newpamd "${FILESDIR}/tde.pam-${PV}" tde + if use elogind ; then + newpamd "${FILESDIR}/tde-elogind.pam-${PV}" tde + else + newpamd "${FILESDIR}/tde.pam-${PV}" tde + fi newpamd "${FILESDIR}/tde-np.pam-6" tde-np } diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild index 43d02e1e..8eb4d6f8 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild @@ -24,7 +24,7 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" -TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm" +TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xdg-update migratekde3" src_prepare() { trinity-base-2_src_prepare diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild index 988ceeb4..fd45cbec 100644 --- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild +++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild @@ -8,6 +8,7 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 TSM_EXTRACT="tdeioslave" +TSM_EXTRACT_ALSO="translations/" DESCRIPTION="Generic Trinity TDEIOslaves" diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index 7321646c..357baa13 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -17,9 +17,13 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="${TRINITY_VER}" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + # NOTE: Building without tdehwlib segfaults, but you can try and report. -IUSE+=" alsa aspell consolekit cryptsetup cups debug elficons elogind fam +hwlib -+idn ispell jpeg2k kernel_linux libressl lua lzma +malloc networkmanager +IUSE+=" alsa aspell cryptsetup cups debug elficons elogind fam +hwlib ++idn ispell jpeg2k kernel_linux libressl lua lzma malloc networkmanager old-udisks openexr +pcre pcsc-lite pkcs11 +shm spell +ssl sudo +svg systemd tiff udevil udisks upower utempter xcomposite +xrandr zeroconf" @@ -69,7 +73,6 @@ RDEPEND+=" ${COMMON_DEPEND} hwlib? ( acct-group/plugdev !udevil? ( !udisks? ( !old-udisks? ( sys-apps/pmount ) ) ) - consolekit? ( sys-auth/consolekit ) cryptsetup? ( sys-fs/cryptsetup ) elogind? ( sys-auth/elogind ) networkmanager? ( net-misc/networkmanager ) @@ -126,7 +129,7 @@ src_configure() { -DUTEMPTER_HELPER="/usr/sbin/utempter" -DWITH_UPOWER="$(usex upower)" -DWITH_PKCS="$(usex pkcs11)" - -DWITH_CONSOLEKIT="$(usex consolekit)" + -DWITH_CONSOLEKIT=OFF -DWITH_LOGINDPOWER="${enable_logind}" -DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)" -DWITH_XCOMPOSITE="$(usex xcomposite)" @@ -202,7 +205,7 @@ pkg_postinst () { echo fi if ! use hwlib; then - for flag in consolekit networkmanager upower systemd elogind old-udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do + for flag in networkmanager upower systemd elogind old-udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do use $flag && \ echo ewarn "USE=\"$flag\" is passed, but it doesn't change anything because" && \ diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild index 1d4125e1..ea6abaf6 100644 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild @@ -20,6 +20,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +TRINITY_SUBMODULE="arts mpeglib mpeglib_artsplug" + src_configure() { local mycmakeargs=( -DWITH_ALSA="$(usex alsa)" diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild index 4a758ff0..3c288041 100644 --- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild +++ b/trinity-base/tdepasswd/tdepasswd-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity GUI for passwd" DEPEND="~trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild index 915f263e..4ce1f3d3 100644 --- a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild +++ b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild @@ -7,7 +7,6 @@ EAPI="7" TRINITY_MODULE_NAME="tdepim" inherit trinity-meta-2 -TSM_EXTRACT="tdeioslave" TRINITY_SUBMODULE="tdeioslave" DESCRIPTION="PIM Trinity TDEIOslaves" @@ -37,3 +36,5 @@ src_configure() { trinity-meta-2_src_configure } + +TSM_EXTRACT_ALSO="libemailfunctions/ libkmime/" diff --git a/trinity-base/tdeprint/tdeprint-9999.ebuild b/trinity-base/tdeprint/tdeprint-9999.ebuild index 6597ea1b..552d7e34 100644 --- a/trinity-base/tdeprint/tdeprint-9999.ebuild +++ b/trinity-base/tdeprint/tdeprint-9999.ebuild @@ -15,3 +15,5 @@ DEPEND="cups? ( net-print/cups )" RDEPEND="${DEPEND} app-text/enscript app-text/psutils" + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild index be55c0e4..3d312b98 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild @@ -16,6 +16,8 @@ DEPEND="x11-libs/libXt krootbacking? ( ~trinity-base/krootbacking-${PV} )" RDEPEND="${DEPEND}" +TSM_EXTRACT_ALSO="translations/" + src_configure () { mycmakeargs=( -DWITH_OPENGL="$(usex opengl)" diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild index 331e22d2..3dec9137 100644 --- a/trinity-base/tdm/tdm-9999.ebuild +++ b/trinity-base/tdm/tdm-9999.ebuild @@ -25,6 +25,8 @@ RDEPEND="${DEPEND} x11-apps/xinit x11-apps/xmessage" +TSM_EXTRACT_ALSO="translations/" + pkg_setup() { trinity-meta-2_pkg_setup; use sak && TRINITY_SUBMODULE+=" tsak" diff --git a/trinity-base/tqt3integration/tqt3integration-9999.ebuild b/trinity-base/tqt3integration/tqt3integration-9999.ebuild index 4903b337..de120f63 100644 --- a/trinity-base/tqt3integration/tqt3integration-9999.ebuild +++ b/trinity-base/tqt3integration/tqt3integration-9999.ebuild @@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Makes TQt-only apps use several TDE dialogs." + +TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild index 85c22e92..e22a53f3 100644 --- a/trinity-base/twin/twin-9999.ebuild +++ b/trinity-base/twin/twin-9999.ebuild @@ -22,6 +22,8 @@ DEPEND="x11-libs/libXext pcre? ( dev-libs/libpcre[jit] )" RDEPEND="${DEPEND}" +TSM_EXTRACT_ALSO="translations/" + src_configure() { mycmakeargs=( -DWITH_XCOMPOSITE="$(usex xcomposite)" diff --git a/trinity-base/twin4/twin4-9999.ebuild b/trinity-base/twin4/twin4-9999.ebuild index b43886d7..787deea2 100644 --- a/trinity-base/twin4/twin4-9999.ebuild +++ b/trinity-base/twin4/twin4-9999.ebuild @@ -11,3 +11,5 @@ DESCRIPTION="Trinity four-in-a-row game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" + +TSM_EXTRACT_ALSO="libtdegames/" |