summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris <xchrisx@uber.space>2019-12-31 17:21:13 +0100
committerChris <xchrisx@uber.space>2019-12-31 17:21:13 +0100
commit55d2aaa4eb5201ac97e269fc141e4ee1778379b8 (patch)
tree810ece5e004aa9e97e26a1ad988ed52552175fb6
parent644110a847c5911c2eb04eb53c93031740561efc (diff)
downloadtde-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>
-rw-r--r--Documentation/README28
-rw-r--r--Documentation/derived-lists/kdeartwork-3.5.13.19
-rw-r--r--Documentation/derived-lists/kdebase-3.5.13.142
-rw-r--r--Documentation/derived-lists/kdebase-3.5.13.242
-rw-r--r--Documentation/derived-lists/kdegraphics-3.5.13.121
-rw-r--r--Documentation/derived-lists/kdemultimedia-3.5.13.116
-rw-r--r--Documentation/derived-lists/kdenetwork-3.5.13.118
-rw-r--r--Documentation/derived-lists/kdepim-3.5.13.137
-rw-r--r--Documentation/derived-lists/kdepim-3.5.13.237
-rw-r--r--Documentation/derived-lists/kdetoys-3.5.13.110
-rw-r--r--Documentation/derived-lists/kdetoys-3.5.13.210
-rw-r--r--Documentation/derived-lists/kdeutils-3.5.13.118
-rw-r--r--Documentation/derived-lists/kdeutils-3.5.13.218
-rw-r--r--Documentation/derived-lists/tdegames-999964
-rw-r--r--Documentation/trinity.3.5.13.2.keywords90
-rw-r--r--Documentation/trinity.live.keywords74
-rw-r--r--Documentation/trinity.overlay4
-rw-r--r--app-misc/hal-info/Manifest1
-rw-r--r--app-misc/hal-info/hal-info-20091130.ebuild22
-rw-r--r--app-mobilephone/smssend/files/smssend-3.4-verizon.patch (renamed from app-mobilephone/smssend/files/smssend-3.4-verizon.diff)0
-rw-r--r--app-mobilephone/smssend/smssend-3.4-r2.ebuild2
-rw-r--r--dev-libs/dbus-1-tqt/Manifest2
-rw-r--r--dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.1.ebuild24
-rw-r--r--dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.2.ebuild24
-rw-r--r--dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild2
-rw-r--r--dev-libs/dbus-tqt/Manifest1
-rw-r--r--dev-libs/dbus-tqt/dbus-tqt-3.5.13.1.ebuild24
-rw-r--r--dev-libs/dbus-tqt/dbus-tqt-9999.ebuild3
-rw-r--r--dev-qt/qt-meta/qt-meta-3.3.8d.ebuild25
-rw-r--r--dev-qt/qt-meta/qt-meta-3.9999.ebuild25
-rw-r--r--dev-qt/qt/Manifest17
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2012-12-12_02_54_53-Ensure-that-a-valid-DPI-is-always-set-cbe0a27.patch26
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch38
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-02-20_21_52_12-Doublebuffer-QIconView-to-reduce-flicker-This-closes-Bug-1408-897cd5c.patch98
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-03-02_12_16_10-Fix-textbox-trails-introduced-with-GIT-commit-82b71e49-This-resolves-Bug-1408-a78eb9c.patch19
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-13_13_31_15-Properly-set-WM_CLASS-atom-even-if-Display-pointer-was-passed-to-TQApplication-This-relates-to-Bug-1443-045b2d9.patch46
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch42
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch45
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Fix-qmake-library-search-path-on-64-bit-systems-This-resolves-Bug-1016-e374dac.patch13
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Update-zh-tw-translations-c62cd50.patch253
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Add-0084-compositing-patch-from-RedHat-909c3cb.patch73
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch59
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_01-Make-basic-integer-QDataStream-reads-resistant-to-corruption-from-underlying-IO-device-failure-60621ef.patch133
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-25_03_21_44-Fix-a-number-of-threading-problems-and-crashes-This-partially-resolves-Bug-1467-part-of-the-original-commit-b8e4f24.patch1052
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-03_03_47_45-Fix-corrupted-titlebar-icons-in-subwindows-of-ARGB-applications-90f4a55.patch63
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-04_17_28_30-Fix-ARGB-mode-stippled-focus-rectangle-showing-underlying-window-contents-Fix-TQColor-not-processing-alpha-channel-in-ARGB-mode-d2240de.patch62
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-08_01_43_38-Fix-spelling-mistakes-169c39a.patch52
-rw-r--r--dev-qt/qt/qt-3.3.8d-r1.ebuild341
-rw-r--r--dev-qt/qt/qt-3.3.8d.ebuild341
-rw-r--r--dev-qt/qt/qt-3.9999.ebuild396
-rw-r--r--dev-qt/qt4-tqt-engine/Manifest1
-rw-r--r--dev-qt/qt4-tqt-engine/files/qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth17
-rw-r--r--dev-qt/qt4-tqt-engine/qt4-tqt-engine-9999.ebuild67
-rw-r--r--dev-qt/tqtinterface/Manifest2
-rw-r--r--dev-qt/tqtinterface/tqtinterface-3.5.13.1.ebuild30
-rw-r--r--dev-qt/tqtinterface/tqtinterface-3.5.13.2.ebuild30
-rw-r--r--dev-tqt/tqt/metadata.xml (renamed from app-misc/hal-info/metadata.xml)0
-rw-r--r--dev-tqt/tqt/tqt-9999.ebuild (renamed from dev-qt/tqt/tqt-3.9999.ebuild)29
-rw-r--r--dev-tqt/tqtinterface/metadata.xml (renamed from dev-qt/tqtinterface/metadata.xml)0
-rw-r--r--dev-tqt/tqtinterface/tqtinterface-9999.ebuild (renamed from dev-qt/tqtinterface/tqtinterface-9999.ebuild)15
-rw-r--r--eclass/kde-functions.eclass706
-rw-r--r--eclass/kde.eclass608
-rw-r--r--eclass/qt3.eclass97
-rw-r--r--eclass/trinity-base.eclass3
-rw-r--r--eclass/trinity-shared-files/kdetoys-3.5.13.1/patches/add-initial-cmake-support.patch.bz2bin5469 -> 0 bytes
-rw-r--r--eclass/trinity-shared-files/kdeutils-3.5.13.1/patches/add-initial-cmake-support-1.patch.bz2bin12405 -> 0 bytes
-rw-r--r--net-irc/konversation/Manifest2
-rw-r--r--net-irc/konversation/files/konversation-3.5.13.1-initial-cmake.patch1413
-rw-r--r--net-irc/konversation/konversation-1.1.13-r1.ebuild36
-rw-r--r--profiles/categories1
-rw-r--r--profiles/package.mask9
-rw-r--r--profiles/package.unmask2
-rw-r--r--profiles/package.use.force2
-rw-r--r--profiles/package.use.mask12
-rw-r--r--profiles/repo_name2
-rw-r--r--profiles/use.desc3
-rw-r--r--profiles/use.local.desc3
-rw-r--r--sys-apps/hal/Manifest7
-rw-r--r--sys-apps/hal/Reasons16
-rw-r--r--sys-apps/hal/files/0.5.14-hald.conf6
-rw-r--r--sys-apps/hal/files/0.5.14-hald.rc.139
-rw-r--r--sys-apps/hal/files/hal-0.5.14-fix-glib-includes-in-addons.patch143
-rw-r--r--sys-apps/hal/files/hal-0.5.14-fix-gtk-doc-automake.patch11
-rw-r--r--sys-apps/hal/files/hal-0.5.14-gentoo-patches-5.tar.bz2bin6494 -> 0 bytes
-rw-r--r--sys-apps/hal/files/hal-unmount.dev17
-rw-r--r--sys-apps/hal/hal-0.5.14-r4.ebuild307
-rw-r--r--sys-apps/hal/metadata.xml36
-rw-r--r--trinity-apps/konversation/konversation-9999.ebuild (renamed from net-irc/konversation/konversation-1.1.9999.ebuild)0
-rw-r--r--trinity-apps/konversation/metadata.xml (renamed from dev-qt/qt-meta/metadata.xml)0
-rw-r--r--trinity-apps/ktron/metadata.xml8
-rw-r--r--trinity-apps/ktuberling/metadata.xml8
-rw-r--r--trinity-apps/lskat/metadata.xml8
-rw-r--r--trinity-apps/twin4/metadata.xml8
-rw-r--r--trinity-base/akregator/Manifest2
-rw-r--r--trinity-base/akregator/akregator-3.5.13.1.ebuild20
-rw-r--r--trinity-base/akregator/akregator-3.5.13.2.ebuild20
-rw-r--r--trinity-base/amor/Manifest2
-rw-r--r--trinity-base/amor/amor-3.5.13.1.ebuild11
-rw-r--r--trinity-base/amor/amor-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ark/Manifest2
-rw-r--r--trinity-base/ark/ark-3.5.13.1.ebuild16
-rw-r--r--trinity-base/ark/ark-3.5.13.2.ebuild16
-rw-r--r--trinity-base/arts/Manifest2
-rw-r--r--trinity-base/arts/arts-3.5.13.1.ebuild60
-rw-r--r--trinity-base/arts/arts-3.5.13.2.ebuild60
-rw-r--r--trinity-base/arts/arts-9999.ebuild2
-rw-r--r--trinity-base/atlantik/atlantik-9999.ebuild (renamed from trinity-apps/atlantik/atlantik-9999.ebuild)0
-rw-r--r--trinity-base/atlantik/metadata.xml (renamed from dev-qt/qt/metadata.xml)0
-rw-r--r--trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild (renamed from trinity-apps/atlantikdesigner/atlantikdesigner-9999.ebuild)2
-rw-r--r--trinity-base/atlantikdesigner/metadata.xml (renamed from dev-qt/qt4-tqt-engine/metadata.xml)0
-rw-r--r--trinity-base/certmanager/Manifest1
-rw-r--r--trinity-base/certmanager/certmanager-3.5.13.2.ebuild26
-rw-r--r--trinity-base/dcoprss/Manifest1
-rw-r--r--trinity-base/dcoprss/dcoprss-3.5.13.1.ebuild16
-rw-r--r--trinity-base/drkonqi/Manifest2
-rw-r--r--trinity-base/drkonqi/drkonqi-3.5.13.1.ebuild13
-rw-r--r--trinity-base/drkonqi/drkonqi-3.5.13.2.ebuild13
-rw-r--r--trinity-base/eyesapplet/Manifest2
-rw-r--r--trinity-base/eyesapplet/eyesapplet-3.5.13.1.ebuild11
-rw-r--r--trinity-base/eyesapplet/eyesapplet-3.5.13.2.ebuild11
-rw-r--r--trinity-base/fifteenapplet/Manifest2
-rw-r--r--trinity-base/fifteenapplet/fifteenapplet-3.5.13.1.ebuild11
-rw-r--r--trinity-base/fifteenapplet/fifteenapplet-3.5.13.2.ebuild11
-rw-r--r--trinity-base/filelight/filelight-9999.ebuild (renamed from trinity-apps/filelight/filelight-9999.ebuild)0
-rw-r--r--trinity-base/filelight/metadata.xml (renamed from dev-qt/tqt/metadata.xml)0
-rw-r--r--trinity-base/kaddressbook/Manifest1
-rw-r--r--trinity-base/kaddressbook/kaddressbook-3.5.13.2.ebuild33
-rw-r--r--trinity-base/kamera/Manifest1
-rw-r--r--trinity-base/kamera/kamera-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kappfinder/Manifest2
-rw-r--r--trinity-base/kappfinder/kappfinder-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kappfinder/kappfinder-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kasteroids/kasteroids-9999.ebuild (renamed from trinity-apps/kasteroids/kasteroids-9999.ebuild)0
-rw-r--r--trinity-base/kasteroids/metadata.xml (renamed from net-irc/konversation/metadata.xml)0
-rw-r--r--trinity-base/kate/Manifest2
-rw-r--r--trinity-base/kate/kate-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kate/kate-3.5.13.2.ebuild11
-rw-r--r--trinity-base/katomic/katomic-9999.ebuild (renamed from trinity-apps/katomic/katomic-9999.ebuild)0
-rw-r--r--trinity-base/katomic/metadata.xml (renamed from trinity-apps/atlantik/metadata.xml)0
-rw-r--r--trinity-base/kbackgammon/kbackgammon-9999.ebuild (renamed from trinity-apps/kbackgammon/kbackgammon-9999.ebuild)0
-rw-r--r--trinity-base/kbackgammon/metadata.xml (renamed from trinity-apps/atlantikdesigner/metadata.xml)0
-rw-r--r--trinity-base/kbattleship/kbattleship-9999.ebuild (renamed from trinity-apps/kbattleship/kbattleship-9999.ebuild)0
-rw-r--r--trinity-base/kbattleship/metadata.xml (renamed from trinity-apps/filelight/metadata.xml)0
-rw-r--r--trinity-base/kblackbox/kblackbox-9999.ebuild (renamed from trinity-apps/kblackbox/kblackbox-9999.ebuild)0
-rw-r--r--trinity-base/kblackbox/metadata.xml (renamed from trinity-apps/kasteroids/metadata.xml)0
-rw-r--r--trinity-base/kbounce/kbounce-9999.ebuild (renamed from trinity-apps/kbounce/kbounce-9999.ebuild)0
-rw-r--r--trinity-base/kbounce/metadata.xml (renamed from trinity-apps/katomic/metadata.xml)0
-rw-r--r--trinity-base/kcalc/Manifest2
-rw-r--r--trinity-base/kcalc/kcalc-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kcalc/kcalc-3.5.13.2.ebuild14
-rw-r--r--trinity-base/kcharselect/Manifest2
-rw-r--r--trinity-base/kcharselect/kcharselect-3.5.13.1.ebuild12
-rw-r--r--trinity-base/kcharselect/kcharselect-3.5.13.2.ebuild12
-rw-r--r--trinity-base/kcheckpass/Manifest2
-rw-r--r--trinity-base/kcheckpass/kcheckpass-3.5.13.1.ebuild24
-rw-r--r--trinity-base/kcheckpass/kcheckpass-3.5.13.2.ebuild24
-rw-r--r--trinity-base/kcheckpass/kcheckpass-9999.ebuild2
-rw-r--r--trinity-base/kcminit/Manifest2
l---------trinity-base/kcminit/files/shared1
-rw-r--r--trinity-base/kcminit/kcminit-3.5.13.1.ebuild17
-rw-r--r--trinity-base/kcminit/kcminit-3.5.13.2.ebuild17
-rw-r--r--trinity-base/kcoloredit/Manifest1
-rw-r--r--trinity-base/kcoloredit/kcoloredit-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kcontrol/Manifest2
-rw-r--r--trinity-base/kcontrol/kcontrol-3.5.13.1.ebuild47
-rw-r--r--trinity-base/kcontrol/kcontrol-3.5.13.2.ebuild47
-rw-r--r--trinity-base/kdcop/Manifest2
-rw-r--r--trinity-base/kdcop/kdcop-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdcop/kdcop-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kde-i18n/Manifest1
-rw-r--r--trinity-base/kde-i18n/kde-i18n-3.5.13.1.ebuild109
-rw-r--r--trinity-base/kde-i18n/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-emoticons/Manifest1
-rw-r--r--trinity-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdeartwork-emoticons/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-icewm-themes/Manifest1
-rw-r--r--trinity-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.13.1.ebuild18
-rw-r--r--trinity-base/kdeartwork-icewm-themes/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-icon-themes/Manifest1
-rw-r--r--trinity-base/kdeartwork-icon-themes/kdeartwork-icon-themes-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kdeartwork-icon-themes/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-kscreensaver/Manifest1
-rw-r--r--trinity-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.13.1.ebuild33
-rw-r--r--trinity-base/kdeartwork-kscreensaver/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-kwin-styles/Manifest1
-rw-r--r--trinity-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.13.1.ebuild13
-rw-r--r--trinity-base/kdeartwork-kwin-styles/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-kworldclock/Manifest1
-rw-r--r--trinity-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kdeartwork-kworldclock/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-meta/kdeartwork-meta-3.5.13.1.ebuild27
-rw-r--r--trinity-base/kdeartwork-meta/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-sounds/Manifest1
-rw-r--r--trinity-base/kdeartwork-sounds/kdeartwork-sounds-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdeartwork-sounds/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-styles/Manifest1
-rw-r--r--trinity-base/kdeartwork-styles/kdeartwork-styles-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdeartwork-styles/metadata.xml8
-rw-r--r--trinity-base/kdeartwork-wallpapers/Manifest1
-rw-r--r--trinity-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdeartwork-wallpapers/metadata.xml8
-rw-r--r--trinity-base/kdebase-data/Manifest2
-rw-r--r--trinity-base/kdebase-data/kdebase-data-3.5.13.1.ebuild13
-rw-r--r--trinity-base/kdebase-data/kdebase-data-3.5.13.2.ebuild13
-rw-r--r--trinity-base/kdebase-data/metadata.xml8
-rw-r--r--trinity-base/kdebase-kioslaves/Manifest2
-rw-r--r--trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch24
-rw-r--r--trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch146
-rw-r--r--trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild40
-rw-r--r--trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild40
-rw-r--r--trinity-base/kdebase-kioslaves/metadata.xml12
-rw-r--r--trinity-base/kdebase-meta/kdebase-meta-3.5.13.1.ebuild60
-rw-r--r--trinity-base/kdebase-meta/kdebase-meta-3.5.13.2.ebuild60
-rw-r--r--trinity-base/kdebase-meta/metadata.xml8
-rw-r--r--trinity-base/kdebase-starttde/Manifest2
-rw-r--r--trinity-base/kdebase-starttde/files/agent-shutdown.sh13
-rw-r--r--trinity-base/kdebase-starttde/files/agent-startup.sh29
-rw-r--r--trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch63
-rw-r--r--trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch63
-rw-r--r--trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch46
-rw-r--r--trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild98
-rw-r--r--trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild98
-rw-r--r--trinity-base/kdebase-starttde/metadata.xml8
-rw-r--r--trinity-base/kdebugdialog/Manifest2
l---------trinity-base/kdebugdialog/files/shared1
-rw-r--r--trinity-base/kdebugdialog/kdebugdialog-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdebugdialog/kdebugdialog-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kdebugdialog/metadata.xml8
-rw-r--r--trinity-base/kdeeject/Manifest2
-rw-r--r--trinity-base/kdeeject/kdeeject-3.5.13.1.ebuild15
-rw-r--r--trinity-base/kdeeject/kdeeject-3.5.13.2.ebuild15
-rw-r--r--trinity-base/kdeeject/metadata.xml8
-rw-r--r--trinity-base/kdegraphics-doc/Manifest1
l---------trinity-base/kdegraphics-doc/files/shared1
-rw-r--r--trinity-base/kdegraphics-doc/kdegraphics-doc-3.5.13.1.ebuild27
-rw-r--r--trinity-base/kdegraphics-doc/metadata.xml8
-rw-r--r--trinity-base/kdegraphics-kfile-plugins/Manifest1
-rw-r--r--trinity-base/kdegraphics-kfile-plugins/files/tdegraphics-poppler-tqt-remove-unnecessary-check.patch19
-rw-r--r--trinity-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.13.1.ebuild30
-rw-r--r--trinity-base/kdegraphics-kfile-plugins/metadata.xml8
-rw-r--r--trinity-base/kdegraphics-meta/kdegraphics-meta-3.5.13.1.ebuild39
-rw-r--r--trinity-base/kdegraphics-meta/metadata.xml8
-rw-r--r--trinity-base/kdelibs/Manifest2
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.1-OnlyShowIn-TDE.patch26
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.1-bug-1161.patch16
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-insane-kde4-variables.patch13
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-no-xcomposite.patch44
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch28
-rw-r--r--trinity-base/kdelibs/files/kdelibs-3.5.13.2-make-xcomposite-optional.patch29
-rw-r--r--trinity-base/kdelibs/kdelibs-3.5.13.1.ebuild136
-rw-r--r--trinity-base/kdelibs/kdelibs-3.5.13.2.ebuild137
-rw-r--r--trinity-base/kdelibs/metadata.xml13
-rw-r--r--trinity-base/kdelirc/Manifest2
l---------trinity-base/kdelirc/files/shared1
-rw-r--r--trinity-base/kdelirc/kdelirc-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdelirc/kdelirc-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kdelirc/metadata.xml8
-rw-r--r--trinity-base/kdenetwork-doc/Manifest1
-rw-r--r--trinity-base/kdenetwork-doc/files/kdenetwork-3.5.13.1-fix-references-to-user-profile-directory-6f85c0c.patch70
l---------trinity-base/kdenetwork-doc/files/shared1
-rw-r--r--trinity-base/kdenetwork-doc/kdenetwork-doc-3.5.13.1.ebuild30
-rw-r--r--trinity-base/kdenetwork-doc/metadata.xml8
-rw-r--r--trinity-base/kdenetwork-filesharing/Manifest1
-rw-r--r--trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch69
-rw-r--r--trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild13
-rw-r--r--trinity-base/kdenetwork-filesharing/metadata.xml8
-rw-r--r--trinity-base/kdenetwork-kfile-plugins/Manifest1
-rw-r--r--trinity-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdenetwork-kfile-plugins/metadata.xml8
-rw-r--r--trinity-base/kdepasswd/Manifest2
l---------trinity-base/kdepasswd/files/shared1
-rw-r--r--trinity-base/kdepasswd/kdepasswd-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kdepasswd/kdepasswd-3.5.13.2.ebuild14
-rw-r--r--trinity-base/kdepasswd/metadata.xml8
-rw-r--r--trinity-base/kdeprint/Manifest2
-rw-r--r--trinity-base/kdeprint/kdeprint-3.5.13.1.ebuild16
-rw-r--r--trinity-base/kdeprint/kdeprint-3.5.13.2.ebuild16
-rw-r--r--trinity-base/kdeprint/metadata.xml8
-rw-r--r--trinity-base/kdesktop/Manifest2
-rw-r--r--trinity-base/kdesktop/files/kdesktop-3.5.13.1-onlyshowin-tde.patch19
-rw-r--r--trinity-base/kdesktop/kdesktop-3.5.13.1.ebuild46
-rw-r--r--trinity-base/kdesktop/kdesktop-3.5.13.2.ebuild46
-rw-r--r--trinity-base/kdesktop/kdesktop-9999.ebuild4
-rw-r--r--trinity-base/kdesu/Manifest2
-rw-r--r--trinity-base/kdesu/kdesu-3.5.13.1.ebuild33
-rw-r--r--trinity-base/kdesu/kdesu-3.5.13.2.ebuild33
-rw-r--r--trinity-base/kdesu/metadata.xml12
-rw-r--r--trinity-base/kdetoys-doc/Manifest2
l---------trinity-base/kdetoys-doc/files/shared1
-rw-r--r--trinity-base/kdetoys-doc/kdetoys-doc-3.5.13.1.ebuild27
-rw-r--r--trinity-base/kdetoys-doc/kdetoys-doc-3.5.13.2.ebuild27
-rw-r--r--trinity-base/kdetoys-doc/kdetoys-doc-9999.ebuild27
-rw-r--r--trinity-base/kdetoys-doc/metadata.xml8
-rw-r--r--trinity-base/kdetoys-meta/kdetoys-meta-3.5.13.1.ebuild28
-rw-r--r--trinity-base/kdetoys-meta/metadata.xml8
-rw-r--r--trinity-base/kdeutils-doc/Manifest2
l---------trinity-base/kdeutils-doc/files/shared1
-rw-r--r--trinity-base/kdeutils-doc/kdeutils-doc-3.5.13.1.ebuild27
-rw-r--r--trinity-base/kdeutils-doc/kdeutils-doc-3.5.13.2.ebuild13
-rw-r--r--trinity-base/kdeutils-doc/metadata.xml8
-rw-r--r--trinity-base/kdeutils-meta/kdeutils-meta-3.5.13.1.ebuild36
-rw-r--r--trinity-base/kdeutils-meta/kdeutils-meta-3.5.13.2.ebuild36
-rw-r--r--trinity-base/kdeutils-meta/metadata.xml8
-rw-r--r--trinity-base/kdf/Manifest2
-rw-r--r--trinity-base/kdf/kdf-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdf/kdf-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kdialog/Manifest2
-rw-r--r--trinity-base/kdialog/kdialog-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdialog/kdialog-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kdict/Manifest1
-rw-r--r--trinity-base/kdict/kdict-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdm/Manifest2
-rwxr-xr-xtrinity-base/kdm/files/kdm-3.5.13.1-xsession.script66
-rwxr-xr-xtrinity-base/kdm/files/kdm-3.5.13.2-xsession.script66
-rw-r--r--trinity-base/kdm/kdm-3.5.13.1.ebuild105
-rw-r--r--trinity-base/kdm/kdm-3.5.13.2.ebuild103
-rw-r--r--trinity-base/kdm/metadata.xml12
-rw-r--r--trinity-base/kdnssd/Manifest1
-rw-r--r--trinity-base/kdnssd/kdnssd-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kdnssd/metadata.xml8
-rw-r--r--trinity-base/kdvi/Manifest1
-rw-r--r--trinity-base/kdvi/kdvi-3.5.13.1.ebuild17
-rw-r--r--trinity-base/kedit/Manifest2
-rw-r--r--trinity-base/kedit/kedit-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kedit/kedit-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kenolaba/kenolaba-9999.ebuild (renamed from trinity-apps/kenolaba/kenolaba-9999.ebuild)0
-rw-r--r--trinity-base/kenolaba/metadata.xml (renamed from trinity-apps/kbackgammon/metadata.xml)0
-rw-r--r--trinity-base/kfax/Manifest1
-rw-r--r--trinity-base/kfax/kfax-3.5.13.1.ebuild17
-rw-r--r--trinity-base/kfind/Manifest2
-rw-r--r--trinity-base/kfind/kfind-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kfind/kfind-3.5.13.2.ebuild14
-rw-r--r--trinity-base/kfloppy/Manifest2
-rw-r--r--trinity-base/kfloppy/kfloppy-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kfloppy/kfloppy-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kfouleggs/kfouleggs-9999.ebuild (renamed from trinity-apps/kfouleggs/kfouleggs-9999.ebuild)0
-rw-r--r--trinity-base/kfouleggs/metadata.xml (renamed from trinity-apps/kbattleship/metadata.xml)0
-rw-r--r--trinity-base/kgamma/Manifest1
-rw-r--r--trinity-base/kgamma/kgamma-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kgantt/Manifest1
-rw-r--r--trinity-base/kgantt/kgantt-3.5.13.2.ebuild13
-rw-r--r--trinity-base/kget/Manifest1
-rw-r--r--trinity-base/kget/kget-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kghostview/Manifest1
-rw-r--r--trinity-base/kghostview/files/tdegraphics-fix-kghostview-parallel-compilation.patch24
-rw-r--r--trinity-base/kghostview/kghostview-3.5.13.1.ebuild16
-rw-r--r--trinity-base/kgoldrunner/kgoldrunner-9999.ebuild (renamed from trinity-apps/kgoldrunner/kgoldrunner-9999.ebuild)0
-rw-r--r--trinity-base/kgoldrunner/metadata.xml (renamed from trinity-apps/kblackbox/metadata.xml)0
-rw-r--r--trinity-base/kgpg/Manifest2
-rw-r--r--trinity-base/kgpg/kgpg-3.5.13.1.ebuild16
-rw-r--r--trinity-base/kgpg/kgpg-3.5.13.2.ebuild16
-rw-r--r--trinity-base/kgpg/kgpg-9999.ebuild2
-rw-r--r--trinity-base/khelpcenter/Manifest2
-rw-r--r--trinity-base/khelpcenter/khelpcenter-3.5.13.1.ebuild30
-rw-r--r--trinity-base/khelpcenter/khelpcenter-3.5.13.2.ebuild30
-rw-r--r--trinity-base/khexedit/Manifest2
-rw-r--r--trinity-base/khexedit/khexedit-3.5.13.1.ebuild11
-rw-r--r--trinity-base/khexedit/khexedit-3.5.13.2.ebuild11
-rw-r--r--trinity-base/khotkeys/Manifest2
-rw-r--r--trinity-base/khotkeys/khotkeys-3.5.13.1.ebuild25
-rw-r--r--trinity-base/khotkeys/khotkeys-3.5.13.2.ebuild25
-rw-r--r--trinity-base/kicker/Manifest2
-rw-r--r--trinity-base/kicker/files/kicker-3.5.13.2-include-dbus.patch51
-rw-r--r--trinity-base/kicker/kicker-3.5.13.1.ebuild30
-rw-r--r--trinity-base/kicker/kicker-3.5.13.2.ebuild33
-rw-r--r--trinity-base/kiconedit/Manifest1
-rw-r--r--trinity-base/kiconedit/kiconedit-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kiconedit/metadata.xml8
-rw-r--r--trinity-base/kjots/Manifest2
-rw-r--r--trinity-base/kjots/kjots-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kjots/kjots-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kjumpingcube/kjumpingcube-9999.ebuild (renamed from trinity-apps/kjumpingcube/kjumpingcube-9999.ebuild)0
-rw-r--r--trinity-base/kjumpingcube/metadata.xml (renamed from trinity-apps/kbounce/metadata.xml)0
-rw-r--r--trinity-base/klaptopdaemon/Manifest2
-rw-r--r--trinity-base/klaptopdaemon/klaptopdaemon-3.5.13.1.ebuild25
-rw-r--r--trinity-base/klaptopdaemon/klaptopdaemon-3.5.13.2.ebuild25
-rw-r--r--trinity-base/klickety/klickety-9999.ebuild (renamed from trinity-apps/klickety/klickety-9999.ebuild)0
-rw-r--r--trinity-base/klickety/metadata.xml (renamed from trinity-apps/kenolaba/metadata.xml)0
-rw-r--r--trinity-base/klines/klines-9999.ebuild (renamed from trinity-apps/klines/klines-9999.ebuild)0
-rw-r--r--trinity-base/klines/metadata.xml (renamed from trinity-apps/kfouleggs/metadata.xml)0
-rw-r--r--trinity-base/klipper/Manifest2
-rw-r--r--trinity-base/klipper/klipper-3.5.13.1.ebuild22
-rw-r--r--trinity-base/klipper/klipper-3.5.13.2.ebuild22
-rw-r--r--trinity-base/kmahjongg/kmahjongg-9999.ebuild (renamed from trinity-apps/kmahjongg/kmahjongg-9999.ebuild)0
-rw-r--r--trinity-base/kmahjongg/metadata.xml (renamed from trinity-apps/kgoldrunner/metadata.xml)0
-rw-r--r--trinity-base/kmenuedit/Manifest2
-rw-r--r--trinity-base/kmenuedit/kmenuedit-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kmenuedit/kmenuedit-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kmilo/Manifest2
-rw-r--r--trinity-base/kmilo/files/kdeutils-3.5.13.1-kmilo-fix-powerbook.patch67
-rw-r--r--trinity-base/kmilo/kmilo-3.5.13.1.ebuild30
-rw-r--r--trinity-base/kmilo/kmilo-3.5.13.2.ebuild28
-rw-r--r--trinity-base/kmines/kmines-9999.ebuild (renamed from trinity-apps/kmines/kmines-9999.ebuild)0
-rw-r--r--trinity-base/kmines/metadata.xml (renamed from trinity-apps/kjumpingcube/metadata.xml)0
-rw-r--r--trinity-base/kmix/Manifest1
-rw-r--r--trinity-base/kmix/kmix-3.5.13.1.ebuild22
-rw-r--r--trinity-base/kmoon/Manifest2
-rw-r--r--trinity-base/kmoon/kmoon-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kmoon/kmoon-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kmrml/Manifest1
-rw-r--r--trinity-base/kmrml/kmrml-3.5.13.1.ebuild11
-rw-r--r--trinity-base/knetattach/Manifest2
-rw-r--r--trinity-base/knetattach/knetattach-3.5.13.1.ebuild11
-rw-r--r--trinity-base/knetattach/knetattach-3.5.13.2.ebuild11
-rw-r--r--trinity-base/knetwalk/knetwalk-9999.ebuild (renamed from trinity-apps/knetwalk/knetwalk-9999.ebuild)0
-rw-r--r--trinity-base/knetwalk/metadata.xml (renamed from trinity-apps/klickety/metadata.xml)0
-rw-r--r--trinity-base/knewsticker/Manifest1
-rw-r--r--trinity-base/knewsticker/files/knewsticker-a2b3834-fix-various-cmake-build-issues.patch16
-rw-r--r--trinity-base/knewsticker/knewsticker-3.5.13.1.ebuild17
-rw-r--r--trinity-base/knotes/Manifest1
-rw-r--r--trinity-base/knotes/knotes-3.5.13.2.ebuild18
-rw-r--r--trinity-base/kodo/Manifest2
-rw-r--r--trinity-base/kodo/kodo-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kodo/kodo-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kolf/kolf-9999.ebuild (renamed from trinity-apps/kolf/kolf-9999.ebuild)0
-rw-r--r--trinity-base/kolf/metadata.xml (renamed from trinity-apps/klines/metadata.xml)0
-rw-r--r--trinity-base/kolourpaint/Manifest1
-rw-r--r--trinity-base/kolourpaint/kolourpaint-3.5.13.1.ebuild12
-rw-r--r--trinity-base/konqueror/Manifest2
-rw-r--r--trinity-base/konqueror/konqueror-3.5.13.1.ebuild23
-rw-r--r--trinity-base/konqueror/konqueror-3.5.13.2.ebuild23
-rw-r--r--trinity-base/konquest/konquest-9999.ebuild (renamed from trinity-apps/konquest/konquest-9999.ebuild)0
-rw-r--r--trinity-base/konquest/metadata.xml (renamed from trinity-apps/kmahjongg/metadata.xml)0
-rw-r--r--trinity-base/konsole/Manifest2
-rw-r--r--trinity-base/konsole/konsole-3.5.13.1.ebuild26
-rw-r--r--trinity-base/konsole/konsole-3.5.13.2.ebuild26
-rw-r--r--trinity-base/kontact/Manifest1
-rw-r--r--trinity-base/kontact/kontact-3.5.13.2.ebuild20
-rw-r--r--trinity-base/kooka/Manifest1
-rw-r--r--trinity-base/kooka/kooka-3.5.13.1.ebuild18
-rw-r--r--trinity-base/kopete/Manifest1
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0001-f61f5c1-deleted-forgotten-files-for-commit-6e76ea67.patch6
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0002-f604b5b-fix-build-errors.patch51
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0003-e96ccab-added-xmms-support-to-cmake.patch42
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0004-e0fdfd9-fix-unwanted-rename-icon-with-automake.patch13
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0005-df8b5e2-fix-inadvertent-tq-changes.patch180
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0006-bd6aa1a-fix-inadvertent-tqt-changes.patch37
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0007-a2b3834-fix-various-cmake-build-issues.patch98
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0008-98c9c87-add-missing-file-from-previous-commit-10026753.patch28
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0009-81ace9c-fix-inadvertent-tq-changes.patch15
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0010-6f85c0c-fix-references-to-user-profile-directory.patch39
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0011-631f957-remove-nuisance-unsermake-warning-with-automake.patch12
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0012-4387c55-fix-inadvertent-tq-changes.patch75
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.1-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch373
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.2-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch450
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.3-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch454
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0014-265c466-added-test-of-the-presence-libgadu-with-automake.patch21
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0015-1bf5123-remove-unnecessary-language.patch34
-rw-r--r--trinity-base/kopete/kopete-3.5.13.1.ebuild114
-rw-r--r--trinity-base/korganizer/Manifest1
-rw-r--r--trinity-base/korganizer/korganizer-3.5.13.2.ebuild46
-rw-r--r--trinity-base/kpager/Manifest2
-rw-r--r--trinity-base/kpager/kpager-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kpager/kpager-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kpat/kpat-9999.ebuild (renamed from trinity-apps/kpat/kpat-9999.ebuild)0
-rw-r--r--trinity-base/kpat/metadata.xml (renamed from trinity-apps/kmines/metadata.xml)0
-rw-r--r--trinity-base/kpdf/Manifest1
-rw-r--r--trinity-base/kpdf/kpdf-3.5.13.1.ebuild14
-rw-r--r--trinity-base/kpersonalizer/Manifest2
-rw-r--r--trinity-base/kpersonalizer/kpersonalizer-3.5.13.1.ebuild13
-rw-r--r--trinity-base/kpersonalizer/kpersonalizer-3.5.13.2.ebuild13
-rw-r--r--trinity-base/kpf/Manifest1
-rw-r--r--trinity-base/kpf/kpf-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kpoker/kpoker-9999.ebuild (renamed from trinity-apps/kpoker/kpoker-9999.ebuild)0
-rw-r--r--trinity-base/kpoker/metadata.xml (renamed from trinity-apps/knetwalk/metadata.xml)0
-rw-r--r--trinity-base/kpovmodeler/Manifest1
-rw-r--r--trinity-base/kpovmodeler/kpovmodeler-3.5.13.1.ebuild16
-rw-r--r--trinity-base/kppp/Manifest1
-rw-r--r--trinity-base/kppp/files/kppp-v3.5.13.1-a2b3834-fix-various-cmake-build-issues.patch10
-rw-r--r--trinity-base/kppp/kppp-3.5.13.1.ebuild16
-rw-r--r--trinity-base/krdc/Manifest1
-rw-r--r--trinity-base/krdc/files/krdc-3.5.13.1-702c180-added-openslp-support-to-cmake.patch41
-rw-r--r--trinity-base/krdc/krdc-3.5.13.1.ebuild28
-rw-r--r--trinity-base/kreadconfig/Manifest2
-rw-r--r--trinity-base/kreadconfig/kreadconfig-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kreadconfig/kreadconfig-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kregexpeditor/Manifest2
-rw-r--r--trinity-base/kregexpeditor/kregexpeditor-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kregexpeditor/kregexpeditor-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kreversi/kreversi-9999.ebuild (renamed from trinity-apps/kreversi/kreversi-9999.ebuild)0
-rw-r--r--trinity-base/kreversi/metadata.xml (renamed from trinity-apps/kolf/metadata.xml)0
-rw-r--r--trinity-base/krfb/Manifest1
-rw-r--r--trinity-base/krfb/files/krfb-3.5.13.1-702c180-added-openslp-support-to-cmake.patch40
-rw-r--r--trinity-base/krfb/krfb-3.5.13.1.ebuild27
-rw-r--r--trinity-base/krootbacking/Manifest2
-rw-r--r--trinity-base/krootbacking/krootbacking-3.5.13.1.ebuild11
-rw-r--r--trinity-base/krootbacking/krootbacking-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kruler/Manifest1
-rw-r--r--trinity-base/kruler/kruler-3.5.13.1.ebuild11
-rw-r--r--trinity-base/ksame/ksame-9999.ebuild (renamed from trinity-apps/ksame/ksame-9999.ebuild)0
-rw-r--r--trinity-base/ksame/metadata.xml (renamed from trinity-apps/konquest/metadata.xml)0
-rw-r--r--trinity-base/kscreensaver/Manifest2
l---------trinity-base/kscreensaver/files/shared1
-rw-r--r--trinity-base/kscreensaver/kscreensaver-3.5.13.1.ebuild29
-rw-r--r--trinity-base/kscreensaver/kscreensaver-3.5.13.2.ebuild29
-rw-r--r--trinity-base/kscreensaver/metadata.xml11
-rw-r--r--trinity-base/kshisen/kshisen-9999.ebuild (renamed from trinity-apps/kshisen/kshisen-9999.ebuild)0
-rw-r--r--trinity-base/kshisen/metadata.xml (renamed from trinity-apps/kpat/metadata.xml)0
-rw-r--r--trinity-base/ksim/Manifest2
-rw-r--r--trinity-base/ksim/files/fix_crash.patch44
l---------trinity-base/ksim/files/shared1
-rw-r--r--trinity-base/ksim/ksim-3.5.13.1.ebuild27
-rw-r--r--trinity-base/ksim/ksim-3.5.13.2.ebuild26
-rw-r--r--trinity-base/ksirc/Manifest1
-rw-r--r--trinity-base/ksirc/ksirc-3.5.13.1.ebuild14
-rw-r--r--trinity-base/ksirtet/ksirtet-9999.ebuild (renamed from trinity-apps/ksirtet/ksirtet-9999.ebuild)0
-rw-r--r--trinity-base/ksirtet/metadata.xml (renamed from trinity-apps/kpoker/metadata.xml)0
-rw-r--r--trinity-base/ksmiletris/ksmiletris-9999.ebuild (renamed from trinity-apps/ksmiletris/ksmiletris-9999.ebuild)0
-rw-r--r--trinity-base/ksmiletris/metadata.xml (renamed from trinity-apps/kreversi/metadata.xml)0
-rw-r--r--trinity-base/ksmserver/Manifest2
-rw-r--r--trinity-base/ksmserver/ksmserver-3.5.13.1.ebuild24
-rw-r--r--trinity-base/ksmserver/ksmserver-3.5.13.2.ebuild24
-rw-r--r--trinity-base/ksmserver/ksmserver-9999.ebuild6
-rw-r--r--trinity-base/ksnake/ksnake-9999.ebuild (renamed from trinity-apps/ksnake/ksnake-9999.ebuild)0
-rw-r--r--trinity-base/ksnake/metadata.xml (renamed from trinity-apps/ksame/metadata.xml)0
-rw-r--r--trinity-base/ksnapshot/Manifest1
-rw-r--r--trinity-base/ksnapshot/ksnapshot-3.5.13.1.ebuild14
-rw-r--r--trinity-base/ksokoban/ksokoban-9999.ebuild (renamed from trinity-apps/ksokoban/ksokoban-9999.ebuild)0
-rw-r--r--trinity-base/ksokoban/metadata.xml (renamed from trinity-apps/kshisen/metadata.xml)0
-rw-r--r--trinity-base/kspaceduel/kspaceduel-9999.ebuild (renamed from trinity-apps/kspaceduel/kspaceduel-9999.ebuild)0
-rw-r--r--trinity-base/kspaceduel/metadata.xml (renamed from trinity-apps/ksirtet/metadata.xml)0
-rw-r--r--trinity-base/ksplashml/Manifest2
-rw-r--r--trinity-base/ksplashml/ksplashml-3.5.13.1.ebuild23
-rw-r--r--trinity-base/ksplashml/ksplashml-3.5.13.2.ebuild23
-rw-r--r--trinity-base/ksplashml/ksplashml-9999.ebuild2
-rw-r--r--trinity-base/kstart/Manifest2
-rw-r--r--trinity-base/kstart/kstart-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kstart/kstart-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ksvg/Manifest1
-rw-r--r--trinity-base/ksvg/files/ksvg-3.5.13.1-bug1311.patch14
-rw-r--r--trinity-base/ksvg/ksvg-3.5.13.1.ebuild20
-rw-r--r--trinity-base/ksysguard/Manifest2
-rw-r--r--trinity-base/ksysguard/ksysguard-3.5.13.1.ebuild20
-rw-r--r--trinity-base/ksysguard/ksysguard-3.5.13.2.ebuild20
-rw-r--r--trinity-base/ksystraycmd/Manifest2
-rw-r--r--trinity-base/ksystraycmd/ksystraycmd-3.5.13.1.ebuild11
-rw-r--r--trinity-base/ksystraycmd/ksystraycmd-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ktalkd/Manifest1
-rw-r--r--trinity-base/ktalkd/ktalkd-3.5.13.1.ebuild23
-rw-r--r--trinity-base/kteatime/Manifest2
-rw-r--r--trinity-base/kteatime/kteatime-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kteatime/kteatime-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ktimer/Manifest2
-rw-r--r--trinity-base/ktimer/ktimer-3.5.13.1.ebuild11
-rw-r--r--trinity-base/ktimer/ktimer-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ktip/Manifest2
-rw-r--r--trinity-base/ktip/ktip-3.5.13.1.ebuild11
-rw-r--r--trinity-base/ktip/ktip-3.5.13.2.ebuild11
-rw-r--r--trinity-base/ktnef/Manifest2
-rw-r--r--trinity-base/ktnef/ktnef-3.5.13.1.ebuild13
-rw-r--r--trinity-base/ktnef/ktnef-3.5.13.2.ebuild13
-rw-r--r--trinity-base/ktron/ktron-9999.ebuild (renamed from trinity-apps/ktron/ktron-9999.ebuild)0
-rw-r--r--trinity-base/ktron/metadata.xml (renamed from trinity-apps/ksmiletris/metadata.xml)0
-rw-r--r--trinity-base/ktuberling/ktuberling-9999.ebuild (renamed from trinity-apps/ktuberling/ktuberling-9999.ebuild)0
-rw-r--r--trinity-base/ktuberling/metadata.xml (renamed from trinity-apps/ksnake/metadata.xml)0
-rw-r--r--trinity-base/ktux/Manifest2
-rw-r--r--trinity-base/ktux/ktux-3.5.13.1.ebuild11
-rw-r--r--trinity-base/ktux/ktux-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kuickshow/Manifest1
-rw-r--r--trinity-base/kuickshow/kuickshow-3.5.13.1.ebuild15
-rw-r--r--trinity-base/kview/Manifest1
-rw-r--r--trinity-base/kview/kview-3.5.13.1.ebuild12
-rw-r--r--trinity-base/kviewshell/Manifest1
-rw-r--r--trinity-base/kviewshell/kviewshell-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kwallet/Manifest2
l---------trinity-base/kwallet/files/shared1
-rw-r--r--trinity-base/kwallet/kwallet-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kwallet/kwallet-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kwallet/metadata.xml8
-rw-r--r--trinity-base/kweather/Manifest2
-rw-r--r--trinity-base/kweather/kweather-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kweather/kweather-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kwifimanager/Manifest1
-rw-r--r--trinity-base/kwifimanager/files/kwifimanager-fix-3.5.13.1.patch25
-rw-r--r--trinity-base/kwifimanager/kwifimanager-3.5.13.1.ebuild26
-rw-r--r--trinity-base/kwin/Manifest2
-rw-r--r--trinity-base/kwin/kwin-3.5.13.1.ebuild29
-rw-r--r--trinity-base/kwin/kwin-3.5.13.2.ebuild29
-rw-r--r--trinity-base/kwin/metadata.xml8
-rw-r--r--trinity-base/kworldclock/Manifest2
-rw-r--r--trinity-base/kworldclock/kworldclock-3.5.13.1.ebuild11
-rw-r--r--trinity-base/kworldclock/kworldclock-3.5.13.2.ebuild11
-rw-r--r--trinity-base/kxkb/Manifest2
-rw-r--r--trinity-base/kxkb/kxkb-3.5.13.1.ebuild24
-rw-r--r--trinity-base/kxkb/kxkb-3.5.13.2.ebuild24
-rw-r--r--trinity-base/libkcal/Manifest2
-rw-r--r--trinity-base/libkcal/libkcal-3.5.13.1.ebuild19
-rw-r--r--trinity-base/libkcal/libkcal-3.5.13.2.ebuild19
-rw-r--r--trinity-base/libkdenetwork/Manifest1
-rw-r--r--trinity-base/libkdenetwork/libkdenetwork-3.5.13.2.ebuild17
-rw-r--r--trinity-base/libkdenetwork/metadata.xml8
-rw-r--r--trinity-base/libkdepim/Manifest2
-rw-r--r--trinity-base/libkdepim/libkdepim-3.5.13.1.ebuild28
-rw-r--r--trinity-base/libkdepim/libkdepim-3.5.13.2.ebuild28
-rw-r--r--trinity-base/libkdepim/metadata.xml8
-rw-r--r--trinity-base/libkholidays/Manifest1
-rw-r--r--trinity-base/libkholidays/libkholidays-3.5.13.2.ebuild13
-rw-r--r--trinity-base/libkmime/Manifest2
-rw-r--r--trinity-base/libkmime/libkmime-3.5.13.1.ebuild13
-rw-r--r--trinity-base/libkmime/libkmime-3.5.13.2.ebuild13
-rw-r--r--trinity-base/libkonq/Manifest2
-rw-r--r--trinity-base/libkonq/files/libkonq-3.5.13.1-onlyshowin-tde.patch20
-rw-r--r--trinity-base/libkonq/libkonq-3.5.13.1.ebuild22
-rw-r--r--trinity-base/libkonq/libkonq-3.5.13.2.ebuild22
-rw-r--r--trinity-base/libkpimexchange/Manifest1
-rw-r--r--trinity-base/libkpimexchange/libkpimexchange-3.5.13.2.ebuild19
-rw-r--r--trinity-base/libkpimidentities/Manifest1
-rw-r--r--trinity-base/libkpimidentities/libkpimidentities-3.5.13.2.ebuild19
-rw-r--r--trinity-base/libkscan/Manifest1
-rw-r--r--trinity-base/libkscan/files/tdegraphics-libkscan-fix-name.patch13
-rw-r--r--trinity-base/libkscan/libkscan-3.5.13.1.ebuild16
-rw-r--r--trinity-base/librss/Manifest1
-rw-r--r--trinity-base/librss/files/tdenetwork-fix-export-librss.patch21
-rw-r--r--trinity-base/librss/librss-3.5.13.1.ebuild13
-rw-r--r--trinity-base/libtdepim/libtdepim-9999.ebuild4
-rw-r--r--trinity-base/lisa/Manifest1
-rw-r--r--trinity-base/lisa/files/lisa-3.5.13.1-6f85c0c-fix-references-to-user-profile-directory.patch52
-rw-r--r--trinity-base/lisa/lisa-3.5.13.1.ebuild31
-rw-r--r--trinity-base/lskat/lskat-9999.ebuild (renamed from trinity-apps/lskat/lskat-9999.ebuild)0
-rw-r--r--trinity-base/lskat/metadata.xml (renamed from trinity-apps/ksokoban/metadata.xml)0
-rw-r--r--trinity-base/nsplugins/Manifest2
-rw-r--r--trinity-base/nsplugins/nsplugins-3.5.13.1.ebuild16
-rw-r--r--trinity-base/nsplugins/nsplugins-3.5.13.2.ebuild16
-rw-r--r--trinity-base/superkaramba/Manifest2
-rw-r--r--trinity-base/superkaramba/superkaramba-3.5.13.1.ebuild24
-rw-r--r--trinity-base/superkaramba/superkaramba-3.5.13.2.ebuild24
-rw-r--r--trinity-base/tdebase-pam/tdebase-pam-7.ebuild2
-rw-r--r--trinity-base/tdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch46
-rw-r--r--trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild14
-rw-r--r--trinity-base/tdelibs/tdelibs-9999.ebuild2
-rw-r--r--trinity-base/tqt3integration/Manifest2
-rw-r--r--trinity-base/tqt3integration/tqt3integration-3.5.13.1.ebuild11
-rw-r--r--trinity-base/tqt3integration/tqt3integration-3.5.13.2.ebuild11
-rw-r--r--trinity-base/tqt3integration/tqt3integration-9999.ebuild2
-rw-r--r--trinity-base/twin/twin-9999.ebuild2
-rw-r--r--trinity-base/twin4/metadata.xml (renamed from trinity-apps/kspaceduel/metadata.xml)0
-rw-r--r--trinity-base/twin4/twin4-9999.ebuild (renamed from trinity-apps/twin4/twin4-9999.ebuild)0
637 files changed, 130 insertions, 16272 deletions
diff --git a/Documentation/README b/Documentation/README
index 27e94fd6..fd561992 100644
--- a/Documentation/README
+++ b/Documentation/README
@@ -1,17 +1,19 @@
-This is a trinity Gentoo overlay.
-Please don't report bugs to Gentoo bugzilla.
-If you want to report a bug feel free to email me at fatzer2@gmail.com. I'm able to read and write in Russian and English.
-Overlay will be filled with ebuilds of ported to cmake programs from the Trinity Project.
-If you are interested in ebuilds for some packages that are not in the overlay, you can email me too.
+This is now the official trinity Gentoo overlay from the TDE team.
-Live ebuilds aren't tested at all, but you still can try to build them on your own risk.
+Currently it only supports the latest master branch, which means live version, which is R14.1.x as of writing, which some TDE team members are using in private life too, so it should be not perfect, but stable for the most part and also Gentoo users are very invited to test and reports bugs to TGW and so to be some part of TDE. This choice is also made because of realism that otherwise the maintaince burden would be most likely too hard for this overlay. So it is better to support one version, but that good instead of mutiple versions which are more likely to broke here and there.
-In order to properly use this overlay, you have to unmask the qt3 USE flag and packages.
-To do so, execute the following commands as root:
+But there are also efforts to support the stable branch of TDE (R14.0.x - R14.0.7 as of writing), if someone is willing to help with that. The support of v3.5.x was removed completely with the clean up progress, because it is too old now.
-# mkdir -p /etc/portage/profile
-# echo -qt3 >> /etc/portage/profile/use.mask
-# mkdir -p /etc/portage/packages.keywords/
-# cp /var/lib/layman/trinity /etc/portage/packages.keywords/
+This overlay is largely based on the very good and hard work of Fat-Zer (fatzer2@gmail.com) who created and maintained this overlay many years, to a time when Gentoo users had no other choice, because Gentoo devs don't wanted to support TDE (which they resist to do so still) and TDE had no official overlay for Gentoo users. It also tries to be some central place, in which all goods of other floating around TDE overlays should be centralized. So everyone is welcome to contribute to it, just with creating some PR in TGW.
-NOTE: hal compilation is now broken. If you know how to fix it, write me an email.
+Please don't report bugs to Gentoo bugzilla or Fat-Zer and instead of this, report issues to the tde-packages-gentoo repo at TGW.
+
+The overlay will be filled with ebuilds of ported to CMake programs from the Trinity Project mainly and that is the goal, but while CMake conversion is still in work and will be for some time, it will most likely offer also ebuilds of TDE applications not already converted to CMake and using autotools instead.
+
+Another goal is to offer also custom versions of specific libraries like libsdl or xine-lib, with added support for TDE and aRts, for example, which is deactivated from the official Gentoo ebuilds or preserve ebuilds related to TDE and/or TQt, which were removed from Portage. So the hope is, we can get the good old user experience of a KDE3 (now TDE) based Gentoo system back and get back control, like it was until 2008.
+
+While the goal is that this overlay works out the box without any problems, there can't be any guarantee for that and you might expect some problems from time to time, if there are Gentoo or TDE specific changes, for example. If so, you are free to open some issue in TGW to the tde-packaging-gentoo repo about that and maybe the problem can be fixed in some time.
+
+If you are interested in ebuilds for some packages that are not in the overlay or you have any fixes, you can create some PR in TGW and if your work is good, the ebuilds can be added. Also *any* help, from every Gentoo user loving TDE will be highly appreciated. You can also join the TDE IRC channel to get in touch with Chris, if you need any further help or want to help out with this overlay.
+
+Some guideline for this overlay is: Freedom of choice for everything. There should be in no case any forced or hardcoded USE flags, to build in any optional support some Gentoo users don't want to have or want on their systems. All building options TDE is offering, should be reflected in this overlay. \ No newline at end of file
diff --git a/Documentation/derived-lists/kdeartwork-3.5.13.1 b/Documentation/derived-lists/kdeartwork-3.5.13.1
deleted file mode 100644
index 94dd7375..00000000
--- a/Documentation/derived-lists/kdeartwork-3.5.13.1
+++ /dev/null
@@ -1,9 +0,0 @@
-trinity-base/kdeartwork-emoticons
-trinity-base/kdeartwork-icon-themes
-trinity-base/kdeartwork-icewm-themes
-trinity-base/kdeartwork-kscreensaver
-trinity-base/kdeartwork-kwin-styles
-trinity-base/kdeartwork-kworldclock
-trinity-base/kdeartwork-sounds
-trinity-base/kdeartwork-styles
-trinity-base/kdeartwork-wallpapers
diff --git a/Documentation/derived-lists/kdebase-3.5.13.1 b/Documentation/derived-lists/kdebase-3.5.13.1
deleted file mode 100644
index 9b15eb26..00000000
--- a/Documentation/derived-lists/kdebase-3.5.13.1
+++ /dev/null
@@ -1,42 +0,0 @@
-trinity-base/kdebase-starttde
-trinity-base/drkonqi
-trinity-base/kappfinder
-trinity-base/kate
-trinity-base/kcheckpass
-trinity-base/kcminit
-trinity-base/kcontrol
-trinity-base/kdcop
-trinity-base/kdebugdialog
-trinity-base/kdepasswd
-trinity-base/kdeprint
-trinity-base/kdesktop
-trinity-base/kdesu
-trinity-base/kdialog
-trinity-base/kdm
-trinity-base/kfind
-trinity-base/khelpcenter
-trinity-base/khotkeys
-trinity-base/kicker
-trinity-base/kdebase-kioslaves
-trinity-base/klipper
-trinity-base/kmenuedit
-trinity-base/konqueror
-trinity-base/konsole
-trinity-base/kpager
-trinity-base/kpersonalizer
-trinity-base/kreadconfig
-trinity-base/kscreensaver
-trinity-base/ksmserver
-trinity-base/ksplashml
-trinity-base/kstart
-trinity-base/ksysguard
-trinity-base/ksystraycmd
-trinity-base/ktip
-trinity-base/kwin
-trinity-base/kxkb
-trinity-base/libkonq
-trinity-base/nsplugins
-trinity-base/knetattach
-trinity-base/kdebase-data
-trinity-base/krootbacking
-trinity-base/tqt3integration
diff --git a/Documentation/derived-lists/kdebase-3.5.13.2 b/Documentation/derived-lists/kdebase-3.5.13.2
deleted file mode 100644
index 9b15eb26..00000000
--- a/Documentation/derived-lists/kdebase-3.5.13.2
+++ /dev/null
@@ -1,42 +0,0 @@
-trinity-base/kdebase-starttde
-trinity-base/drkonqi
-trinity-base/kappfinder
-trinity-base/kate
-trinity-base/kcheckpass
-trinity-base/kcminit
-trinity-base/kcontrol
-trinity-base/kdcop
-trinity-base/kdebugdialog
-trinity-base/kdepasswd
-trinity-base/kdeprint
-trinity-base/kdesktop
-trinity-base/kdesu
-trinity-base/kdialog
-trinity-base/kdm
-trinity-base/kfind
-trinity-base/khelpcenter
-trinity-base/khotkeys
-trinity-base/kicker
-trinity-base/kdebase-kioslaves
-trinity-base/klipper
-trinity-base/kmenuedit
-trinity-base/konqueror
-trinity-base/konsole
-trinity-base/kpager
-trinity-base/kpersonalizer
-trinity-base/kreadconfig
-trinity-base/kscreensaver
-trinity-base/ksmserver
-trinity-base/ksplashml
-trinity-base/kstart
-trinity-base/ksysguard
-trinity-base/ksystraycmd
-trinity-base/ktip
-trinity-base/kwin
-trinity-base/kxkb
-trinity-base/libkonq
-trinity-base/nsplugins
-trinity-base/knetattach
-trinity-base/kdebase-data
-trinity-base/krootbacking
-trinity-base/tqt3integration
diff --git a/Documentation/derived-lists/kdegraphics-3.5.13.1 b/Documentation/derived-lists/kdegraphics-3.5.13.1
deleted file mode 100644
index 5a903104..00000000
--- a/Documentation/derived-lists/kdegraphics-3.5.13.1
+++ /dev/null
@@ -1,21 +0,0 @@
-trinity-base/kamera
-trinity-base/kcoloredit
-#! trinity-base/kdvi
-#! trinity-base/kfax
-trinity-base/kdegraphics-doc
-trinity-base/kdegraphics-kfile-plugins
-trinity-base/kgamma
-trinity-base/kghostview
-trinity-base/kiconedit
-trinity-base/kmrml
-trinity-base/kolourpaint
-trinity-base/kooka
-trinity-base/kpdf
-trinity-base/kpovmodeler
-trinity-base/kruler
-trinity-base/ksnapshot
-trinity-base/ksvg
-trinity-base/kuickshow
-trinity-base/kview
-trinity-base/kviewshell
-trinity-base/libkscan
diff --git a/Documentation/derived-lists/kdemultimedia-3.5.13.1 b/Documentation/derived-lists/kdemultimedia-3.5.13.1
deleted file mode 100644
index 7601d50c..00000000
--- a/Documentation/derived-lists/kdemultimedia-3.5.13.1
+++ /dev/null
@@ -1,16 +0,0 @@
-#? trinity-base/akode
-#? trinity-base/apps-artsplugins
-#? trinity-base/juk
-#? trinity-base/kaboodle
-#? trinity-base/kaudiocreator
-#? trinity-base/kdemultimedia-arts
-#? trinity-base/kdemultimedia-kappfinder-data
-#? trinity-base/kdemultimedia-kfile-plugins
-#? trinity-base/kdemultimedia-kioslaves
-#? trinity-base/kmid
-trinity-base/kmix
-#? trinity-base/krec
-#? trinity-base/kscd
-#? trinity-base/libkcddb
-#? trinity-base/mpeglib
-#? trinity-base/noatun
diff --git a/Documentation/derived-lists/kdenetwork-3.5.13.1 b/Documentation/derived-lists/kdenetwork-3.5.13.1
deleted file mode 100644
index db5da8ac..00000000
--- a/Documentation/derived-lists/kdenetwork-3.5.13.1
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/dcoprss
-trinity-base/kdict
-trinity-base/kdnssd
-trinity-base/kget
-trinity-base/knewsticker
-trinity-base/kopete
-trinity-base/kpf
-trinity-base/kppp
-trinity-base/krdc
-trinity-base/krfb
-trinity-base/ksirc
-trinity-base/ktalkd
-trinity-base/kwifimanager
-trinity-base/librss
-trinity-base/lisa
-trinity-base/kdenetwork-doc
-trinity-base/kdenetwork-filesharing
-trinity-base/kdenetwork-kfile-plugins
diff --git a/Documentation/derived-lists/kdepim-3.5.13.1 b/Documentation/derived-lists/kdepim-3.5.13.1
deleted file mode 100644
index 9baa2271..00000000
--- a/Documentation/derived-lists/kdepim-3.5.13.1
+++ /dev/null
@@ -1,37 +0,0 @@
-trinity-base/akregator
-#? trinity-base/certmanager
-#? trinity-base/kdepim-doc
-#? trinity-base/indexlib
-#? trinity-base/kabc
-#? trinity-base/kaddressbook
-#? trinity-base/kalarm
-#? trinity-base/kandy
-#? trinity-base/karm
-#? trinity-base/kfile-plugins
-#? trinity-base/kgantt
-#? trinity-base/kdepim-kioslaves
-#? trinity-base/kitchensync
-#? trinity-base/kmail
-#? trinity-base/kmailcvt
-#? trinity-base/kmobile
-#? trinity-base/knode
-#? trinity-base/knotes
-#? trinity-base/kode
-#? trinity-base/konsolekalendar
-#? trinity-base/kontact
-#? trinity-base/korganizer
-#? trinity-base/korn
-#? trinity-base/kdepim-kresources
-trinity-base/ktnef
-#? trinity-base/libemailfunctions
-trinity-base/libkcal
-#? trinity-base/libkholidays
-trinity-base/libkmime
-#? trinity-base/libkpgp
-#? trinity-base/libkpimexchange
-#? trinity-base/libkpimidentities
-#? trinity-base/libksieve
-#? trinity-base/libkdenetwork
-trinity-base/libkdepim
-#? trinity-base/mimelib
-#? trinity-base/kdepim-wizards
diff --git a/Documentation/derived-lists/kdepim-3.5.13.2 b/Documentation/derived-lists/kdepim-3.5.13.2
deleted file mode 100644
index 552415a1..00000000
--- a/Documentation/derived-lists/kdepim-3.5.13.2
+++ /dev/null
@@ -1,37 +0,0 @@
-trinity-base/akregator
-trinity-base/certmanager
-#? trinity-base/kdepim-doc
-#? trinity-base/indexlib
-#? trinity-base/kabc
-trinity-base/kaddressbook
-#? trinity-base/kalarm
-#? trinity-base/kandy
-#? trinity-base/karm
-#? trinity-base/kfile-plugins
-trinity-base/kgantt
-#? trinity-base/kdepim-kioslaves
-#? trinity-base/kitchensync
-#? trinity-base/kmail
-#? trinity-base/kmailcvt
-#? trinity-base/kmobile
-#? trinity-base/knode
-trinity-base/knotes
-#? trinity-base/kode
-#? trinity-base/konsolekalendar
-trinity-base/kontact
-trinity-base/korganizer
-#? trinity-base/korn
-#? trinity-base/kdepim-kresources
-trinity-base/ktnef
-#? trinity-base/libemailfunctions
-trinity-base/libkcal
-trinity-base/libkholidays
-trinity-base/libkmime
-#? trinity-base/libkpgp
-trinity-base/libkpimexchange
-trinity-base/libkpimidentities
-#? trinity-base/libksieve
-trinity-base/libkdenetwork
-trinity-base/libkdepim
-#? trinity-base/mimelib
-#? trinity-base/kdepim-wizards
diff --git a/Documentation/derived-lists/kdetoys-3.5.13.1 b/Documentation/derived-lists/kdetoys-3.5.13.1
deleted file mode 100644
index d424d6c4..00000000
--- a/Documentation/derived-lists/kdetoys-3.5.13.1
+++ /dev/null
@@ -1,10 +0,0 @@
-trinity-base/amor
-trinity-base/eyesapplet
-trinity-base/fifteenapplet
-trinity-base/kdetoys-doc
-trinity-base/kmoon
-trinity-base/kodo
-trinity-base/kteatime
-trinity-base/ktux
-trinity-base/kweather
-trinity-base/kworldclock
diff --git a/Documentation/derived-lists/kdetoys-3.5.13.2 b/Documentation/derived-lists/kdetoys-3.5.13.2
deleted file mode 100644
index d424d6c4..00000000
--- a/Documentation/derived-lists/kdetoys-3.5.13.2
+++ /dev/null
@@ -1,10 +0,0 @@
-trinity-base/amor
-trinity-base/eyesapplet
-trinity-base/fifteenapplet
-trinity-base/kdetoys-doc
-trinity-base/kmoon
-trinity-base/kodo
-trinity-base/kteatime
-trinity-base/ktux
-trinity-base/kweather
-trinity-base/kworldclock
diff --git a/Documentation/derived-lists/kdeutils-3.5.13.1 b/Documentation/derived-lists/kdeutils-3.5.13.1
deleted file mode 100644
index 9dcaed67..00000000
--- a/Documentation/derived-lists/kdeutils-3.5.13.1
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/ark
-trinity-base/kdeutils-doc
-trinity-base/kcalc
-trinity-base/kcharselect
-trinity-base/kdelirc
-trinity-base/kdf
-trinity-base/kedit
-trinity-base/kfloppy
-trinity-base/kgpg
-trinity-base/khexedit
-trinity-base/kjots
-trinity-base/klaptopdaemon
-trinity-base/kmilo
-trinity-base/kregexpeditor
-trinity-base/ksim
-trinity-base/ktimer
-trinity-base/kwallet
-trinity-base/superkaramba
diff --git a/Documentation/derived-lists/kdeutils-3.5.13.2 b/Documentation/derived-lists/kdeutils-3.5.13.2
deleted file mode 100644
index 9dcaed67..00000000
--- a/Documentation/derived-lists/kdeutils-3.5.13.2
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/ark
-trinity-base/kdeutils-doc
-trinity-base/kcalc
-trinity-base/kcharselect
-trinity-base/kdelirc
-trinity-base/kdf
-trinity-base/kedit
-trinity-base/kfloppy
-trinity-base/kgpg
-trinity-base/khexedit
-trinity-base/kjots
-trinity-base/klaptopdaemon
-trinity-base/kmilo
-trinity-base/kregexpeditor
-trinity-base/ksim
-trinity-base/ktimer
-trinity-base/kwallet
-trinity-base/superkaramba
diff --git a/Documentation/derived-lists/tdegames-9999 b/Documentation/derived-lists/tdegames-9999
index 8731fda7..93b3f528 100644
--- a/Documentation/derived-lists/tdegames-9999
+++ b/Documentation/derived-lists/tdegames-9999
@@ -1,34 +1,34 @@
-trinity-apps/atlantik
+trinity-base/atlantik
trinity-base/tdegames-doc
-trinity-apps/kasteroids
-trinity-apps/katomic
-trinity-apps/kbackgammon
-trinity-apps/kbattleship
-trinity-apps/kblackbox
-trinity-apps/kbounce
-trinity-apps/kenolaba
-trinity-apps/kfouleggs
-trinity-apps/kgoldrunner
-trinity-apps/kjumpingcube
-trinity-apps/klickety
-trinity-apps/klines
-trinity-apps/kmahjongg
-trinity-apps/kmines
-trinity-apps/knetwalk
-trinity-apps/kolf
-trinity-apps/konquest
-trinity-apps/kpat
-trinity-apps/kpoker
-trinity-apps/kreversi
-trinity-apps/ksame
-trinity-apps/kshisen
-trinity-apps/ksirtet
-trinity-apps/ksmiletris
-trinity-apps/ksnake
-trinity-apps/ksokoban
-trinity-apps/kspaceduel
-trinity-apps/ktron
-trinity-apps/ktuberling
+trinity-base/kasteroids
+trinity-base/katomic
+trinity-base/kbackgammon
+trinity-base/kbattleship
+trinity-base/kblackbox
+trinity-base/kbounce
+trinity-base/kenolaba
+trinity-base/kfouleggs
+trinity-base/kgoldrunner
+trinity-base/kjumpingcube
+trinity-base/klickety
+trinity-base/klines
+trinity-base/kmahjongg
+trinity-base/kmines
+trinity-base/knetwalk
+trinity-base/kolf
+trinity-base/konquest
+trinity-base/kpat
+trinity-base/kpoker
+trinity-base/kreversi
+trinity-base/ksame
+trinity-base/kshisen
+trinity-base/ksirtet
+trinity-base/ksmiletris
+trinity-base/ksnake
+trinity-base/ksokoban
+trinity-base/kspaceduel
+trinity-base/ktron
+trinity-base/ktuberling
trinity-base/libtdegames
-trinity-apps/lskat
-trinity-apps/twin4
+trinity-base/lskat
+trinity-base/twin4
diff --git a/Documentation/trinity.3.5.13.2.keywords b/Documentation/trinity.3.5.13.2.keywords
deleted file mode 100644
index 5fbfc244..00000000
--- a/Documentation/trinity.3.5.13.2.keywords
+++ /dev/null
@@ -1,90 +0,0 @@
-~trinity-base/akregator-3.5.13.2
-~trinity-base/amor-3.5.13.2
-~trinity-base/ark-3.5.13.2
-~trinity-base/arts-3.5.13.2
-~trinity-base/certmanager-3.5.13.2
-~trinity-base/drkonqi-3.5.13.2
-~trinity-base/eyesapplet-3.5.13.2
-~trinity-base/fifteenapplet-3.5.13.2
-~trinity-base/kaddressbook-3.5.13.2
-~trinity-base/kappfinder-3.5.13.2
-~trinity-base/kate-3.5.13.2
-~trinity-base/kcalc-3.5.13.2
-~trinity-base/kcharselect-3.5.13.2
-~trinity-base/kcheckpass-3.5.13.2
-~trinity-base/kcminit-3.5.13.2
-~trinity-base/kcontrol-3.5.13.2
-~trinity-base/kdcop-3.5.13.2
-~trinity-base/kdebase-data-3.5.13.2
-~trinity-base/kdebase-kioslaves-3.5.13.2
-~trinity-base/kdebase-meta-3.5.13.2
-~trinity-base/kdebase-starttde-3.5.13.2
-~trinity-base/kdebugdialog-3.5.13.2
-~trinity-base/kdeeject-3.5.13.2
-~trinity-base/kdelibs-3.5.13.2
-~trinity-base/kdelirc-3.5.13.2
-~trinity-base/kdepasswd-3.5.13.2
-~trinity-base/kdeprint-3.5.13.2
-~trinity-base/kdesktop-3.5.13.2
-~trinity-base/kdesu-3.5.13.2
-~trinity-base/kdetoys-doc-3.5.13.2
-~trinity-base/kdeutils-doc-3.5.13.2
-~trinity-base/kdeutils-meta-3.5.13.2
-~trinity-base/kdf-3.5.13.2
-~trinity-base/kdialog-3.5.13.2
-~trinity-base/kdm-3.5.13.2
-~trinity-base/kedit-3.5.13.2
-~trinity-base/kfind-3.5.13.2
-~trinity-base/kfloppy-3.5.13.2
-~trinity-base/kgantt-3.5.13.2
-~trinity-base/kgpg-3.5.13.2
-~trinity-base/khelpcenter-3.5.13.2
-~trinity-base/khexedit-3.5.13.2
-~trinity-base/khotkeys-3.5.13.2
-~trinity-base/kicker-3.5.13.2
-~trinity-base/kjots-3.5.13.2
-~trinity-base/klaptopdaemon-3.5.13.2
-~trinity-base/klipper-3.5.13.2
-~trinity-base/kmenuedit-3.5.13.2
-~trinity-base/kmilo-3.5.13.2
-~trinity-base/kmoon-3.5.13.2
-~trinity-base/knetattach-3.5.13.2
-~trinity-base/knotes-3.5.13.2
-~trinity-base/kodo-3.5.13.2
-~trinity-base/konqueror-3.5.13.2
-~trinity-base/konsole-3.5.13.2
-~trinity-base/kontact-3.5.13.2
-~trinity-base/korganizer-3.5.13.2
-~trinity-base/kpager-3.5.13.2
-~trinity-base/kpersonalizer-3.5.13.2
-~trinity-base/kreadconfig-3.5.13.2
-~trinity-base/kregexpeditor-3.5.13.2
-~trinity-base/krootbacking-3.5.13.2
-~trinity-base/kscreensaver-3.5.13.2
-~trinity-base/ksim-3.5.13.2
-~trinity-base/ksmserver-3.5.13.2
-~trinity-base/ksplashml-3.5.13.2
-~trinity-base/kstart-3.5.13.2
-~trinity-base/ksysguard-3.5.13.2
-~trinity-base/ksystraycmd-3.5.13.2
-~trinity-base/kteatime-3.5.13.2
-~trinity-base/ktimer-3.5.13.2
-~trinity-base/ktip-3.5.13.2
-~trinity-base/ktnef-3.5.13.2
-~trinity-base/ktux-3.5.13.2
-~trinity-base/kwallet-3.5.13.2
-~trinity-base/kweather-3.5.13.2
-~trinity-base/kwin-3.5.13.2
-~trinity-base/kworldclock-3.5.13.2
-~trinity-base/kxkb-3.5.13.2
-~trinity-base/libkcal-3.5.13.2
-~trinity-base/libkdenetwork-3.5.13.2
-~trinity-base/libkdepim-3.5.13.2
-~trinity-base/libkholidays-3.5.13.2
-~trinity-base/libkmime-3.5.13.2
-~trinity-base/libkonq-3.5.13.2
-~trinity-base/libkpimexchange-3.5.13.2
-~trinity-base/libkpimidentities-3.5.13.2
-~trinity-base/nsplugins-3.5.13.2
-~trinity-base/superkaramba-3.5.13.2
-~trinity-base/tqt3integration-3.5.13.2
diff --git a/Documentation/trinity.live.keywords b/Documentation/trinity.live.keywords
index 662ac982..e057f38d 100644
--- a/Documentation/trinity.live.keywords
+++ b/Documentation/trinity.live.keywords
@@ -1,42 +1,42 @@
~dev-libs/dbus-1-tqt-9999 **
~dev-libs/dbus-tqt-9999 **
-~dev-qt/tqt-3.9999 **
-~dev-qt/tqtinterface-9999 **
-~net-irc/konversation-1.1.9999 **
-~trinity-apps/atlantik-9999 **
-~trinity-apps/atlantikdesigner-9999 **
-~trinity-apps/filelight-9999 **
-~trinity-apps/kasteroids-9999 **
-~trinity-apps/katomic-9999 **
-~trinity-apps/kbackgammon-9999 **
-~trinity-apps/kbattleship-9999 **
-~trinity-apps/kblackbox-9999 **
-~trinity-apps/kbounce-9999 **
-~trinity-apps/kenolaba-9999 **
-~trinity-apps/kfouleggs-9999 **
-~trinity-apps/kgoldrunner-9999 **
-~trinity-apps/kjumpingcube-9999 **
-~trinity-apps/klickety-9999 **
-~trinity-apps/klines-9999 **
-~trinity-apps/kmahjongg-9999 **
-~trinity-apps/kmines-9999 **
-~trinity-apps/knetwalk-9999 **
-~trinity-apps/kolf-9999 **
-~trinity-apps/konquest-9999 **
-~trinity-apps/kpat-9999 **
-~trinity-apps/kpoker-9999 **
-~trinity-apps/kreversi-9999 **
-~trinity-apps/ksame-9999 **
-~trinity-apps/kshisen-9999 **
-~trinity-apps/ksirtet-9999 **
-~trinity-apps/ksmiletris-9999 **
-~trinity-apps/ksnake-9999 **
-~trinity-apps/ksokoban-9999 **
-~trinity-apps/kspaceduel-9999 **
-~trinity-apps/ktron-9999 **
-~trinity-apps/ktuberling-9999 **
-~trinity-apps/lskat-9999 **
-~trinity-apps/twin4-9999 **
+~dev-tqt/tqt-9999 **
+~dev-tqt/tqtinterface-9999 **
+~trinity-apps/konversation-9999 **
+~trinity-base/atlantik-9999 **
+~trinity-base/atlantikdesigner-9999 **
+~trinity-base/filelight-9999 **
+~trinity-base/kasteroids-9999 **
+~trinity-base/katomic-9999 **
+~trinity-base/kbackgammon-9999 **
+~trinity-base/kbattleship-9999 **
+~trinity-base/kblackbox-9999 **
+~trinity-base/kbounce-9999 **
+~trinity-base/kenolaba-9999 **
+~trinity-base/kfouleggs-9999 **
+~trinity-base/kgoldrunner-9999 **
+~trinity-base/kjumpingcube-9999 **
+~trinity-base/klickety-9999 **
+~trinity-base/klines-9999 **
+~trinity-base/kmahjongg-9999 **
+~trinity-base/kmines-9999 **
+~trinity-base/knetwalk-9999 **
+~trinity-base/kolf-9999 **
+~trinity-base/konquest-9999 **
+~trinity-base/kpat-9999 **
+~trinity-base/kpoker-9999 **
+~trinity-base/kreversi-9999 **
+~trinity-base/ksame-9999 **
+~trinity-base/kshisen-9999 **
+~trinity-base/ksirtet-9999 **
+~trinity-base/ksmiletris-9999 **
+~trinity-base/ksnake-9999 **
+~trinity-base/ksokoban-9999 **
+~trinity-base/kspaceduel-9999 **
+~trinity-base/ktron-9999 **
+~trinity-base/ktuberling-9999 **
+~trinity-base/lskat-9999 **
+~trinity-base/twin4-9999 **
~trinity-base/akregator-9999 **
~trinity-base/amor-9999 **
~trinity-base/ark-9999 **
diff --git a/Documentation/trinity.overlay b/Documentation/trinity.overlay
index 7c330b3c..cac3983b 100644
--- a/Documentation/trinity.overlay
+++ b/Documentation/trinity.overlay
@@ -1,10 +1,10 @@
<layman>
-<overlay type="git" src="https://github.com/Fat-Zer/trinity.git" contact="fatzer2@gmail.com" status="unofficial" name="trinity">
+<overlay type="git" src="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo.git" status="unofficial" name="trinity-official">
<link>
http://www.trinitydesktop.org/
</link>
<description>
-Gentoo overlay for Trinity Desktop Environment, a fork of KDE3
+Official Gentoo overlay from the TDE team for Trinity Desktop Environment, a fork of KDE3
</description>
</overlay>
</layman>
diff --git a/app-misc/hal-info/Manifest b/app-misc/hal-info/Manifest
deleted file mode 100644
index e835d357..00000000
--- a/app-misc/hal-info/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hal-info-20091130.tar.gz 144859 SHA256 3b5a90eaea4359977d36c808a19b3f08835345a258c68b9c6c080ad5ef875224 SHA512 c435e60eaa8170cdf12112e4fbefe34180e499de53c5b30d26c6f8999626708a41600d8ce41a2e999f791e0855676d1ef4362d7b3cd52297195294b8b8b3c52e WHIRLPOOL f6e0807376bdaa90332f532429939550a0f3144a818f51cb21f656790a64afdeefab234a16674eb46a02d272a019c7bf698bfce024067b1b680e1b11e13e2284
diff --git a/app-misc/hal-info/hal-info-20091130.ebuild b/app-misc/hal-info/hal-info-20091130.ebuild
deleted file mode 100644
index 2222dd6f..00000000
--- a/app-misc/hal-info/hal-info-20091130.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="The fdi scripts that HAL uses"
-HOMEPAGE="http://hal.freedesktop.org/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/hal-0.5.10"
-DEPEND="${RDEPEND}"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_install() {
- emake DESTDIR="${D}" install || die
-}
diff --git a/app-mobilephone/smssend/files/smssend-3.4-verizon.diff b/app-mobilephone/smssend/files/smssend-3.4-verizon.patch
index 3496a083..3496a083 100644
--- a/app-mobilephone/smssend/files/smssend-3.4-verizon.diff
+++ b/app-mobilephone/smssend/files/smssend-3.4-verizon.patch
diff --git a/app-mobilephone/smssend/smssend-3.4-r2.ebuild b/app-mobilephone/smssend/smssend-3.4-r2.ebuild
index 1efcbded..f1c63093 100644
--- a/app-mobilephone/smssend/smssend-3.4-r2.ebuild
+++ b/app-mobilephone/smssend/smssend-3.4-r2.ebuild
@@ -21,7 +21,7 @@ IUSE=""
DEPEND=">=dev-libs/skyutils-2.8-r5[ssl]"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-verizon.diff" )
+PATCHES=( "${FILESDIR}/${P}-verizon.patch" )
src_prepare() {
default
diff --git a/dev-libs/dbus-1-tqt/Manifest b/dev-libs/dbus-1-tqt/Manifest
deleted file mode 100644
index 1ab93a8f..00000000
--- a/dev-libs/dbus-1-tqt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dbus-1-tqt-3.5.13.1.tar.gz 378109 SHA256 afa621ae0bd65d50d011c1789e98f1418a2c852d2ca72833b1f50805acb1d935 SHA512 5c73d0cf603f345782b318197dec89632123ca2a3802cf152fd8f24600ec670a156f74026e4578bd25af766dd5a5243050442ee07067cfef9bd950f0cd5b3a39 WHIRLPOOL 95e5dd704824cc23390795d775735cdaeb58245c266409888f5cd0b79563e5b00e5b60fd2fbc8e5618889f612dfbcf71566223ed23a2ca1318454812b952b78a
-DIST dbus-1-tqt-trinity-3.5.13.2.tar.xz 302900 SHA256 b4b048a4eaa67e9bedb5d46a15f16f5b814c3eb55474c6bcd4a817105b5e4a64 SHA512 3bc6b732288e9348ebff999644478926fefc8f62235a3accb45fdf828a2ef6988cf2d192b093ad532393fbe57bfbb353371bef18caff27f512d2f046d24f3131 WHIRLPOOL 0d959b83181c97bc26343322312c848e7c7c031912f8f3869806d2d4f682fa142d405016e49da1e498ab9311b18f1cacde5d71de99531412ce51b2dd26e27b51
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.1.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.1.ebuild
deleted file mode 100644
index 900599a6..00000000
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="dbus-1-tqt"
-
-inherit trinity-base
-
-DESCRIPTION="D-BUS TQt bindings"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-qt/qt-3.3.8d:3
- sys-apps/dbus
- dev-qt/tqtinterface"
-RDEPEND="$DEPEND"
-
-src_configure() {
- cmake-utils_src_configure
-}
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.2.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.2.ebuild
deleted file mode 100644
index b9a75d2b..00000000
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-3.5.13.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="dbus-1-tqt"
-
-inherit trinity-base
-
-DESCRIPTION="D-BUS TQt bindings"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-qt/qt-3.3.8d:3
- sys-apps/dbus
- dev-qt/tqtinterface"
-RDEPEND="$DEPEND"
-
-src_configure() {
- cmake-utils_src_configure
-}
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
index 6d1a5cd6..cb3944aa 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE=""
DEPEND="sys-apps/dbus
- dev-qt/tqtinterface"
+ dev-tqt/tqtinterface"
RDEPEND="$DEPEND"
src_configure() {
diff --git a/dev-libs/dbus-tqt/Manifest b/dev-libs/dbus-tqt/Manifest
deleted file mode 100644
index bfd3c3ad..00000000
--- a/dev-libs/dbus-tqt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dbus-tqt-3.5.13.1.tar.gz 513838 SHA256 f6e024370743c1aae32f9c89660fb22b93f3710864eef679a3be07b2ab3aec71 SHA512 ef9b9d1873b524f07940d9ce31ffb7a8c7002baebb7ab58aec2c93040e9827b33d22a522f63e8d60151bca0f2509f5e4cab0a8d37097ef6262c4a8beca2506db WHIRLPOOL 6b4090816d9790781767d2a523cde61632cabff739966e8c44e06b218a2bfb13c313c574060eaac27fad02dd1df1d7209e1171e2e9f3a93097957c805e31c5b1
diff --git a/dev-libs/dbus-tqt/dbus-tqt-3.5.13.1.ebuild b/dev-libs/dbus-tqt/dbus-tqt-3.5.13.1.ebuild
deleted file mode 100644
index ea8f2542..00000000
--- a/dev-libs/dbus-tqt/dbus-tqt-3.5.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="dbus-tqt"
-
-inherit trinity-base
-
-DESCRIPTION="D-BUS TQt bindings"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-qt/qt-3.3.8d:3
- dev-qt/tqtinterface
- !!dev-libs/dbus-qt3-old"
-RDEPEND="$DEPEND"
-
-src_configure() {
- cmake-utils_src_configure
-}
diff --git a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
index 6455d67b..63a22f4c 100644
--- a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
@@ -15,8 +15,7 @@ SLOT="0"
IUSE=""
DEPEND="sys-apps/dbus
- dev-qt/tqtinterface
- !!dev-libs/dbus-qt3-old"
+ dev-tqt/tqtinterface"
RDEPEND="$DEPEND"
src_configure() {
diff --git a/dev-qt/qt-meta/qt-meta-3.3.8d.ebuild b/dev-qt/qt-meta/qt-meta-3.3.8d.ebuild
deleted file mode 100644
index d64ac5d3..00000000
--- a/dev-qt/qt-meta/qt-meta-3.3.8d.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=3
-
-DESCRIPTION="This is a meta package for a Qt3 toolkit it is needed to keep dependencies clean"
-HOMEPAGE="http://qt.nokia.com/ http://www.trinitydesktop.org/"
-
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
-
-DEPEND="
- =dev-qt/qt-${PV}:${SLOT}[cups=,debug=,doc=,examples=,firebird=,ipv6=,mysql=]
- =dev-qt/qt-${PV}:${SLOT}[nas=,nis=,opengl=,postgres=,sqlite=,xinerama=]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- echo
- einfo "Please note that this meta package is only provided for capability."
- einfo "No packages should depend directly on this meta package, but on the"
- einfo "dev-qt/qt:${SLOT} package."
- echo
-}
diff --git a/dev-qt/qt-meta/qt-meta-3.9999.ebuild b/dev-qt/qt-meta/qt-meta-3.9999.ebuild
deleted file mode 100644
index 5999dde5..00000000
--- a/dev-qt/qt-meta/qt-meta-3.9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=3
-
-DESCRIPTION="This is a meta package for a Qt3 toolkit it is needed to keep dependencies clean"
-HOMEPAGE="http://qt.nokia.com/ http://www.trinitydesktop.org/"
-
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-SLOT="3"
-KEYWORDS=
-IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
-
-DEPEND="
- =dev-qt/qt-${PV}:${SLOT}[cups=,debug=,doc=,examples=,firebird=,ipv6=,mysql=]
- =dev-qt/qt-${PV}:${SLOT}[nas=,nis=,opengl=,postgres=,sqlite=,xinerama=]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- echo
- einfo "Please note that this meta package is only provided for capability."
- einfo "No packages should depend directly on this meta package, but on the"
- einfo "dev-qt/qt:${SLOT} package."
- echo
-}
diff --git a/dev-qt/qt/Manifest b/dev-qt/qt/Manifest
deleted file mode 100644
index e2d3452b..00000000
--- a/dev-qt/qt/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2012-12-12_02_54_53-Ensure-that-a-valid-DPI-is-always-set-cbe0a27.patch 1053 SHA256 6822c2f3c59c621ba853f583f9fdf2cd6b7ac1b069d1a2ec147e2f4ee6a7aa7b SHA512 c2209b9a61c817422df932f7d844f07a85ac3cc0f6a75770cf3eac279419c5b95091d919a533fac94c72e8b2f98004a5c858870a15660c0b33cb0d94a5aeb431 WHIRLPOOL c434a0f5e7d9b801bb0a6a5c68f564b32b876b2c66ab2bd6511b54cc9755c35cd6f2d3bd8e9deba4dd302dcceb0615d408371f36d1129cadd65246f64ff7098c
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch 1412 SHA256 1c53a022a723f25ca9661d9b6baa552e9ff1cf76f6d3cba4f9f19b8b8c547a1a SHA512 d625c0c6adf436de29780ba5bbf077a30c7fcd6b19c69e2191ab6ad40f20d9f2c2dc0ec55ded01c7bf777c5913c9b5bcac8b09ca1c6a04ea25f39d9fcbb8e137 WHIRLPOOL ed27f89056249d06399f709b4ab8fb5f0fbdc43b8db6cb5935045e061666eb1792b79f1564fd840b9fe880debf2fbd770ed54b29cafc1dd46afb2fea519e3e65
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-02-20_21_52_12-Doublebuffer-QIconView-to-reduce-flicker-This-closes-Bug-1408-897cd5c.patch 3266 SHA256 c901cebe79142bb81764138eff6bbdb74c126cd4950555f97924000c791aad96 SHA512 d892a88052a713a8f7d1edcbef15c951aac33a25f1f73e90a63f6b1394413678bf4ed12865710b84ddb4d9536dd452bc1c2f88af7a442807aa0f61aeadff0020 WHIRLPOOL c370ab576e8e68e54a5f0b18c19b19013c762f0434b60cbc595d8f5d465e8c81fdb6496080d4b71f78d4de390a7fbff8181dcce6946eb60f0c7825f2fe1473a5
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-03-02_12_16_10-Fix-textbox-trails-introduced-with-GIT-commit-82b71e49-This-resolves-Bug-1408-a78eb9c.patch 599 SHA256 03f4a35d89835a0b3de726492b99d83045a6c4c27170f4c0feaa4d7e7cd361e6 SHA512 b779f7669f40796c9c7b7d4c9e1970b930e661b7247927cdb0c668c084a950dc19bdeab4b15326248ec836987160821fed98f467e8bdfe5c2f250ed8db143f07 WHIRLPOOL 3258ff6dfec41829fe2390bca3cb7739d5fc5d00dcc99f4cc0694c6d2d12f0603b4535ebd2874bb99fae767fa8b63f8bc85e58dfe84f5e108f841f693475f616
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-13_13_31_15-Properly-set-WM_CLASS-atom-even-if-Display-pointer-was-passed-to-TQApplication-This-relates-to-Bug-1443-045b2d9.patch 1640 SHA256 88cce480013054358856e35df7f734f52a2188276d5ac786707aa7f4eef4575b SHA512 0c6ffd19404633c2ec8d6742fead4713227852174b83fb749656daf4117766d08a94624c81c3e2226d524aa904039337811b4a68878f72170ece0a0ad6136df7 WHIRLPOOL a9ffc49517144ff6c02dbb8be969817baec0960b80e0a2637ecfa3da43f0bf556b9df9c9b93b5485389335b3c24b2fa8ef17224db2c3aa2d5acb46519c7d6d6b
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch 1138 SHA256 caca943700c410e75d8bfc8c5b0c07c6041f5a4f1b5068a8ae9907aba3c3e1cb SHA512 121681c67a0417b2ead19d5f3ad206f12f3b10bf997ad12315b2fc3dbc3a60487d90a782cb6899bf4e3a4774cfa06d5233752118acc6b113fd79723b0295e39d WHIRLPOOL 56d5a008c5bcc4e2079e549a596900cd7df763af0f45978e8761c4879e45a466652c3b2184ac6c895181b109a68f5d24f12ce36c7cf7cbfbeda3c7f58fea4c3b
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch 1664 SHA256 c28a05e90a19a7a5e73c1d840f2605e2d457f5030242057fd205155f5fd50c1b SHA512 a3ac74e67fc014e0169ceca4d0df953ce6b1897236f090273196ff36133d25b64b66a7b7781695a790760720fd194243c09e3b33a1f02115c96d519db106f3ab WHIRLPOOL a0ec3ad64708840a1a2b2eefd1118979bcdf6c2f158ec5320f626348c3562df6d855864950aa3f00deb22142807f1555af2e2adb64fffdbdfd215962aa968060
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Fix-qmake-library-search-path-on-64-bit-systems-This-resolves-Bug-1016-e374dac.patch 484 SHA256 3ad05e0a17420315039834c6816c540b3c4695fa3c4a969bc2b1ea44f0b1542c SHA512 45c68ec9a00eae11195f71926a256c683fb6d237763555f0889f9f780971d382ee0e75f718b960355a932314ec3e8347d9282d6f9961701acef077b36365b92e WHIRLPOOL da7640575b82f94cd606a4777f9916a7ec6a7f163b8105004433356a8bef8a165154980d00c3d579cfdbc00fc10690f0b1e531c69da9b9eb03bdcd5e6c7ff644
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Update-zh-tw-translations-c62cd50.patch 10355 SHA256 9c538abc919d0f54ce7615c2d070f353e894ab712637deabd8aeca5560d3c8a1 SHA512 762e98fcf0772f774524f95d1678e976aa5e8c503a123ef23cf0633baa9d068889ec8259379f5bd021ca37c99c48b9f8ca0f6791de10ad670e62e65b52d2450c WHIRLPOOL 7134d02266ec8356568ed493cde3f99f79e41e3ac422ceb81a0b5d0fac5b47473824ea099f774de426eb893bc487672576f312d716dbbd3c9798fb7439edb065
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Add-0084-compositing-patch-from-RedHat-909c3cb.patch 2682 SHA256 d2443d46fdfcfa45fc8fd6249efe4a264a3c4c82df6ae786f1d11582321b49be SHA512 a6f5dc4c6ca4502bc12d0e568e6ce8c4d4d9646a7596376db85b58687be32d9569f6b5f663c8eb282595729c4bea110f9c3b5368d6bb1159548d64b33c4dd92f WHIRLPOOL a4e72e38474c336cee82d35208a2119c67d4d3211d6d191bd79abb53c9de580bca47f45544702717f9a22e8da5e7efce120f60b8ee0c78446ea90fc00c71964f
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch 1531 SHA256 ee56a45c2ec961e67a9aeaf0e232af089e8f99e8f012ea6210db0e8b0de46a0c SHA512 7408f786aea8104e0a2372c1d46493e5cae7bd13a71f6b7e25803b40e5a6170833f6e2c23ae5f680ed8924e354e499efb63c21baa18de486f64ab5332d8408cf WHIRLPOOL 9b97795a571579a0bc0782052c23e4bbf3a95947c070aaebc563c84497f6bedfc43640a3a2ffe0a1dd83fb86270f02fc7ba3a2465a9c103e663f12cd2e549765
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_01-Make-basic-integer-QDataStream-reads-resistant-to-corruption-from-underlying-IO-device-failure-60621ef.patch 2928 SHA256 c3736f4297d22c076f107a6b5756ac59cf581b86bb88e2a28cb06fd120cba0ad SHA512 46941d3b677bafd84b1b52efbc56b5b5848423d1f8a9a7f83f485939a2092ce6344dcceeccb524e8ca8b97d3defd060644405d70fadc6f51a8ae6b57d55affbe WHIRLPOOL 031431bca71b586e64b60c63600a8832daa5faee3a150534072bba8d74929fc05639a858739622c5e0552088095e840c2a40a9c6530e58a4f50b20de1b5671a7
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-04-25_03_21_44-Fix-a-number-of-threading-problems-and-crashes-This-partially-resolves-Bug-1467-part-of-the-original-commit-b8e4f24.patch 25691 SHA256 7f6156a4f927fae9571c6277e1e4619750c7a0a9d9893a102f262f3105affc65 SHA512 0d9e30ec474e25be3c2542337c5e0ae9f1a2e412d006a528180bdcc692cdab7eb584926e26964453591fd3315ce713ca39660ab50c6688fe4eb3f924fa8bc2e0 WHIRLPOOL b54a8ea84d1d0e850675a0e2168bddd971edb3b493c7f52f7d34d239f4541e3856610dcf05d47b297565bec9e2cb9bbe7aada141703c58fc723f9ffa2f13e424
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-05-03_03_47_45-Fix-corrupted-titlebar-icons-in-subwindows-of-ARGB-applications-90f4a55.patch 1996 SHA256 707099432bd702883b488ddf5cd5290b327938168392efc4c03a862abef67000 SHA512 e839b2575def437aa98670298e2804f4f826a6483cf7e220193cf7b641b2b68ec2cf731a23ecb2c8e78bf432d778378e93eccb3d7f51b74cdea68aec0e7b0661 WHIRLPOOL c9d7c1882efa0d41cd19cc4fa175216791d40c053b73714fa67f43ed76b428b2471bf9f447373afddecbcaceeb3febaf7f87ba62d9fec97fc5a3f263c5c89ef8
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-05-04_17_28_30-Fix-ARGB-mode-stippled-focus-rectangle-showing-underlying-window-contents-Fix-TQColor-not-processing-alpha-channel-in-ARGB-mode-d2240de.patch 2184 SHA256 3893537b4a328495c717d586b135b940b29ca50de9240878cec350e0208f79f3 SHA512 68c73892f8cc011392261267b3a9ed38b4989e9ed3adbe34982ee1d220be9dba503ec9bf383b29f601b2fc11f490db33b7802c21223050d581ea84b683f0943d WHIRLPOOL 10525ee058888558c191dfe0922f45f53df60a9594e921c6cee94ddcbcbfc2efe3aeb18ab73372adfac3ecfb49943ef875cd936ae1bc01f8da2f3a1baba969db
-AUX trinity-3.5.13.1..3.5.13.2/qt3-2013-05-08_01_43_38-Fix-spelling-mistakes-169c39a.patch 3103 SHA256 19e830e3dcdb0888cd00a94ba9acafb9d6b2c22961306d4a796b5fabba63e449 SHA512 107d8c84fd480b8cbcb93b30ca1f78352e53a776d64221378fc4b5fb9f08decc5edec2973377d37785cc02bdd68c7c305dde2c2a1fad3827ea1964b28b72857c WHIRLPOOL c7c073884cbb99451784a2cf27fa7a7b3dce927e9f6be8111875272e58adb4b689f156d4c0f72896dbbc72473597456910422013d487a2082616d08c213b6db5
-DIST qt3-3.5.13.1.tar.gz 16618074 SHA256 6d124412f89eb7c445668e339cd10114778b3efe56f061886364a0b27141a6ff SHA512 7adda5a6ee2c72086e672230dcd9088d39d975ee802dfc1ac4fcbb0b9cdd2feeac3b1a7147663ffb57b285e0631b14735930ea1f33904c37b000d96c0859ae84 WHIRLPOOL e0afdbc051f6d215ad6e46ec6a9756e96d303177d32c21ee7d944a1abe5b58b153da5afb01942b747278b92876203e05076cd18a0e75a51c5ab3c52b6b25eda6
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2012-12-12_02_54_53-Ensure-that-a-valid-DPI-is-always-set-cbe0a27.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2012-12-12_02_54_53-Ensure-that-a-valid-DPI-is-always-set-cbe0a27.patch
deleted file mode 100644
index 313d9ee5..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2012-12-12_02_54_53-Ensure-that-a-valid-DPI-is-always-set-cbe0a27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
-index a755c01..5941657 100644
---- a/src/kernel/qpaintdevice_x11.cpp
-+++ b/src/kernel/qpaintdevice_x11.cpp
-@@ -529,11 +529,16 @@ static void create_dpis()
- Q_CHECK_PTR( dpisX );
- Q_CHECK_PTR( dpisY );
- for ( i = 0; i < screens; i++ ) {
-- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
--
-- / (DisplayWidthMM(dpy,i)*10);
-- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-- / (DisplayHeightMM(dpy,i)*10);
-+ if (DisplayWidthMM(dpy,i) < 1)
-+ dpisX[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
-+ / (DisplayWidthMM(dpy,i)*10);
-+ if (DisplayHeightMM(dpy,i) < 1)
-+ dpisY[ i ] = 75; // default the dpi to 75.
-+ else
-+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-+ / (DisplayHeightMM(dpy,i)*10);
- }
- }
-
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch
deleted file mode 100644
index 980268de..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
-index 203cb39..4a03d95 100644
---- a/src/kernel/qapplication_x11.cpp
-+++ b/src/kernel/qapplication_x11.cpp
-@@ -3446,13 +3446,26 @@ int QApplication::x11ProcessEvent( XEvent* event )
- // update the size for desktop widget
- int scr = XRRRootToScreen( appDpy, event->xany.window );
- QWidget *w = desktop()->screen( scr );
-- QSize oldSize( w->size() );
-- w->crect.setWidth( DisplayWidth( appDpy, scr ) );
-- w->crect.setHeight( DisplayHeight( appDpy, scr ) );
-- if ( w->size() != oldSize ) {
-- QResizeEvent e( w->size(), oldSize );
-- QApplication::sendEvent( w, &e );
-- emit desktop()->resized( scr );
-+
-+ if (w) {
-+ int widgetScr = -1;
-+ // make sure the specified widget is on the same screen that received the XRandR event
-+ XWindowAttributes widgetAttr;
-+ XGetWindowAttributes(appDpy, w->winId(), &widgetAttr);
-+ if (widgetAttr.screen) {
-+ widgetScr = XScreenNumberOfScreen(widgetAttr.screen);
-+ }
-+
-+ if ((widgetScr < 0) || (widgetScr == scr)) {
-+ QSize oldSize( w->size() );
-+ w->crect.setWidth( DisplayWidth( appDpy, scr ) );
-+ w->crect.setHeight( DisplayHeight( appDpy, scr ) );
-+ if ( w->size() != oldSize ) {
-+ QResizeEvent e( w->size(), oldSize );
-+ QApplication::sendEvent( w, &e );
-+ emit desktop()->resized( scr );
-+ }
-+ }
- }
- }
- #endif // QT_NO_XRANDR
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-02-20_21_52_12-Doublebuffer-QIconView-to-reduce-flicker-This-closes-Bug-1408-897cd5c.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-02-20_21_52_12-Doublebuffer-QIconView-to-reduce-flicker-This-closes-Bug-1408-897cd5c.patch
deleted file mode 100644
index 6da074b5..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-02-20_21_52_12-Doublebuffer-QIconView-to-reduce-flicker-This-closes-Bug-1408-897cd5c.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
-index c1ea8cc..36b5da2 100644
---- a/src/iconview/qiconview.cpp
-+++ b/src/iconview/qiconview.cpp
-@@ -214,6 +214,7 @@ public:
- QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem,
- *startDragItem, *pressedItem, *selectAnchor, *renamingItem;
- QRect *rubber;
-+ QPixmap *backBuffer;
- QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer,
- *fullRedrawTimer;
- int rastX, rastY, spacing;
-@@ -2789,6 +2790,7 @@ QIconView::QIconView( QWidget *parent, const char *name, WFlags f )
- d->currentItem = 0;
- d->highlightedItem = 0;
- d->rubber = 0;
-+ d->backBuffer = 0;
- d->scrollTimer = 0;
- d->startDragItem = 0;
- d->tmpCurrentItem = 0;
-@@ -2942,6 +2944,8 @@ QIconView::~QIconView()
- delete item;
- item = tmp;
- }
-+ delete d->backBuffer;
-+ d->backBuffer = 0;
- delete d->fm;
- d->fm = 0;
- #ifndef QT_NO_TOOLTIP
-@@ -4943,6 +4947,47 @@ void QIconView::contentsDropEvent( QDropEvent *e )
- #endif
-
- /*!
-+ This function grabs all paintevents that otherwise would have been
-+ processed by the QScrollView::viewportPaintEvent(). Here we use a
-+ doublebuffer to reduce 'on-paint' flickering on QIconView
-+ (and of course its children).
-+
-+ \sa QScrollView::viewportPaintEvent(), QIconView::drawContents()
-+*/
-+
-+void QIconView::bufferedPaintEvent( QPaintEvent* pe )
-+{
-+ QWidget* vp = viewport();
-+ QRect r = pe->rect() & vp->rect();
-+ int ex = r.x() + contentsX();
-+ int ey = r.y() + contentsY();
-+ int ew = r.width();
-+ int eh = r.height();
-+
-+ if ( !d->backBuffer )
-+ d->backBuffer = new QPixmap(vp->size());
-+ if ( d->backBuffer->size() != vp->size() ) {
-+ // Resize function (with hysteresis). Uses a good compromise between memory
-+ // consumption and speed (number) of resizes.
-+ float newWidth = (float)vp->width();
-+ float newHeight = (float)vp->height();
-+ if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() )
-+ {
-+ newWidth *= 1.1892;
-+ newHeight *= 1.1892;
-+ d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+ } else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() )
-+ d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+ }
-+
-+ QPainter p;
-+ p.begin(d->backBuffer, vp);
-+ drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh);
-+ p.end();
-+ bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh);
-+}
-+
-+/*!
- \reimp
- */
-
-@@ -5726,7 +5771,7 @@ bool QIconView::eventFilter( QObject * o, QEvent * e )
- if ( !d->rubber )
- drawDragShapes( d->oldDragPos );
- }
-- viewportPaintEvent( (QPaintEvent*)e );
-+ bufferedPaintEvent( (QPaintEvent*)e );
- if ( d->dragging ) {
- if ( !d->rubber )
- drawDragShapes( d->oldDragPos );
-diff --git a/src/iconview/qiconview.h b/src/iconview/qiconview.h
-index 97780d8..109779f 100644
---- a/src/iconview/qiconview.h
-+++ b/src/iconview/qiconview.h
-@@ -452,6 +452,7 @@ protected:
- void contentsDropEvent( QDropEvent *e );
- #endif
-
-+ void bufferedPaintEvent( QPaintEvent* );
- void resizeEvent( QResizeEvent* e );
- void keyPressEvent( QKeyEvent *e );
- void focusInEvent( QFocusEvent *e );
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-03-02_12_16_10-Fix-textbox-trails-introduced-with-GIT-commit-82b71e49-This-resolves-Bug-1408-a78eb9c.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-03-02_12_16_10-Fix-textbox-trails-introduced-with-GIT-commit-82b71e49-This-resolves-Bug-1408-a78eb9c.patch
deleted file mode 100644
index 3a8768d0..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-03-02_12_16_10-Fix-textbox-trails-introduced-with-GIT-commit-82b71e49-This-resolves-Bug-1408-a78eb9c.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
-index 36b5da2..4387a19 100644
---- a/src/iconview/qiconview.cpp
-+++ b/src/iconview/qiconview.cpp
-@@ -5770,11 +5770,11 @@ bool QIconView::eventFilter( QObject * o, QEvent * e )
- if ( d->dragging ) {
- if ( !d->rubber )
- drawDragShapes( d->oldDragPos );
-- }
-- bufferedPaintEvent( (QPaintEvent*)e );
-- if ( d->dragging ) {
-+ viewportPaintEvent( (QPaintEvent*)e );
- if ( !d->rubber )
- drawDragShapes( d->oldDragPos );
-+ } else {
-+ bufferedPaintEvent( (QPaintEvent*)e );
- }
- }
- return TRUE;
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-13_13_31_15-Properly-set-WM_CLASS-atom-even-if-Display-pointer-was-passed-to-TQApplication-This-relates-to-Bug-1443-045b2d9.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-13_13_31_15-Properly-set-WM_CLASS-atom-even-if-Display-pointer-was-passed-to-TQApplication-This-relates-to-Bug-1443-045b2d9.patch
deleted file mode 100644
index 2daa09f7..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-13_13_31_15-Properly-set-WM_CLASS-atom-even-if-Display-pointer-was-passed-to-TQApplication-This-relates-to-Bug-1443-045b2d9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
-index 7296f4c..0ec4904 100644
---- a/src/kernel/qapplication.cpp
-+++ b/src/kernel/qapplication.cpp
-@@ -320,6 +320,7 @@ void qt_init( int *, char **, QApplication::Type );
- void qt_cleanup();
- #if defined(Q_WS_X11)
- void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE );
-+void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE );
- #endif
- Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
-
-@@ -908,7 +909,7 @@ QApplication::QApplication(Display *dpy, int argc, char **argv,
-
- qt_init( &argc, argv, GuiClient );
- } else {
-- qt_init(dpy, visual, colormap);
-+ qt_init( &argc, argv, dpy, visual, colormap );
- }
-
- process_cmdline( &argc, argv );
-diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
-index 4a03d95..0f9d777 100644
---- a/src/kernel/qapplication_x11.cpp
-+++ b/src/kernel/qapplication_x11.cpp
-@@ -1639,7 +1639,7 @@ void qt_init_internal( int *argcptr, char **argv,
- }
- #endif
-
-- if ( display ) {
-+ if ( display && ((!argcptr) || (!argv)) ) {
- // Qt part of other application
-
- appForeignDpy = TRUE;
-@@ -2439,6 +2439,11 @@ void qt_init( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap )
- qt_init_internal( 0, 0, display, visual, colormap );
- }
-
-+void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap )
-+{
-+ qt_init_internal( argcptr, argv, display, visual, colormap );
-+}
-+
-
- /*****************************************************************************
- qt_cleanup() - cleans up when the application is finished
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch
deleted file mode 100644
index 40426ef8..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-16_17_34_08-Fix-fatal-X11-errors-when-both-external-display-and-command-arguments-are-provided-to-QApplication-This-resolves-Bug-1456-e7d0f7d.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
-index 0f9d777..50a2bac 100644
---- a/src/kernel/qapplication_x11.cpp
-+++ b/src/kernel/qapplication_x11.cpp
-@@ -1790,18 +1790,26 @@ void qt_init_internal( int *argcptr, char **argv,
- }
- }
- #endif
-- // Connect to X server
--
-- if( qt_is_gui_used ) {
-- if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
-- qWarning( "%s: cannot connect to X server %s", appName,
-- XDisplayName(appDpyName) );
-- qApp = 0;
-- exit( 1 );
-- }
-+ if ( display ) {
-+ // Display connection already opened by another application
-
-- if ( appSync ) // if "-sync" argument
-- XSynchronize( appDpy, TRUE );
-+ appForeignDpy = TRUE;
-+ appDpy = display;
-+ }
-+ else {
-+ // Connect to X server
-+
-+ if( qt_is_gui_used ) {
-+ if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
-+ qWarning( "%s: cannot connect to X server %s", appName,
-+ XDisplayName(appDpyName) );
-+ qApp = 0;
-+ exit( 1 );
-+ }
-+
-+ if ( appSync ) // if "-sync" argument
-+ XSynchronize( appDpy, TRUE );
-+ }
- }
- }
- // Common code, regardless of whether display is foreign.
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch
deleted file mode 100644
index 3df8e73b..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
-index 50a2bac..9236f3a 100644
---- a/src/kernel/qapplication_x11.cpp
-+++ b/src/kernel/qapplication_x11.cpp
-@@ -195,7 +195,7 @@ static const char *appBTNCol = 0; // application btn color
- static const char *mwGeometry = 0; // main widget geometry
- static const char *mwTitle = 0; // main widget title
- //Ming-Che 10/10
--char *qt_ximServer = 0; // XIM Server will connect to
-+Q_EXPORT char *qt_ximServer = 0; // XIM Server will connect to
- static bool mwIconic = FALSE; // main widget iconified
- //Ming-Che 10/10
- static Display *appDpy = 0; // X11 application display
-@@ -415,13 +415,13 @@ static bool qt_x11EventFilter( XEvent* ev )
-
- #if !defined(QT_NO_XIM)
- //XIM qt_xim = 0;
--XIMStyle qt_xim_style = 0;
--XIMStyle qt_xim_preferred_style = 0;
--static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing;
-+Q_EXPORT XIMStyle qt_xim_style = 0;
-+Q_EXPORT XIMStyle qt_xim_preferred_style = 0;
-+Q_EXPORT static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing;
- #endif
-
--int qt_ximComposingKeycode=0;
--QTextCodec * qt_input_mapper = 0;
-+Q_EXPORT int qt_ximComposingKeycode=0;
-+Q_EXPORT QTextCodec * qt_input_mapper = 0;
-
- Q_EXPORT Time qt_x_time = CurrentTime;
- Q_EXPORT Time qt_x_user_time = CurrentTime;
-diff --git a/src/kernel/qinputcontext.h b/src/kernel/qinputcontext.h
-index 99e5d37..5b2650a 100644
---- a/src/kernel/qinputcontext.h
-+++ b/src/kernel/qinputcontext.h
-@@ -69,7 +69,7 @@ struct QInputContextMenu {
- };
-
-
--class QInputContext : public QObject
-+class Q_EXPORT QInputContext : public QObject
- {
- Q_OBJECT
- public:
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Fix-qmake-library-search-path-on-64-bit-systems-This-resolves-Bug-1016-e374dac.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Fix-qmake-library-search-path-on-64-bit-systems-This-resolves-Bug-1016-e374dac.patch
deleted file mode 100644
index 42d1ce7a..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Fix-qmake-library-search-path-on-64-bit-systems-This-resolves-Bug-1016-e374dac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
-index 716e5c0..f891b3e 100644
---- a/mkspecs/linux-g++-64/qmake.conf
-+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -45,7 +45,7 @@ QMAKE_LIBDIR =
- QMAKE_INCDIR_X11 = /usr/X11R6/include
- QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
- QMAKE_INCDIR_QT = $(QTDIR)/include
--QMAKE_LIBDIR_QT = $(QTDIR)/lib
-+QMAKE_LIBDIR_QT = $(QTDIR)/lib64
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
- QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
-
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Update-zh-tw-translations-c62cd50.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Update-zh-tw-translations-c62cd50.patch
deleted file mode 100644
index b0cd4d11..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_59-Update-zh-tw-translations-c62cd50.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff --git a/translations/qt_zh-tw.ts b/translations/qt_zh-tw.ts
-index 8260fe4..0f0eaa8 100644
---- a/translations/qt_zh-tw.ts
-+++ b/translations/qt_zh-tw.ts
-@@ -115,7 +115,7 @@
- </message>
- <message>
- <source>Menu</source>
-- <translation>Menu</translation>
-+ <translation>選單</translation>
- </message>
- <message>
- <source>Help</source>
-@@ -337,7 +337,7 @@
- </message>
- <message>
- <source>A&amp;lpha channel:</source>
-- <translation>Alpha 色頻(&amp;L):</translation>
-+ <translation>透明色頻(&amp;L):</translation>
- </message>
- <message>
- <source>&amp;Basic colors</source>
-@@ -429,11 +429,11 @@
- </message>
- <message>
- <source>Read: %1</source>
-- <translation>讀取: %1</translation>
-+ <translation>讀取:%1</translation>
- </message>
- <message>
- <source>Write: %1</source>
-- <translation>寫入: %1</translation>
-+ <translation>寫入:%1</translation>
- </message>
- <message>
- <source>Cancel</source>
-@@ -1194,7 +1194,7 @@ to
- </message>
- <message>
- <source>Customize...</source>
-- <translation>自訂...</translation>
-+ <translation>自訂…</translation>
- </message>
- </context>
- <context>
-@@ -1264,7 +1264,7 @@ to
- </message>
- <message>
- <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;&lt;p&gt;Qt is a C++ toolkit for multiplatform GUI &amp;amp; application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants.&lt;br&gt;Qt is also available for embedded devices.&lt;/p&gt;&lt;p&gt;Qt is a Trolltech product. See &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt; for more information.&lt;/p&gt;</source>
-- <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本,提供跨平台的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊,請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
-+ <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本,提供跨平臺的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊,請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
- </message>
- </context>
- <context>
-@@ -1282,7 +1282,7 @@ to
- </message>
- <message>
- <source>Aliases: %1</source>
-- <translation>別名: %1</translation>
-+ <translation>別名:%1</translation>
- </message>
- <message>
- <source>unknown</source>
-@@ -1338,7 +1338,7 @@ to
- </message>
- <message>
- <source>Browse...</source>
-- <translation>瀏覽...</translation>
-+ <translation>瀏覽…</translation>
- </message>
- <message>
- <source>Options</source>
-@@ -1386,123 +1386,123 @@ to
- </message>
- <message>
- <source>A0 (841 x 1189 mm)</source>
-- <translation>A0 (841 x 1189 mm)</translation>
-+ <translation>A0 (841 x 1189 公釐)</translation>
- </message>
- <message>
- <source>A1 (594 x 841 mm)</source>
-- <translation>A1 (594 x 841 mm)</translation>
-+ <translation>A1 (594 x 841 公釐)</translation>
- </message>
- <message>
- <source>A2 (420 x 594 mm)</source>
-- <translation>A2 (420 x 594 mm)</translation>
-+ <translation>A2 (420 x 594 公釐)</translation>
- </message>
- <message>
- <source>A3 (297 x 420 mm)</source>
-- <translation>A3 (297 x 420 mm)</translation>
-+ <translation>A3 (297 x 420 公釐)</translation>
- </message>
- <message>
- <source>A4 (210x297 mm, 8.26x11.7 inches)</source>
-- <translation>A4 (210x297 mm,8.26x11.7 英吋)</translation>
-+ <translation>A4 (210x297 公釐,8.26x11.7 英吋)</translation>
- </message>
- <message>
- <source>A5 (148 x 210 mm)</source>
-- <translation>A5 (148 x 210 mm)</translation>
-+ <translation>A5 (148 x 210 公釐)</translation>
- </message>
- <message>
- <source>A6 (105 x 148 mm)</source>
-- <translation>A6 (105 x 148 mm)</translation>
-+ <translation>A6 (105 x 148 公釐)</translation>
- </message>
- <message>
- <source>A7 (74 x 105 mm)</source>
-- <translation>A7 (74 x 105 mm)</translation>
-+ <translation>A7 (74 x 105 公釐)</translation>
- </message>
- <message>
- <source>A8 (52 x 74 mm)</source>
-- <translation>A8 (52 x 74 mm)</translation>
-+ <translation>A8 (52 x 74 公釐)</translation>
- </message>
- <message>
- <source>A9 (37 x 52 mm)</source>
-- <translation>A9 (37 x 52 mm)</translation>
-+ <translation>A9 (37 x 52 公釐)</translation>
- </message>
- <message>
- <source>B0 (1000 x 1414 mm)</source>
-- <translation>B0 (1000 x 1414 mm)</translation>
-+ <translation>B0 (1000 x 1414 公釐)</translation>
- </message>
- <message>
- <source>B1 (707 x 1000 mm)</source>
-- <translation>B1 (707 x 1000 mm)</translation>
-+ <translation>B1 (707 x 1000 公釐)</translation>
- </message>
- <message>
- <source>B2 (500 x 707 mm)</source>
-- <translation>B2 (500 x 707 mm)</translation>
-+ <translation>B2 (500 x 707 公釐)</translation>
- </message>
- <message>
- <source>B3 (353 x 500 mm)</source>
-- <translation>B3 (353 x 500 mm)</translation>
-+ <translation>B3 (353 x 500 公釐)</translation>
- </message>
- <message>
- <source>B4 (250 x 353 mm)</source>
-- <translation>B4 (250 x 353 mm)</translation>
-+ <translation>B4 (250 x 353 公釐)</translation>
- </message>
- <message>
- <source>B5 (176 x 250 mm, 6.93x9.84 inches)</source>
-- <translation>B5 (176 x 250 mm,6.93x9.84 英吋)</translation>
-+ <translation>B5 (176 x 250 公釐,6.93x9.84 英吋)</translation>
- </message>
- <message>
- <source>B6 (125 x 176 mm)</source>
-- <translation>B6 (125 x 176 mm)</translation>
-+ <translation>B6 (125 x 176 公釐)</translation>
- </message>
- <message>
- <source>B7 (88 x 125 mm)</source>
-- <translation>B7 (88 x 125 mm)</translation>
-+ <translation>B7 (88 x 125 公釐)</translation>
- </message>
- <message>
- <source>B8 (62 x 88 mm)</source>
-- <translation>B8 (62 x 88 mm)</translation>
-+ <translation>B8 (62 x 88 公釐)</translation>
- </message>
- <message>
- <source>B9 (44 x 62 mm)</source>
-- <translation>B9 (44 x 62 mm)</translation>
-+ <translation>B9 (44 x 62 公釐)</translation>
- </message>
- <message>
- <source>B10 (31 x 44 mm)</source>
-- <translation>B10 (31 x 44 mm)</translation>
-+ <translation>B10 (31 x 44 公釐)</translation>
- </message>
- <message>
- <source>C5E (163 x 229 mm)</source>
-- <translation>C5E (163 x 229 mm)</translation>
-+ <translation>C5E (163 x 229 公釐)</translation>
- </message>
- <message>
- <source>DLE (110 x 220 mm)</source>
-- <translation>DLE (110 x 220 mm)</translation>
-+ <translation>DLE (110 x 220 公釐)</translation>
- </message>
- <message>
- <source>Executive (7.5x10 inches, 191x254 mm)</source>
-- <translation>Executive (7.5x10 英吋,191x254 mm)</translation>
-+ <translation>Executive (7.5x10 英吋,191x254 公釐)</translation>
- </message>
- <message>
- <source>Folio (210 x 330 mm)</source>
-- <translation>Folio (210 x 330 mm)</translation>
-+ <translation>Folio (210 x 330 公釐)</translation>
- </message>
- <message>
- <source>Ledger (432 x 279 mm)</source>
-- <translation>Ledger (432 x 279 mm)</translation>
-+ <translation>Ledger (432 x 279 公釐)</translation>
- </message>
- <message>
- <source>Legal (8.5x14 inches, 216x356 mm)</source>
-- <translation>Legal (8.5x14 英吋,216x356 mm)</translation>
-+ <translation>Legal (8.5x14 英吋,216x356 公釐)</translation>
- </message>
- <message>
- <source>Letter (8.5x11 inches, 216x279 mm)</source>
-- <translation>Letter (8.5x11 英吋,216x279 mm)</translation>
-+ <translation>Letter (8.5x11 英吋,216x279 公釐)</translation>
- </message>
- <message>
- <source>Tabloid (279 x 432 mm)</source>
-- <translation>Tabloid (279 x 432 mm)</translation>
-+ <translation>Tabloid (279 x 432 公釐)</translation>
- </message>
- <message>
- <source>US Common #10 Envelope (105 x 241 mm)</source>
-- <translation>美國一般 10 號信封 (105 x 241 mm)</translation>
-+ <translation>美國一般 10 號信封 (105 x 241 公釐)</translation>
- </message>
- <message>
- <source>Setup Printer</source>
-@@ -1691,7 +1691,7 @@ to
- <name>QToolBar</name>
- <message>
- <source>More...</source>
-- <translation>其他...</translation>
-+ <translation>其他…</translation>
- </message>
- </context>
- <context>
-@@ -1811,7 +1811,7 @@ to
- </message>
- <message>
- <source>&amp;Help</source>
-- <translation>說明(&amp;H)</translation>
-+ <translation>求助(&amp;H)</translation>
- </message>
- </context>
- <context>
-@@ -1988,7 +1988,7 @@ to
- </message>
- <message>
- <source>Paste special...</source>
-- <translation>選擇性貼上...</translation>
-+ <translation>選擇性貼上…</translation>
- </message>
- <message>
- <source>Clear</source>
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Add-0084-compositing-patch-from-RedHat-909c3cb.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Add-0084-compositing-patch-from-RedHat-909c3cb.patch
deleted file mode 100644
index b9be973e..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Add-0084-compositing-patch-from-RedHat-909c3cb.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
-index 02fdebf..a095025 100644
---- a/src/kernel/qwidget_x11.cpp
-+++ b/src/kernel/qwidget_x11.cpp
-@@ -558,7 +558,10 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
- wsa.save_under = True;
- XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder,
- &wsa );
-- x11SetWindowType();
-+ XClassHint class_hint;
-+ class_hint.res_name = (char *) qAppName(); // application name
-+ class_hint.res_class = (char *) qAppClass(); // application class
-+ XSetClassHint( dpy, id, &class_hint );
- } else if ( topLevel && !desktop ) { // top-level widget
- QWidget *p = parentWidget(); // real parent
- if (p)
-@@ -621,8 +624,6 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
- else
- XDeleteProperty(dpy, id, qt_xa_motif_wm_hints);
-
-- x11SetWindowType();
--
- // set _NET_WM_WINDOW_STATE
- if (curr_winstate > 0)
- XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace,
-@@ -630,11 +631,6 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
- else
- XDeleteProperty(dpy, id, qt_net_wm_state);
-
-- // set _NET_WM_PID
-- long curr_pid = getpid();
-- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
-- (unsigned char *) &curr_pid, 1);
--
- #ifndef QT_NO_XSYNC
- // set _NET_WM_SYNC_COUNTER
- createSyncCounter();
-@@ -646,19 +642,31 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
- // when we create a toplevel widget, the frame strut should be dirty
- fstrut_dirty = 1;
-
-+ } else {
-+ // non-toplevel widgets don't have a frame, so no need to
-+ // update the strut
-+ fstrut_dirty = 0;
-+ }
-+
-+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
-+ x11SetWindowType();
-+
-+ // set _NET_WM_PID
-+ long curr_pid = getpid();
-+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
-+ (unsigned char *) &curr_pid, 1);
-+
- // declare the widget's object name as window role
- XChangeProperty( dpy, id,
- qt_window_role, XA_STRING, 8, PropModeReplace,
- (unsigned char *)name(), qstrlen( name() ) );
-
- // set client leader property
-+ if ( !qt_x11_wm_client_leader )
-+ qt_x11_create_wm_client_leader();
- XChangeProperty( dpy, id, qt_wm_client_leader,
- XA_WINDOW, 32, PropModeReplace,
- (unsigned char *)&qt_x11_wm_client_leader, 1 );
-- } else {
-- // non-toplevel widgets don't have a frame, so no need to
-- // update the strut
-- fstrut_dirty = 0;
- }
-
- if ( initializeWindow ) {
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch
deleted file mode 100644
index 278aec43..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_00-Use-unixODBC-instead-of-obsolete-iODBC-This-closes-Bug-792-Thanks-to-L0ner-for-the-patch-3f779ee.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro
-index ac0cf3c..36d35b5 100644
---- a/plugins/src/sqldrivers/odbc/odbc.pro
-+++ b/plugins/src/sqldrivers/odbc/odbc.pro
-@@ -17,7 +17,7 @@ mac {
- unix {
- OBJECTS_DIR = .obj
- !contains( LIBS, .*odbc.* ) {
-- LIBS *= -liodbc
-+ LIBS *= -lodbc
- }
- }
-
-diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
-index b09afd2..8b0b58b 100644
---- a/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -61,19 +61,18 @@
- #endif
-
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
-
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
- #endif
-
--
- static const QSQLLEN COLNAMESIZE = 256;
- //Map Qt parameter types to ODBC types
- static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };
-diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
-index 5533c6f..17a6d40 100644
---- a/src/sql/qt_sql.pri
-+++ b/src/sql/qt_sql.pri
-@@ -110,13 +110,13 @@ sql {
-
- mac {
- !contains( LIBS, .*odbc.* ) {
-- LIBS *= -liodbc
-+ LIBS *= -lodbc
- }
- }
-
- unix {
- !contains( LIBS, .*odbc.* ) {
-- LIBS *= -liodbc
-+ LIBS *= -lodbc
- }
- }
-
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_01-Make-basic-integer-QDataStream-reads-resistant-to-corruption-from-underlying-IO-device-failure-60621ef.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_01-Make-basic-integer-QDataStream-reads-resistant-to-corruption-from-underlying-IO-device-failure-60621ef.patch
deleted file mode 100644
index d8ca2cfc..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_02_01-Make-basic-integer-QDataStream-reads-resistant-to-corruption-from-underlying-IO-device-failure-60621ef.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
-index dfdc20e..2cdd5f7 100644
---- a/src/tools/qdatastream.cpp
-+++ b/src/tools/qdatastream.cpp
-@@ -544,7 +544,10 @@ QDataStream &QDataStream::operator>>( Q_INT8 &i )
- i = (buf[2] & 0x07)+((buf[1] & 0x07) << 3)+((buf[0] & 0x07) << 6);
- }
- } else { // data or text
-- i = (Q_INT8)dev->getch();
-+ int ret = dev->getch();
-+ if (ret >= 0) {
-+ i = (Q_INT8)ret;
-+ }
- }
- return *this;
- }
-@@ -574,9 +577,10 @@ QDataStream &QDataStream::operator>>( Q_INT16 &i )
- } else { // swap bytes
- register uchar *p = (uchar *)(&i);
- char b[2];
-- dev->readBlock( b, 2 );
-- *p++ = b[1];
-- *p = b[0];
-+ if (dev->readBlock( b, 2 ) >= 2) {
-+ *p++ = b[1];
-+ *p = b[0];
-+ }
- }
- return *this;
- }
-@@ -606,11 +610,12 @@ QDataStream &QDataStream::operator>>( Q_INT32 &i )
- } else { // swap bytes
- uchar *p = (uchar *)(&i);
- char b[4];
-- dev->readBlock( b, 4 );
-- *p++ = b[3];
-- *p++ = b[2];
-- *p++ = b[1];
-- *p = b[0];
-+ if (dev->readBlock( b, 4 ) >= 4) {
-+ *p++ = b[3];
-+ *p++ = b[2];
-+ *p++ = b[1];
-+ *p = b[0];
-+ }
- }
- return *this;
- }
-@@ -643,15 +648,16 @@ QDataStream &QDataStream::operator>>( Q_INT64 &i )
- } else { // swap bytes
- uchar *p = (uchar *)(&i);
- char b[8];
-- dev->readBlock( b, 8 );
-- *p++ = b[7];
-- *p++ = b[6];
-- *p++ = b[5];
-- *p++ = b[4];
-- *p++ = b[3];
-- *p++ = b[2];
-- *p++ = b[1];
-- *p = b[0];
-+ if (dev->readBlock( b, 8 ) >= 8) {
-+ *p++ = b[7];
-+ *p++ = b[6];
-+ *p++ = b[5];
-+ *p++ = b[4];
-+ *p++ = b[3];
-+ *p++ = b[2];
-+ *p++ = b[1];
-+ *p = b[0];
-+ }
- }
- return *this;
- }
-@@ -683,9 +689,11 @@ QDataStream &QDataStream::operator>>( Q_LONG &i )
- } else { // swap bytes
- register uchar *p = (uchar *)(&i);
- char b[sizeof(Q_LONG)];
-- dev->readBlock( b, sizeof(Q_LONG) );
-- for ( int j = sizeof(Q_LONG); j; )
-- *p++ = b[--j];
-+ if (dev->readBlock( b, sizeof(Q_LONG) ) >= (int)sizeof(Q_LONG)) {
-+ for ( int j = sizeof(Q_LONG); j; ) {
-+ *p++ = b[--j];
-+ }
-+ }
- }
- return *this;
- }
-@@ -724,11 +732,12 @@ QDataStream &QDataStream::operator>>( float &f )
- } else { // swap bytes
- uchar *p = (uchar *)(&f);
- char b[4];
-- dev->readBlock( b, 4 );
-- *p++ = b[3];
-- *p++ = b[2];
-- *p++ = b[1];
-- *p = b[0];
-+ if (dev->readBlock( b, 4 ) >= 4) {
-+ *p++ = b[3];
-+ *p++ = b[2];
-+ *p++ = b[1];
-+ *p = b[0];
-+ }
- }
- return *this;
- }
-@@ -752,15 +761,16 @@ QDataStream &QDataStream::operator>>( double &f )
- } else { // swap bytes
- register uchar *p = (uchar *)(&f);
- char b[8];
-- dev->readBlock( b, 8 );
-- *p++ = b[7];
-- *p++ = b[6];
-- *p++ = b[5];
-- *p++ = b[4];
-- *p++ = b[3];
-- *p++ = b[2];
-- *p++ = b[1];
-- *p = b[0];
-+ if (dev->readBlock( b, 8 ) >= 8) {
-+ *p++ = b[7];
-+ *p++ = b[6];
-+ *p++ = b[5];
-+ *p++ = b[4];
-+ *p++ = b[3];
-+ *p++ = b[2];
-+ *p++ = b[1];
-+ *p = b[0];
-+ }
- }
- return *this;
- }
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-25_03_21_44-Fix-a-number-of-threading-problems-and-crashes-This-partially-resolves-Bug-1467-part-of-the-original-commit-b8e4f24.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-25_03_21_44-Fix-a-number-of-threading-problems-and-crashes-This-partially-resolves-Bug-1467-part-of-the-original-commit-b8e4f24.patch
deleted file mode 100644
index c4720315..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-25_03_21_44-Fix-a-number-of-threading-problems-and-crashes-This-partially-resolves-Bug-1467-part-of-the-original-commit-b8e4f24.patch
+++ /dev/null
@@ -1,1052 +0,0 @@
-diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
-index 0ec4904..960db1e 100644
---- a/src/kernel/qapplication.cpp
-+++ b/src/kernel/qapplication.cpp
-@@ -546,8 +546,9 @@ static QPostEventList *globalPostedEvents = 0; // list of posted events
-
- uint qGlobalPostedEventsCount()
- {
-- if (!globalPostedEvents)
-+ if (!globalPostedEvents) {
- return 0;
-+ }
- return globalPostedEvents->count();
- }
-
-@@ -2315,8 +2316,9 @@ void QApplication::aboutQt()
- bool QApplication::notify( QObject *receiver, QEvent *e )
- {
- // no events are delivered after ~QApplication() has started
-- if ( is_app_closing )
-+ if ( is_app_closing ) {
- return FALSE;
-+ }
-
- if ( receiver == 0 ) { // serious error
- #if defined(QT_CHECK_NULL)
-@@ -2358,8 +2360,9 @@ bool QApplication::notify( QObject *receiver, QEvent *e )
- }
-
- bool res = FALSE;
-- if ( !receiver->isWidgetType() )
-+ if ( !receiver->isWidgetType() ) {
- res = internalNotify( receiver, e );
-+ }
- else switch ( e->type() ) {
- #ifndef QT_NO_ACCEL
- case QEvent::Accel:
-@@ -2367,13 +2370,15 @@ bool QApplication::notify( QObject *receiver, QEvent *e )
- QKeyEvent* key = (QKeyEvent*) e;
- res = internalNotify( receiver, e );
-
-- if ( !res && !key->isAccepted() )
-+ if ( !res && !key->isAccepted() ) {
- res = qt_dispatchAccelEvent( (QWidget*)receiver, key );
-+ }
-
- // next lines are for compatibility with Qt <= 3.0.x: old
- // QAccel was listening on toplevel widgets
-- if ( !res && !key->isAccepted() && !((QWidget*)receiver)->isTopLevel() )
-+ if ( !res && !key->isAccepted() && !((QWidget*)receiver)->isTopLevel() ) {
- res = internalNotify( ((QWidget*)receiver)->topLevelWidget(), e );
-+ }
- }
- break;
- #endif //QT_NO_ACCEL
-@@ -3116,8 +3121,9 @@ void QApplication::postEvent( QObject *receiver, QEvent *event )
- qapp_cleanup_events.set( &globalPostedEvents );
- }
-
-- if ( !receiver->postedEvents )
-+ if ( !receiver->postedEvents ) {
- receiver->postedEvents = new QPostEventList;
-+ }
- QPostEventList * l = receiver->postedEvents;
-
- // if this is one of the compressible events, do compression
-@@ -3232,22 +3238,25 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type )
- {
- // Make sure the object hierarchy is stable before processing events
- // to avoid endless loops
-- if ( receiver == 0 && event_type == 0 )
-+ if ( receiver == 0 && event_type == 0 ) {
- sendPostedEvents( 0, QEvent::ChildInserted );
--
-- if ( !globalPostedEvents || ( receiver && !receiver->postedEvents ) )
-- return;
-+ }
-
- #ifdef QT_THREAD_SUPPORT
- QMutexLocker locker( postevent_mutex );
- #endif
-
-+ if ( !globalPostedEvents || ( receiver && !receiver->postedEvents ) ) {
-+ return;
-+ }
-+
- bool sent = TRUE;
- while ( sent ) {
- sent = FALSE;
-
-- if ( !globalPostedEvents || ( receiver && !receiver->postedEvents ) )
-+ if ( !globalPostedEvents || ( receiver && !receiver->postedEvents ) ) {
- return;
-+ }
-
- // if we have a receiver, use the local list. Otherwise, use the
- // global list
-@@ -3296,8 +3305,9 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type )
- if ( e->type() == QEvent::Paint && r->isWidgetType() ) {
- QWidget * w = (QWidget*)r;
- QPaintEvent * p = (QPaintEvent*)e;
-- if ( w->isVisible() )
-+ if ( w->isVisible() ) {
- w->repaint( p->reg, p->erase );
-+ }
- } else {
- sent = TRUE;
- QApplication::sendEvent( r, e );
-@@ -3318,10 +3328,12 @@ void QApplication::sendPostedEvents( QObject *receiver, int event_type )
- if ( l == globalPostedEvents ) {
- globalPostedEvents->first();
- while( (pe=globalPostedEvents->current()) != 0 ) {
-- if ( pe->event )
-+ if ( pe->event ) {
- globalPostedEvents->next();
-- else
-+ }
-+ else {
- globalPostedEvents->remove();
-+ }
- }
- }
- }
-diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
-index 7790676..375e83b 100644
---- a/src/kernel/qobject.cpp
-+++ b/src/kernel/qobject.cpp
-@@ -471,11 +471,13 @@ QObject::~QObject()
- blockSig = 0; // unblock signals to keep QGuardedPtr happy
- emit destroyed( this );
- emit destroyed();
-- if ( objname )
-+ if ( objname ) {
- delete [] (char*)objname;
-+ }
- objname = 0;
-- if ( pendTimer ) // might be pending timers
-+ if ( pendTimer ) { // might be pending timers
- qKillTimer( this );
-+ }
- QApplication::removePostedEvents( this );
- if ( isTree ) {
- remove_tree( this ); // remove from global root list
-@@ -755,12 +757,17 @@ QObject* QObject::child( const char *objName, const char *inheritsClass,
- bool QObject::event( QEvent *e )
- {
- #if defined(QT_CHECK_NULL)
-- if ( e == 0 )
-+ if ( e == 0 ) {
- qWarning( "QObject::event: Null events are not permitted" );
-+ }
- #endif
-+ if ( wasDeleted ) {
-+ return TRUE;
-+ }
- if ( eventFilters ) { // try filters
-- if ( activate_filters(e) ) // stopped by a filter
-+ if ( activate_filters(e) ) { // stopped by a filter
- return TRUE;
-+ }
- }
-
- switch ( e->type() ) {
-diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
-index b04ac75..fb94427 100644
---- a/src/tools/qglist.cpp
-+++ b/src/tools/qglist.cpp
-@@ -43,6 +43,10 @@
- #include "qdatastream.h"
- #include "qvaluelist.h"
-
-+#if defined(QT_THREAD_SUPPORT)
-+ #include "qmutex.h"
-+#endif // defined(QT_THREAD_SUPPORT)
-+
- /*!
- \class QLNode qglist.h
- \reentrant
-@@ -221,6 +225,9 @@ QDataStream &QGList::write( QDataStream &s, QPtrCollection::Item ) const
-
- QGList::QGList()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex = new QMutex(true);
-+#endif
- firstNode = lastNode = curNode = 0; // initialize list
- numNodes = 0;
- curIndex = -1;
-@@ -234,6 +241,9 @@ QGList::QGList()
- QGList::QGList( const QGList & list )
- : QPtrCollection( list )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex = new QMutex(true);
-+#endif
- firstNode = lastNode = curNode = 0; // initialize list
- numNodes = 0;
- curIndex = -1;
-@@ -258,6 +268,9 @@ QGList::~QGList()
- // twice on the same address! This is insane but let's try not to crash
- // here.
- iterators = 0;
-+#if defined(QT_THREAD_SUPPORT)
-+ //delete mutex;
-+#endif
- }
-
-
-@@ -290,11 +303,13 @@ QGList& QGList::operator=( const QGList &list )
-
- bool QGList::operator==( const QGList &list ) const
- {
-- if ( count() != list.count() )
-+ if ( count() != list.count() ) {
- return FALSE;
-+ }
-
-- if ( count() == 0 )
-+ if ( count() == 0 ) {
- return TRUE;
-+ }
-
- QLNode *n1 = firstNode;
- QLNode *n2 = list.firstNode;
-@@ -322,8 +337,15 @@ bool QGList::operator==( const QGList &list ) const
-
- QLNode *QGList::locate( uint index )
- {
-- if ( index == (uint)curIndex ) // current node ?
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( index == (uint)curIndex ) { // current node ?
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curNode;
-+ }
- if ( !curNode && firstNode ) { // set current node
- curNode = firstNode;
- curIndex = 0;
-@@ -332,13 +354,18 @@ QLNode *QGList::locate( uint index )
- int distance = index - curIndex; // node distance to cur node
- bool forward; // direction to traverse
-
-- if ( index >= numNodes )
-+ if ( index >= numNodes ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
-+ }
-
-- if ( distance < 0 )
-+ if ( distance < 0 ) {
- distance = -distance;
-+ }
- if ( (uint)distance < index && (uint)distance < numNodes - index ) {
-- node = curNode; // start from current node
-+ node = curNode; // start from current node
- forward = index > (uint)curIndex;
- } else if ( index < numNodes - index ) { // start from first node
- node = firstNode;
-@@ -352,13 +379,18 @@ QLNode *QGList::locate( uint index )
- forward = FALSE;
- }
- if ( forward ) { // now run through nodes
-- while ( distance-- )
-+ while ( distance-- ) {
- node = node->next;
-+ }
- } else {
-- while ( distance-- )
-+ while ( distance-- ) {
- node = node->prev;
-+ }
- }
- curIndex = index; // must update index
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curNode = node;
- }
-
-@@ -369,6 +401,9 @@ QLNode *QGList::locate( uint index )
-
- void QGList::inSort( QPtrCollection::Item d )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- int index = 0;
- register QLNode *n = firstNode;
- while ( n && compareItems(n->data,d) < 0 ){ // find position in list
-@@ -376,6 +411,9 @@ void QGList::inSort( QPtrCollection::Item d )
- index++;
- }
- insertAt( index, d );
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -385,6 +423,9 @@ void QGList::inSort( QPtrCollection::Item d )
-
- void QGList::prepend( QPtrCollection::Item d )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n = new QLNode( newItem(d) );
- Q_CHECK_PTR( n );
- n->prev = 0;
-@@ -395,6 +436,9 @@ void QGList::prepend( QPtrCollection::Item d )
- firstNode = curNode = n; // curNode affected
- numNodes++;
- curIndex = 0;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -404,16 +448,24 @@ void QGList::prepend( QPtrCollection::Item d )
-
- void QGList::append( QPtrCollection::Item d )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n = new QLNode( newItem(d) );
- Q_CHECK_PTR( n );
- n->next = 0;
-- if ( (n->prev = lastNode) ) // list is not empty
-+ if ( (n->prev = lastNode) ) { // list is not empty
- lastNode->next = n;
-- else // initialize list
-+ }
-+ else { // initialize list
- firstNode = n;
-+ }
- lastNode = curNode = n; // curNode affected
- curIndex = numNodes;
- numNodes++;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -423,25 +475,43 @@ void QGList::append( QPtrCollection::Item d )
-
- bool QGList::insertAt( uint index, QPtrCollection::Item d )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- if ( index == 0 ) {
- prepend( d );
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
-- } else if ( index == numNodes ) {
-+ }
-+ else if ( index == numNodes ) {
- append( d );
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
- QLNode *nextNode = locate( index );
-- if ( !nextNode )
-+ if ( !nextNode ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- QLNode *prevNode = nextNode->prev;
- register QLNode *n = new QLNode( newItem(d) );
- Q_CHECK_PTR( n );
- nextNode->prev = n;
-+ Q_ASSERT( (!((curIndex > 0) && (!prevNode))) );
- prevNode->next = n;
- n->prev = prevNode; // link new node into list
- n->next = nextNode;
- curNode = n; // curIndex set by locate()
- numNodes++;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -452,18 +522,30 @@ bool QGList::insertAt( uint index, QPtrCollection::Item d )
-
- void QGList::relinkNode( QLNode *n )
- {
-- if ( n == firstNode ) // already first
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( n == firstNode ) { // already first
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return;
-+ }
- curNode = n;
- unlink();
- n->prev = 0;
-- if ( (n->next = firstNode) ) // list is not empty
-+ if ( (n->next = firstNode) ) { // list is not empty
- firstNode->prev = n;
-- else // initialize list
-+ }
-+ else { // initialize list
- lastNode = n;
-+ }
- firstNode = curNode = n; // curNode affected
- numNodes++;
- curIndex = 0;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -473,8 +555,15 @@ void QGList::relinkNode( QLNode *n )
-
- QLNode *QGList::unlink()
- {
-- if ( curNode == 0 ) // null current node
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( curNode == 0 ) { // null current node
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
-+ }
- register QLNode *n = curNode; // unlink this node
- if ( n == firstNode ) { // removing first node ?
- if ( (firstNode = n->next) ) {
-@@ -500,9 +589,13 @@ QLNode *QGList::unlink()
- curIndex--;
- }
-
-- if ( iterators )
-+ if ( iterators ) {
- iterators->notifyRemove( n, curNode );
-+ }
- numNodes--;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return n;
- }
-
-@@ -513,6 +606,9 @@ QLNode *QGList::unlink()
-
- bool QGList::removeNode( QLNode *n )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- #if defined(QT_CHECK_NULL)
- if ( n == 0 || (n->prev && n->prev->next != n) ||
- (n->next && n->next->prev != n) ) {
-@@ -526,6 +622,9 @@ bool QGList::removeNode( QLNode *n )
- delete n;
- curNode = firstNode;
- curIndex = curNode ? 0 : -1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -537,13 +636,27 @@ bool QGList::removeNode( QLNode *n )
-
- bool QGList::remove( QPtrCollection::Item d )
- {
-- if ( d && find(d) == -1 )
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( d && find(d) == -1 ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- QLNode *n = unlink();
-- if ( !n )
-+ if ( !n ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- deleteItem( n->data );
- delete n;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -553,13 +666,27 @@ bool QGList::remove( QPtrCollection::Item d )
-
- bool QGList::removeRef( QPtrCollection::Item d )
- {
-- if ( findRef(d) == -1 )
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( findRef(d) == -1 ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- QLNode *n = unlink();
-- if ( !n )
-+ if ( !n ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- deleteItem( n->data );
- delete n;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -581,13 +708,27 @@ bool QGList::removeRef( QPtrCollection::Item d )
-
- bool QGList::removeAt( uint index )
- {
-- if ( !locate(index) )
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( !locate(index) ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- QLNode *n = unlink();
-- if ( !n )
-+ if ( !n ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- deleteItem( n->data );
- delete n;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -597,13 +738,23 @@ bool QGList::removeAt( uint index )
- */
- bool QGList::replaceAt( uint index, QPtrCollection::Item d )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- QLNode *n = locate( index );
-- if ( !n )
-+ if ( !n ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return FALSE;
-+ }
- if ( n->data != d ) {
- deleteItem( n->data );
- n->data = newItem( d );
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return TRUE;
- }
-
-@@ -615,10 +766,16 @@ bool QGList::replaceAt( uint index, QPtrCollection::Item d )
-
- QPtrCollection::Item QGList::takeNode( QLNode *n )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- #if defined(QT_CHECK_NULL)
- if ( n == 0 || (n->prev && n->prev->next != n) ||
- (n->next && n->next->prev != n) ) {
- qWarning( "QGList::takeNode: Corrupted node" );
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
- }
- #endif
-@@ -628,6 +785,9 @@ QPtrCollection::Item QGList::takeNode( QLNode *n )
- delete n; // delete the node, not data
- curNode = firstNode;
- curIndex = curNode ? 0 : -1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return d;
- }
-
-@@ -637,9 +797,15 @@ QPtrCollection::Item QGList::takeNode( QLNode *n )
-
- QPtrCollection::Item QGList::take()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- QLNode *n = unlink(); // unlink node
- Item d = n ? n->data : 0;
- delete n; // delete node, keep contents
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return d;
- }
-
-@@ -649,11 +815,21 @@ QPtrCollection::Item QGList::take()
-
- QPtrCollection::Item QGList::takeAt( uint index )
- {
-- if ( !locate(index) )
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
-+ if ( !locate(index) ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
-+ }
- QLNode *n = unlink(); // unlink node
- Item d = n ? n->data : 0;
- delete n; // delete node, keep contents
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return d;
- }
-
-@@ -663,10 +839,16 @@ QPtrCollection::Item QGList::takeAt( uint index )
-
- QPtrCollection::Item QGList::takeFirst()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- first();
- QLNode *n = unlink(); // unlink node
- Item d = n ? n->data : 0;
- delete n;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return d;
- }
-
-@@ -676,10 +858,16 @@ QPtrCollection::Item QGList::takeFirst()
-
- QPtrCollection::Item QGList::takeLast()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- last();
- QLNode *n = unlink(); // unlink node
- Item d = n ? n->data : 0;
- delete n;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return d;
- }
-
-@@ -690,14 +878,18 @@ QPtrCollection::Item QGList::takeLast()
-
- void QGList::clear()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n = firstNode;
-
- firstNode = lastNode = curNode = 0; // initialize list
- numNodes = 0;
- curIndex = -1;
-
-- if ( iterators )
-+ if ( iterators ) {
- iterators->notifyClear( FALSE );
-+ }
-
- QLNode *prevNode;
- while ( n ) { // for all nodes ...
-@@ -706,6 +898,9 @@ void QGList::clear()
- n = n->next;
- delete prevNode; // deallocate node
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -716,6 +911,9 @@ void QGList::clear()
-
- int QGList::findRef( QPtrCollection::Item d, bool fromStart )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n;
- int index;
- if ( fromStart ) { // start from first node
-@@ -731,6 +929,9 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart )
- }
- curNode = n;
- curIndex = n ? index : -1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curIndex; // return position of item
- }
-
-@@ -742,6 +943,9 @@ int QGList::findRef( QPtrCollection::Item d, bool fromStart )
-
- int QGList::find( QPtrCollection::Item d, bool fromStart )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n;
- int index;
- if ( fromStart ) { // start from first node
-@@ -757,6 +961,9 @@ int QGList::find( QPtrCollection::Item d, bool fromStart )
- }
- curNode = n;
- curIndex = n ? index : -1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curIndex; // return position of item
- }
-
-@@ -767,6 +974,9 @@ int QGList::find( QPtrCollection::Item d, bool fromStart )
-
- uint QGList::containsRef( QPtrCollection::Item d ) const
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n = firstNode;
- uint count = 0;
- while ( n ) { // for all nodes...
-@@ -774,6 +984,9 @@ uint QGList::containsRef( QPtrCollection::Item d ) const
- count++;
- n = n->next;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return count;
- }
-
-@@ -784,6 +997,9 @@ uint QGList::containsRef( QPtrCollection::Item d ) const
-
- uint QGList::contains( QPtrCollection::Item d ) const
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- register QLNode *n = firstNode;
- uint count = 0;
- QGList *that = (QGList*)this; // mutable for compareItems()
-@@ -792,6 +1008,9 @@ uint QGList::contains( QPtrCollection::Item d ) const
- count++;
- n = n->next;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return count;
- }
-
-@@ -839,10 +1058,19 @@ uint QGList::contains( QPtrCollection::Item d ) const
-
- QPtrCollection::Item QGList::first()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- if ( firstNode ) {
- curIndex = 0;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return (curNode=firstNode)->data;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
- }
-
-@@ -852,10 +1080,19 @@ QPtrCollection::Item QGList::first()
-
- QPtrCollection::Item QGList::last()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- if ( lastNode ) {
- curIndex = numNodes-1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return (curNode=lastNode)->data;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
- }
-
-@@ -865,15 +1102,24 @@ QPtrCollection::Item QGList::last()
-
- QPtrCollection::Item QGList::next()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- if ( curNode ) {
- if ( curNode->next ) {
- curIndex++;
- curNode = curNode->next;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curNode->data;
- }
- curIndex = -1;
- curNode = 0;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
- }
-
-@@ -883,15 +1129,24 @@ QPtrCollection::Item QGList::next()
-
- QPtrCollection::Item QGList::prev()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- if ( curNode ) {
- if ( curNode->prev ) {
- curIndex--;
- curNode = curNode->prev;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return curNode->data;
- }
- curIndex = -1;
- curNode = 0;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return 0;
- }
-
-@@ -902,9 +1157,16 @@ QPtrCollection::Item QGList::prev()
-
- void QGList::toVector( QGVector *vector ) const
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- vector->clear();
-- if ( !vector->resize( count() ) )
-+ if ( !vector->resize( count() ) ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return;
-+ }
- register QLNode *n = firstNode;
- uint i = 0;
- while ( n ) {
-@@ -912,10 +1174,16 @@ void QGList::toVector( QGVector *vector ) const
- n = n->next;
- i++;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
- void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- int r = first;
- while( r <= last/2 ) {
- // Node r has only one child ?
-@@ -950,6 +1218,9 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
- }
- }
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -962,9 +1233,16 @@ void QGList::heapSortPushDown( QPtrCollection::Item* heap, int first, int last )
-
- void QGList::sort()
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- uint n = count();
-- if ( n < 2 )
-+ if ( n < 2 ) {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return;
-+ }
-
- // Create the heap
- QPtrCollection::Item* realheap = new QPtrCollection::Item[ n ];
-@@ -995,6 +1273,9 @@ void QGList::sort()
- }
-
- delete [] realheap;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- }
-
-
-@@ -1019,6 +1300,9 @@ QDataStream &operator<<( QDataStream &s, const QGList &list )
-
- QDataStream &QGList::read( QDataStream &s )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- uint num;
- s >> num; // read number of items
- clear(); // clear list
-@@ -1042,6 +1326,9 @@ QDataStream &QGList::read( QDataStream &s )
- }
- curNode = firstNode;
- curIndex = curNode ? 0 : -1;
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return s;
- }
-
-@@ -1051,12 +1338,18 @@ QDataStream &QGList::read( QDataStream &s )
-
- QDataStream &QGList::write( QDataStream &s ) const
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- s << count(); // write number of items
- QLNode *n = firstNode;
- while ( n ) { // write all items
- write( s, n->data );
- n = n->next;
- }
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return s;
- }
-
-@@ -1068,9 +1361,15 @@ QDataStream &QGList::write( QDataStream &s ) const
- */
- QLNode* QGList::erase( QLNode* it )
- {
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->lock();
-+#endif
- QLNode* n = it;
- it = it->next;
- removeNode( n );
-+#if defined(QT_THREAD_SUPPORT)
-+ //mutex->unlock();
-+#endif
- return it;
- }
-
-diff --git a/src/tools/qglist.h b/src/tools/qglist.h
-index fadc46c..dfacf47 100644
---- a/src/tools/qglist.h
-+++ b/src/tools/qglist.h
-@@ -59,6 +59,8 @@ private:
- QLNode( QPtrCollection::Item d ) { data = d; }
- };
-
-+class QMutex;
-+class QGListPrivate;
- class QGListIteratorList; // internal helper class
-
- class Q_EXPORT QGList : public QPtrCollection // doubly linked generic list
-@@ -147,6 +149,12 @@ private:
-
- QLNode *locate( uint ); // get node at i'th pos
- QLNode *unlink(); // unlink node
-+
-+#if defined(QT_THREAD_SUPPORT)
-+// QMutex* mutex;
-+#endif
-+
-+// QGListPrivate* d;
- };
-
-
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-03_03_47_45-Fix-corrupted-titlebar-icons-in-subwindows-of-ARGB-applications-90f4a55.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-03_03_47_45-Fix-corrupted-titlebar-icons-in-subwindows-of-ARGB-applications-90f4a55.patch
deleted file mode 100644
index 437dca94..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-03_03_47_45-Fix-corrupted-titlebar-icons-in-subwindows-of-ARGB-applications-90f4a55.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
-index a095025..783034e 100644
---- a/src/kernel/qwidget_x11.cpp
-+++ b/src/kernel/qwidget_x11.cpp
-@@ -44,6 +44,7 @@
- #include "qpaintdevicemetrics.h"
- #include "qpainter.h"
- #include "qbitmap.h"
-+#include "qimage.h"
- #include "qobjectlist.h"
- #include "qlayout.h"
- #include "qtextcodec.h"
-@@ -1231,14 +1232,47 @@ void QWidget::setIcon( const QPixmap &pixmap )
- }
- Pixmap icon_pixmap = 0;
- Pixmap mask_pixmap = 0;
-+ QPixmap* pm = NULL;
- if ( !pixmap.isNull() ) {
-- QPixmap* pm = new QPixmap( pixmap );
-+ if (pixmap.depth() == 24) {
-+ pm = new QPixmap( pixmap );
-+ }
-+ else {
-+ // With most window managers, only 24-bit icon pixmaps are allowed in the WM hints, otherwise corrupt icons will be displayed
-+ // Convert provided pixmaps to 24-bit here
-+ int w = pixmap.width();
-+ int h = pixmap.height();
-+ pm = new QPixmap( pixmap.width(), pixmap.height(), 24 );
-+ QImage iconImage = pixmap.convertToImage();
-+
-+ // Load the new 24-bit RGB pixmap with data
-+ GC gc;
-+ pm->detach();
-+ Qt::HANDLE pmHandle = pm->handle();
-+ gc = XCreateGC(x11Display(), pmHandle, 0, 0);
-+ for (int y = 0; y < h; ++y) {
-+ QRgb *ls = (QRgb *)iconImage.scanLine( y );
-+ for (int x = 0; x < w; ++x) {
-+ QRgb l = ls[x];
-+ int r = int( qRed( l ) );
-+ int g = int( qGreen( l ) );
-+ int b = int( qBlue( l ) );
-+ ls[x] = qRgb( r, g, b );
-+ XSetForeground(x11Display(), gc, (r << 16) | (g << 8) | b );
-+ XDrawPoint(x11Display(), pmHandle, gc, x, y);
-+ }
-+ }
-+ XFreeGC(x11Display(), gc);
-+ }
-+
- extra->topextra->icon = pm;
-- if ( !pm->mask() )
-+ if ( !pm->mask() ) {
- pm->setMask( pm->createHeuristicMask() ); // may do detach()
-+ }
- icon_pixmap = pm->handle();
-- if ( pm->mask() )
-+ if ( pm->mask() ) {
- mask_pixmap = pm->mask()->handle();
-+ }
- }
- XWMHints *h = XGetWMHints( x11Display(), winId() );
- XWMHints wm_hints;
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-04_17_28_30-Fix-ARGB-mode-stippled-focus-rectangle-showing-underlying-window-contents-Fix-TQColor-not-processing-alpha-channel-in-ARGB-mode-d2240de.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-04_17_28_30-Fix-ARGB-mode-stippled-focus-rectangle-showing-underlying-window-contents-Fix-TQColor-not-processing-alpha-channel-in-ARGB-mode-d2240de.patch
deleted file mode 100644
index cb9e29c8..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-04_17_28_30-Fix-ARGB-mode-stippled-focus-rectangle-showing-underlying-window-contents-Fix-TQColor-not-processing-alpha-channel-in-ARGB-mode-d2240de.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
-index eeaee5e..dbd039e 100644
---- a/src/kernel/qcolor_x11.cpp
-+++ b/src/kernel/qcolor_x11.cpp
-@@ -407,8 +407,14 @@ uint QColor::alloc( int screen )
- b = sd->blue_shift > 0 ? b << sd->blue_shift : b >> -sd->blue_shift;
- pix = (b & sd->blue_mask) | (g & sd->green_mask) | (r & sd->red_mask)
- | ~(sd->blue_mask | sd->green_mask | sd->red_mask);
-- if ( screen == QPaintDevice::x11AppScreen() )
-+ if (QPaintDevice::x11AppDepth(screen) == 32) {
-+ int a = qAlpha(d.argb);
-+ pix = pix & 0x00ffffff;
-+ pix = pix | (a << 24);
-+ }
-+ if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d32.pix = pix;
-+ }
- return pix;
- }
- QColorData *c = sd->colorDict->find( (long)(d.argb) );
-diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
-index 126c0d6..267887e 100644
---- a/src/kernel/qpainter_x11.cpp
-+++ b/src/kernel/qpainter_x11.cpp
-@@ -1842,16 +1842,24 @@ void QPainter::drawWinFocusRect( int x, int y, int w, int h,
- RasterOp old_rop = (RasterOp)rop;
-
- if ( xorPaint ) {
-- if ( QColor::numBitPlanes() <= 8 )
-+ if ( QColor::numBitPlanes() <= 8 ) {
- setPen( QPen(color1, 0, Qt::FineDotLine) );
-- else
-+ }
-+ else if ( QColor::numBitPlanes() <= 8 ) {
- setPen( QPen(white, 0, Qt::FineDotLine) );
-+ }
-+ else {
-+ setPen( QPen(QColor(qRgba(255,255,255,0)), 0, Qt::FineDotLine) );
-+ }
- setRasterOp( XorROP );
-- } else {
-- if ( qGray( bgColor.rgb() ) < 128 )
-+ }
-+ else {
-+ if ( qGray( bgColor.rgb() ) < 128 ) {
- setPen( QPen(white, 0, Qt::FineDotLine) );
-- else
-+ }
-+ else {
- setPen( QPen(black, 0, Qt::FineDotLine) );
-+ }
- }
-
- if ( testf(ExtDev|VxF|WxF) ) {
-@@ -1876,6 +1884,7 @@ void QPainter::drawWinFocusRect( int x, int y, int w, int h,
- XSetLineAttributes( dpy, gc, 1, LineOnOffDash, CapButt, JoinMiter );
-
- XDrawRectangle( dpy, hd, gc, x, y, w-1, h-1 );
-+
- XSetLineAttributes( dpy, gc, 0, LineSolid, CapButt, JoinMiter );
- setRasterOp( old_rop );
- setPen( old_pen );
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-08_01_43_38-Fix-spelling-mistakes-169c39a.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-08_01_43_38-Fix-spelling-mistakes-169c39a.patch
deleted file mode 100644
index 11f9dfb2..00000000
--- a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-05-08_01_43_38-Fix-spelling-mistakes-169c39a.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/doc/html/qsqlcursor.html b/doc/html/qsqlcursor.html
-index 3111cc5..1caaaa7 100644
---- a/doc/html/qsqlcursor.html
-+++ b/doc/html/qsqlcursor.html
-@@ -386,7 +386,7 @@ record.
- <a name="x2446"></a> cur.<a href="#insert">insert</a>();
- </pre>
- <p> In the above example, a cursor is created on the 'prices' table
--and a pointer to the insert buffer is aquired using <a href="#primeInsert">primeInsert</a>().
-+and a pointer to the insert buffer is acquired using <a href="#primeInsert">primeInsert</a>().
- Each field's value is set to the desired value and then <a href="#insert">insert</a>()
- is called to insert the data into the database. Remember: all edit
- operations (insert(), <a href="#update">update</a>() and delete()) operate on the
-diff --git a/doc/man/man3/qsqlcursor.3qt b/doc/man/man3/qsqlcursor.3qt
-index c7067de..0a97aec 100644
---- a/doc/man/man3/qsqlcursor.3qt
-+++ b/doc/man/man3/qsqlcursor.3qt
-@@ -376,7 +376,7 @@ If \fIinvalidate\fR is TRUE (the default), the cursor will no longer be position
- cur.insert();
- .fi
- .PP
--In the above example, a cursor is created on the 'prices' table and a pointer to the insert buffer is aquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself.
-+In the above example, a cursor is created on the 'prices' table and a pointer to the insert buffer is acquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself.
- .PP
- See also setMode() and lastError().
- .SH "bool QSqlCursor::isCalculated ( const QString & name ) const"
-diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
-index cf1e037..dfb2abc 100644
---- a/src/kernel/qinternal.cpp
-+++ b/src/kernel/qinternal.cpp
-@@ -497,7 +497,7 @@ void QSharedDoubleBuffer::flush()
- }
-
- /* \internal
-- Aquire ownership of the shared double buffer pixmap, subject to the
-+ Acquire ownership of the shared double buffer pixmap, subject to the
- following conditions:
-
- \list 1
-diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
-index a1be1f8..2ed963c 100644
---- a/src/sql/qsqlcursor.cpp
-+++ b/src/sql/qsqlcursor.cpp
-@@ -1007,7 +1007,7 @@ QString QSqlCursor::toString( const QSqlIndex& i, QSqlRecord* rec, const QString
- \printuntil insert
-
- In the above example, a cursor is created on the 'prices' table
-- and a pointer to the insert buffer is aquired using primeInsert().
-+ and a pointer to the insert buffer is acquired using primeInsert().
- Each field's value is set to the desired value and then insert()
- is called to insert the data into the database. Remember: all edit
- operations (insert(), update() and delete()) operate on the
diff --git a/dev-qt/qt/qt-3.3.8d-r1.ebuild b/dev-qt/qt/qt-3.3.8d-r1.ebuild
deleted file mode 100644
index c2b6a84a..00000000
--- a/dev-qt/qt/qt-3.3.8d-r1.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=2
-
-# *** Please remember to update qt3.eclass when revbumping this ***
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://qt.nokia.com/ http://www.trinitydesktop.org/"
-
-# IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
-TDE_VERSION="3.5.13.1"
-TDE_PATCH_VERSION="3.5.13.2"
-
-SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/${TDE_VERSION}/dependencies/qt3-${TDE_VERSION}.tar.gz"
-# immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
-# immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-
-SLOT="3"
-KEYWORDS="x86 amd64"
-IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
-# no odbc, immqt and immqt-bc support anymore.
-DEPEND="
- virtual/jpeg
- >=media-libs/freetype-2
- >=media-libs/libmng-1.0.9
- media-libs/libpng
- sys-libs/zlib
- x11-libs/libXft
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libSM
- cups? ( net-print/cups )
- firebird? ( dev-db/firebird )
- mysql? ( virtual/mysql )
- nas? ( >=media-libs/nas-1.5 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/postgresql )
- xinerama? ( x11-libs/libXinerama )
- !!<=dev-qt/qt-meta-3.3.8c"
-RDEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
-
-# immqt? ( x11-proto/xineramaproto )
-# immqt-bc? ( x11-proto/xineramaproto )"
-#PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S="${WORKDIR}/qt3-3.5.13.1"
-
-QTBASE="/usr/qt/3"
-
-pkg_setup() {
-# if use immqt && use immqt-bc ; then
-# ewarn
-# ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-# ewarn "Please specify either immqt or immqt-bc."
-# ewarn
-# die
-# elif use immqt ; then
-# ewarn
-# ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
-## ewarn "you have to recompile everything depending on Qt after you install it."
-# ewarn "Be aware."
-# ewarn
-# fi
-
- export QTDIR="${S}"
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- PLATCXX="g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- PLATCXX="icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- PLATNAME="freebsd" ;;
- *-openbsd*)
- PLATNAME="openbsd" ;;
- *-netbsd*)
- PLATNAME="netbsd" ;;
- *-darwin*)
- PLATNAME="darwin" ;;
- *-linux-*|*-linux)
- PLATNAME="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- # probably this should be '*-64' for 64bit archs
- # in a fully multilib environment (no compatibility symlinks)
- export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_prepare() {
- # apply trinity patches for minor releases
- if [[ "$TDE_VERSION" != "$TDE_PATCH_VERSION" ]]; then
- epatch "${FILESDIR}/trinity-$TDE_VERSION..$TDE_PATCH_VERSION/"
- fi
-
- # It's nice to able user apply his own patches.
- epatch_user
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- # Do not link with -rpath. See bug #75181.
- find "${S}"/mkspecs -name qmake.conf | xargs \
- sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
- # known working flags wrt #77623
- use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
- # set c/xxflags and ldflags
- strip-flags
- append-flags -fno-strict-aliasing
-
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
- -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
-
- if [ $(get_libdir) != "lib" ] ; then
- sed -i -e "s:/lib$:/$(get_libdir):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
- fi
-
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}"/qmake/Makefile.unix || die
-
- # remove unnecessary headers
- rm include/[^q]*.h
- rm include/*_p.h
-}
-
-src_configure() {
- export SYSCONF="${D}${QTBASE}"/etc/settings
-
- # Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
- addwrite "${QTBASE}/etc/settings"
- addwrite "${HOME}/.qt"
-
- [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
- use nas && myconf+=" -system-nas-sound"
- use nis && myconf+=" -nis" || myconf+=" -no-nis"
- use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql"
- use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql"
- use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase"
- use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite"
- use cups && myconf+=" -cups" || myconf+=" -no-cups"
- use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl"
- use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions"
- use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama"
-
- myconf="${myconf} -system-zlib -qt-gif"
-
- use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6"
-# use immqt-bc && myconf+=" -inputmethod"
-# use immqt && myconf+=" -inputmethod -inputmethod-ext"
-
- export YACC='byacc -d'
- tc-export CC CXX
- export LINK="$(tc-getCXX)"
-
- ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
- emake src-qmake src-moc sub-src || die
-
- export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- emake sub-tools || die
-
- if use examples; then
- emake sub-tutorial sub-examples || die
- fi
-
- # Make the msg2qm utility (not made by default)
- cd "${S}"/tools/msg2qm
- ../../bin/qmake
- emake
-
- # Make the qembed utility (not made by default)
- cd "${S}"/tools/qembed
- ../../bin/qmake
-}
-
-src_install() {
- local qt_version="$(grep VERSION src/qt.pro | awk '{ print $3 }')"
- # binaries
- into ${QTBASE}
- dobin bin/*
- dobin tools/msg2qm/msg2qm
- dobin tools/qembed/qembed
-
- # libraries
- dolib.so lib/lib{editor,qassistantclient,designercore}.a
- dolib.so lib/libqt-mt.la
- dolib.so lib/libqt-mt.so.${qt_version} lib/libqui.so.1.0.0
- cd "${D}"/${QTBASE}/$(get_libdir)
-
- for x in libqui.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.3.5->3.3->3->.so
- ln -s libqt-mt.so.${qt_version} libqt-mt.so.3.3
- ln -s libqt-mt.so.3.3 libqt-mt.so.3
- ln -s libqt-mt.so.3 libqt-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqt-mt.so.${qt_version} libqt.so.${qt_version}
- ln -s libqt-mt.so.3.3 libqt.so.3.3
- ln -s libqt-mt.so.3 libqt.so.3
- ln -s libqt-mt.so libqt.so
-
- # plugins
- cd "${S}"
- local plugins=$(find plugins -name "lib*.so" -print)
- for x in ${plugins}; do
- exeinto ${QTBASE}/$(dirname ${x})
- doexe ${x}
- done
-
- # Past this point just needs to be done once
- is_final_abi || return 0
-
- # includes
- cd "${S}"
- dodir ${QTBASE}/include/private
- cp include/*\.h "${D}"/${QTBASE}/include/
- cp include/private/*\.h "${D}"/${QTBASE}/include/private/
-
- # prl files
- sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
- insinto ${QTBASE}/$(get_libdir)
- doins "${S}"/lib/*.prl
-
- # pkg-config file
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${S}"/lib/*.pc
-
- # List all the multilib libdirs
- local libdirs
- for alibdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${QTBASE}/${alibdir}"
- done
-
- # environment variables
- cat <<EOF > "${T}"/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-
- cat <<EOF > "${T}"/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
- cat <<EOF > "${T}"/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
- insinto /etc/revdep-rebuild
- doins "${T}"/50-qt3-revdep
-
- doenvd "${T}"/45qt3 "${T}"/50qtdir3
-
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
- fi
-
- insinto ${QTBASE}/tools/designer
- doins -r tools/designer/templates
-
- insinto ${QTBASE}
- doins -r translations
-
- keepdir ${QTBASE}/etc/settings
-
- if use doc; then
- insinto ${QTBASE}
- doins -r "${S}"/doc
- fi
-
- if use examples; then
- find "${S}"/examples "${S}"/tutorial -name Makefile | \
- xargs sed -i -e "s:${S}:${QTBASE}:g"
-
- cp -r "${S}"/examples "${D}"${QTBASE}/
- cp -r "${S}"/tutorial "${D}"${QTBASE}/
- fi
-
- # misc build reqs
- insinto ${QTBASE}/mkspecs
- doins -r "${S}"/mkspecs/${PLATFORM}
-
- sed -e "s:${S}:${QTBASE}:g" \
- "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache
-
- dodoc FAQ README README-QT.TXT changes*
-# if use immqt || use immqt-bc ; then
-# dodoc "${S}"/README.immodule
-# fi
-}
-
-pkg_postinst() {
- echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
- elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
- elog "same version of GCC. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
- echo
-}
diff --git a/dev-qt/qt/qt-3.3.8d.ebuild b/dev-qt/qt/qt-3.3.8d.ebuild
deleted file mode 100644
index b866f1cd..00000000
--- a/dev-qt/qt/qt-3.3.8d.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=2
-
-# *** Please remember to update qt3.eclass when revbumping this ***
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://qt.nokia.com/ http://www.trinitydesktop.org/"
-
-# IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
-TDE_VERSION="3.5.13.1"
-TDE_PATCH_VERSION="3.5.13.1"
-
-SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/${TDE_VERSION}/dependencies/qt3-${TDE_VERSION}.tar.gz"
-# immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
-# immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-
-SLOT="3"
-KEYWORDS="x86 amd64"
-IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
-# no odbc, immqt and immqt-bc support anymore.
-DEPEND="
- virtual/jpeg
- >=media-libs/freetype-2
- >=media-libs/libmng-1.0.9
- media-libs/libpng
- sys-libs/zlib
- x11-libs/libXft
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libSM
- cups? ( net-print/cups )
- firebird? ( dev-db/firebird )
- mysql? ( virtual/mysql )
- nas? ( >=media-libs/nas-1.5 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/postgresql )
- xinerama? ( x11-libs/libXinerama )
- !!<=dev-qt/qt-meta-3.3.8c"
-RDEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
-
-# immqt? ( x11-proto/xineramaproto )
-# immqt-bc? ( x11-proto/xineramaproto )"
-#PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S="${WORKDIR}/qt3-3.5.13.1"
-
-QTBASE="/usr/qt/3"
-
-pkg_setup() {
-# if use immqt && use immqt-bc ; then
-# ewarn
-# ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-# ewarn "Please specify either immqt or immqt-bc."
-# ewarn
-# die
-# elif use immqt ; then
-# ewarn
-# ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
-## ewarn "you have to recompile everything depending on Qt after you install it."
-# ewarn "Be aware."
-# ewarn
-# fi
-
- export QTDIR="${S}"
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- PLATCXX="g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- PLATCXX="icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- PLATNAME="freebsd" ;;
- *-openbsd*)
- PLATNAME="openbsd" ;;
- *-netbsd*)
- PLATNAME="netbsd" ;;
- *-darwin*)
- PLATNAME="darwin" ;;
- *-linux-*|*-linux)
- PLATNAME="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- # probably this should be '*-64' for 64bit archs
- # in a fully multilib environment (no compatibility symlinks)
- export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_prepare() {
- # apply trinity patches for minor releases
- if [[ "$TDE_VERSION" != "$TDE_PATCH_VERSION" ]]; then
- epatch "${FILESDIR}/trinity-$TDE_VERSION..$TDE_PATCH_VERSION/"
- fi
-
- # It's nice to able user apply his own patches.
- epatch_user
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- # Do not link with -rpath. See bug #75181.
- find "${S}"/mkspecs -name qmake.conf | xargs \
- sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
- # known working flags wrt #77623
- use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
- # set c/xxflags and ldflags
- strip-flags
- append-flags -fno-strict-aliasing
-
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
- -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
-
- if [ $(get_libdir) != "lib" ] ; then
- sed -i -e "s:/lib$:/$(get_libdir):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
- fi
-
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}"/qmake/Makefile.unix || die
-
- # remove unnecessary headers
- rm include/[^q]*.h
- rm include/*_p.h
-}
-
-src_configure() {
- export SYSCONF="${D}${QTBASE}"/etc/settings
-
- # Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
- addwrite "${QTBASE}/etc/settings"
- addwrite "${HOME}/.qt"
-
- [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
- use nas && myconf+=" -system-nas-sound"
- use nis && myconf+=" -nis" || myconf+=" -no-nis"
- use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql"
- use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql"
- use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase"
- use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite"
- use cups && myconf+=" -cups" || myconf+=" -no-cups"
- use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl"
- use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions"
- use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama"
-
- myconf="${myconf} -system-zlib -qt-gif"
-
- use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6"
-# use immqt-bc && myconf+=" -inputmethod"
-# use immqt && myconf+=" -inputmethod -inputmethod-ext"
-
- export YACC='byacc -d'
- tc-export CC CXX
- export LINK="$(tc-getCXX)"
-
- ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
- emake src-qmake src-moc sub-src || die
-
- export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- emake sub-tools || die
-
- if use examples; then
- emake sub-tutorial sub-examples || die
- fi
-
- # Make the msg2qm utility (not made by default)
- cd "${S}"/tools/msg2qm
- ../../bin/qmake
- emake
-
- # Make the qembed utility (not made by default)
- cd "${S}"/tools/qembed
- ../../bin/qmake
-}
-
-src_install() {
- local qt_version="$(grep VERSION src/qt.pro | awk '{ print $3 }')"
- # binaries
- into ${QTBASE}
- dobin bin/*
- dobin tools/msg2qm/msg2qm
- dobin tools/qembed/qembed
-
- # libraries
- dolib.so lib/lib{editor,qassistantclient,designercore}.a
- dolib.so lib/libqt-mt.la
- dolib.so lib/libqt-mt.so.${qt_version} lib/libqui.so.1.0.0
- cd "${D}"/${QTBASE}/$(get_libdir)
-
- for x in libqui.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.3.5->3.3->3->.so
- ln -s libqt-mt.so.${qt_version} libqt-mt.so.3.3
- ln -s libqt-mt.so.3.3 libqt-mt.so.3
- ln -s libqt-mt.so.3 libqt-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqt-mt.so.${qt_version} libqt.so.${qt_version}
- ln -s libqt-mt.so.3.3 libqt.so.3.3
- ln -s libqt-mt.so.3 libqt.so.3
- ln -s libqt-mt.so libqt.so
-
- # plugins
- cd "${S}"
- local plugins=$(find plugins -name "lib*.so" -print)
- for x in ${plugins}; do
- exeinto ${QTBASE}/$(dirname ${x})
- doexe ${x}
- done
-
- # Past this point just needs to be done once
- is_final_abi || return 0
-
- # includes
- cd "${S}"
- dodir ${QTBASE}/include/private
- cp include/*\.h "${D}"/${QTBASE}/include/
- cp include/private/*\.h "${D}"/${QTBASE}/include/private/
-
- # prl files
- sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
- insinto ${QTBASE}/$(get_libdir)
- doins "${S}"/lib/*.prl
-
- # pkg-config file
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${S}"/lib/*.pc
-
- # List all the multilib libdirs
- local libdirs
- for alibdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${QTBASE}/${alibdir}"
- done
-
- # environment variables
- cat <<EOF > "${T}"/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-
- cat <<EOF > "${T}"/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
- cat <<EOF > "${T}"/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
- insinto /etc/revdep-rebuild
- doins "${T}"/50-qt3-revdep
-
- doenvd "${T}"/45qt3 "${T}"/50qtdir3
-
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
- fi
-
- insinto ${QTBASE}/tools/designer
- doins -r tools/designer/templates
-
- insinto ${QTBASE}
- doins -r translations
-
- keepdir ${QTBASE}/etc/settings
-
- if use doc; then
- insinto ${QTBASE}
- doins -r "${S}"/doc
- fi
-
- if use examples; then
- find "${S}"/examples "${S}"/tutorial -name Makefile | \
- xargs sed -i -e "s:${S}:${QTBASE}:g"
-
- cp -r "${S}"/examples "${D}"${QTBASE}/
- cp -r "${S}"/tutorial "${D}"${QTBASE}/
- fi
-
- # misc build reqs
- insinto ${QTBASE}/mkspecs
- doins -r "${S}"/mkspecs/${PLATFORM}
-
- sed -e "s:${S}:${QTBASE}:g" \
- "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache
-
- dodoc FAQ README README-QT.TXT changes*
-# if use immqt || use immqt-bc ; then
-# dodoc "${S}"/README.immodule
-# fi
-}
-
-pkg_postinst() {
- echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
- elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
- elog "same version of GCC. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
- echo
-}
diff --git a/dev-qt/qt/qt-3.9999.ebuild b/dev-qt/qt/qt-3.9999.ebuild
deleted file mode 100644
index 865719df..00000000
--- a/dev-qt/qt/qt-3.9999.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# *** Please remember to update qt3.eclass when revbumping this ***
-
-inherit eutils git-2 flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://qt.nokia.com/"
-
-# IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
-
-#SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
-# immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
-# immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-EGIT_REPO_URI="http://scm.trinitydesktop.org/scm/git/qt3"
-EGIT_BRANCH="master"
-EGIT_PROJECT="trinity/qt3"
-LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
-
-SLOT="3"
-KEYWORDS=
-IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
-# no odbc, immqt and immqt-bc support anymore.
-RDEPEND="
- virtual/jpeg
- >=media-libs/freetype-2
- >=media-libs/libmng-1.0.9
- media-libs/libpng
- sys-libs/zlib
- x11-libs/libXft
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libSM
- cups? ( net-print/cups )
- firebird? ( dev-db/firebird )
- mysql? ( virtual/mysql )
- nas? ( >=media-libs/nas-1.5 )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/postgresql )
- xinerama? ( x11-libs/libXinerama )
- !<=dev-qt/qt-meta-3.3.8c"
-DEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
-
-# immqt? ( x11-proto/xineramaproto )
-# immqt-bc? ( x11-proto/xineramaproto )"
-#PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-#S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
-
-QTBASE="/usr/qt/3"
-
-pkg_setup() {
-# if use immqt && use immqt-bc ; then
-# ewarn
-# ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-# ewarn "Please specify either immqt or immqt-bc."
-# ewarn
-# die
-# elif use immqt ; then
-# ewarn
-# ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
-## ewarn "you have to recompile everything depending on Qt after you install it."
-# ewarn "Be aware."
-# ewarn
-# fi
-
- export QTDIR="${S}"
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- PLATCXX="g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- PLATCXX="icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- PLATNAME="freebsd" ;;
- *-openbsd*)
- PLATNAME="openbsd" ;;
- *-netbsd*)
- PLATNAME="netbsd" ;;
- *-darwin*)
- PLATNAME="darwin" ;;
- *-linux-*|*-linux)
- PLATNAME="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- # probably this should be '*-64' for 64bit archs
- # in a fully multilib environment (no compatibility symlinks)
- export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_unpack() {
- git-2_src_unpack
-# mv "${S}/main/dependencies/qt3/" "${WORKDIR}/"
-# rm -rf "${S}"
-# mv "${WORKDIR}/qt3" "${S}"
-#
-# cd "${S}"
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- # Do not link with -rpath. See bug #75181.
- find "${S}"/mkspecs -name qmake.conf | xargs \
- sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-#
-# # Patch for uic includehint errors (aseigo patch)
-# epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch
-#
-# # KDE related patches
-# epatch "${FILESDIR}"/0001-dnd_optimization.patch
-# epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch
-# epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch
-# epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff
-# epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff
-# epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch
-#
-# # ulibc patch (bug #100246)
-# epatch "${FILESDIR}"/qt-ulibc.patch
-#
-# # xinerama patch: http://ktown.kde.org/~seli/xinerama/
-# epatch "${FILESDIR}"/qt-3.3.8-seli-xinerama.patch
-#
-# # Visibility patch, apply only on GCC 4.1 and later for safety
-# # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
-# epatch "${FILESDIR}"/qt-3.3.8-visibility.patch
-#
-# # Fix configure to correctly pick up gcc version, bug 244732
-# epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch
-#
-# # Fix CJK script rendering, bug 229567
-# epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch
-
- # now it's applyed to git version
- # Fix libpng-1.4 issues
-# epatch "${FILESDIR}"/qt-3.3.8-libpng14.patch
-
-# if use immqt || use immqt-bc ; then
-# epatch ../${IMMQT_P}.diff
-# sh make-symlinks.sh || die "make symlinks failed"
-#
-# epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch
-# fi
-#
-# if use mips; then
-# epatch "${FILESDIR}"/qt-3.3.8-mips.patch
-# fi
-#
-# # Add compatibility functions for the TQt interface
-# if use trinity; then
-# epatch "${FILESDIR}"/qt3_3.3.8c.diff
-# epatch ""
-# fi
-#
- # known working flags wrt #77623
- use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
- # set c/xxflags and ldflags
- strip-flags
- append-flags -fno-strict-aliasing
-#
-# if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-# ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-# append-flags -fno-stack-protector
-# fi
-#
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
- -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
-
- if [ $(get_libdir) != "lib" ] ; then
- sed -i -e "s:/lib$:/$(get_libdir):" \
- "${S}"/mkspecs/${PLATFORM}/qmake.conf || die
- fi
-
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}"/qmake/Makefile.unix || die
-}
-
-src_compile() {
- export SYSCONF="${D}${QTBASE}"/etc/settings
-
- # Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
- addwrite "${QTBASE}/etc/settings"
- addwrite "${HOME}/.qt"
-
- [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
- use nas && myconf+=" -system-nas-sound"
- use nis && myconf+=" -nis" || myconf+=" -no-nis"
- use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql"
- use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql"
- use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase"
- use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite"
- use cups && myconf+=" -cups" || myconf+=" -no-cups"
- use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl"
- use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions"
- use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama"
-
- myconf="${myconf} -system-zlib -qt-gif"
-
- use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6"
-# use immqt-bc && myconf+=" -inputmethod"
-# use immqt && myconf+=" -inputmethod -inputmethod-ext"
-
- export YACC='byacc -d'
- tc-export CC CXX
- export LINK="$(tc-getCXX)"
-
- einfo ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
- ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
- emake src-qmake src-moc sub-src || die
-
- export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- emake sub-tools || die
-
- if use examples; then
- emake sub-tutorial sub-examples || die
- fi
-
- # Make the msg2qm utility (not made by default)
- cd "${S}"/tools/msg2qm
- ../../bin/qmake
- emake
-
- # Make the qembed utility (not made by default)
- cd "${S}"/tools/qembed
- ../../bin/qmake
- emake
-
-}
-
-src_install() {
- local qt_version="$(grep VERSION src/qt.pro | awk '{ print $3 }')"
- # binaries
- into ${QTBASE}
- dobin bin/*
- dobin tools/msg2qm/msg2qm
- dobin tools/qembed/qembed
-
- # libraries
- dolib.so lib/lib{editor,qassistantclient,designercore}.a
- dolib.so lib/libqt-mt.la
- dolib.so lib/libqt-mt.so.${qt_version} lib/libqui.so.1.0.0
- cd "${D}"/${QTBASE}/$(get_libdir)
-
- for x in libqui.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.3.5->3.3->3->.so
- ln -s libqt-mt.so.${qt_version} libqt-mt.so.3.3
- ln -s libqt-mt.so.3.3 libqt-mt.so.3
- ln -s libqt-mt.so.3 libqt-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqt-mt.so.${qt_version} libqt.so.${qt_version}
- ln -s libqt-mt.so.3.3 libqt.so.3.3
- ln -s libqt-mt.so.3 libqt.so.3
- ln -s libqt-mt.so libqt.so
-
- # plugins
- cd "${S}"
- local plugins=$(find plugins -name "lib*.so" -print)
- for x in ${plugins}; do
- exeinto ${QTBASE}/$(dirname ${x})
- doexe ${x}
- done
-
- # Past this point just needs to be done once
- is_final_abi || return 0
-
- # includes
- cd "${S}"
- dodir ${QTBASE}/include/private
- cp include/*\.h "${D}"/${QTBASE}/include/
- cp include/private/*\.h "${D}"/${QTBASE}/include/private/
-
- # prl files
- sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
- insinto ${QTBASE}/$(get_libdir)
- doins "${S}"/lib/*.prl
-
- # pkg-config file
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${S}"/lib/*.pc
-
- # List all the multilib libdirs
- local libdirs
- for alibdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${QTBASE}/${alibdir}"
- done
-
- # environment variables
- cat <<EOF > "${T}"/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-
- cat <<EOF > "${T}"/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
- cat <<EOF > "${T}"/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
- insinto /etc/revdep-rebuild
- doins "${T}"/50-qt3-revdep
-
- doenvd "${T}"/45qt3 "${T}"/50qtdir3
-
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
- fi
-
- insinto ${QTBASE}/tools/designer
- doins -r tools/designer/templates
-
- insinto ${QTBASE}
- doins -r translations
-
- keepdir ${QTBASE}/etc/settings
-
- if use doc; then
- insinto ${QTBASE}
- doins -r "${S}"/doc
- fi
-
- if use examples; then
- find "${S}"/examples "${S}"/tutorial -name Makefile | \
- xargs sed -i -e "s:${S}:${QTBASE}:g"
-
- cp -r "${S}"/examples "${D}"${QTBASE}/
- cp -r "${S}"/tutorial "${D}"${QTBASE}/
- fi
-
- # misc build reqs
- insinto ${QTBASE}/mkspecs
- doins -r "${S}"/mkspecs/${PLATFORM}
-
- sed -e "s:${S}:${QTBASE}:g" \
- "${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache
-
- dodoc FAQ README README-QT.TXT changes*
-# if use immqt || use immqt-bc ; then
-# dodoc "${S}"/README.immodule
-# fi
-}
-
-pkg_postinst() {
- echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
- elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
- elog "same version of GCC. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
- echo
-}
diff --git a/dev-qt/qt4-tqt-engine/Manifest b/dev-qt/qt4-tqt-engine/Manifest
deleted file mode 100644
index 5059b13c..00000000
--- a/dev-qt/qt4-tqt-engine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-AUX qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth 1094 SHA256 985b992afab2ddb18850ec56c60bbff087739f1ee25ae5eb26f79b21904f7a2e SHA512 904833bfe34979953157565ce2d44bdd48b66f2292dac20eefbb8e6f5a4774738cd5b3fd0f157871cf87a7ad328fbbe9707a76f1a162616d17696128e460ad85 WHIRLPOOL df9b8e3d74b23c96f109c267c572e25225c15b28fc0c635f4f1ef1bd922aa747ab14ca61deff0ace91801a2029427dce7d0ff937b6bfdbbfa9d942f74a1ada1b
diff --git a/dev-qt/qt4-tqt-engine/files/qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth b/dev-qt/qt4-tqt-engine/files/qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth
deleted file mode 100644
index 1ae80b95..00000000
--- a/dev-qt/qt4-tqt-engine/files/qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp
-index e876c45..1ea75fc 100644
---- a/plugin/simplestyle.cpp
-+++ b/plugin/simplestyle.cpp
-@@ -247,12 +247,6 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
- qt_filedialog_save_filename_hook = &TDEFileDialogSaveName;
- qt_filedialog_existing_directory_hook = &TDEFileDialogSelectDirectory;
- #endif // INTEGRATE_WITH_TDE
--
--#if QT_VERSION > 0x040800
-- // How a bug of this magnitude could go undetected in a major Qt4 release is beyond me...I guess cell phones don't generally use thin lines in their widgets!?
-- // This is Yet Another Example of why TDE cannot rely on Qt4 for anything of any real importance
-- printf("[WARNING] Qt4 >= Qt 4.8.0 detected; you are likely affected by these Qt4 bugs:\n[WARNING] https://bugreports.qt-project.org/browse/QTBUG-25896\n[WARNING] https://bugreports.qt-project.org/browse/QTBUG-26013\n[WARNING] There is no known workaround for this problem; your Qt4 application will display with numerous graphical glitches.\n");
--#endif
- }
-
- Qt4TDEStyle::~Qt4TDEStyle()
diff --git a/dev-qt/qt4-tqt-engine/qt4-tqt-engine-9999.ebuild b/dev-qt/qt4-tqt-engine/qt4-tqt-engine-9999.ebuild
deleted file mode 100644
index d618669f..00000000
--- a/dev-qt/qt4-tqt-engine/qt4-tqt-engine-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="qt4-tqt-theme-engine"
-
-inherit trinity-base qt4-r2
-
-DESCRIPTION="A trinity Qt4 theme engine using tqt as a backend"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-qt/tqtinterface
- >=dev-qt/qtcore-4.8.4:4
- >=dev-qt/qtgui-4.8.4:4"
-RDEPEND="$DEPEND"
-
-need-trinity 9999
-
-src_unpack() {
- trinity-base_src_unpack
-}
-
-src_prepare() {
- local pro libdirs d
-
- trinity-base_src_prepare
-
- for d in $(get-trinity-libdirs); do
- libdirs+=" -L$d"
- done
-
- for d in $(get_all_libdirs); do
- libdirs+=" -L/usr/tqt3/$d"
- done
-
- for pro in ./plugin/plugin.pro ./lib/lib.pro ./examples/tqt3reference/stylewindow.pro; do
- sed -i -e 's!\(^INCLUDEPATH += \)/usr/include/tqt3!\1/usr/tqt3/include!;' \
- -e 's!\(^INCLUDEPATH += \)/opt/trinity/include!\1'"$TDEDIR/include"'!;' \
- -e '/\(^LIBS += \)/s!!\1 '"$libdirs"'!' $pro || die "sed failed"
- done
- epatch "${FILESDIR}/qt4-tqt-theme-engine-suppress-annoying-warning-about-qt-version.pacth"
-}
-
-src_configure() {
- qt4-r2_src_configure
-}
-
-src_compile() {
- qt4-r2_src_compile
-}
-
-src_install() {
- qt4-r2_src_install
-}
-
-pkg_postinst() {
- ewarn "With Qt >= 4.8.0 you are likely affected by these Qt4 bug:"
- ewarn " https://bugreports.qt.io/browse/QTBUG-25896"
- ewarn "To workaround this please make sure to set your Qt graphics system to \"native\""
- ewarn "rather than \"opengl\". Otherwice Qt4 applications may be displayed with numerous"
- ewarn "graphical glitches."
-}
diff --git a/dev-qt/tqtinterface/Manifest b/dev-qt/tqtinterface/Manifest
deleted file mode 100644
index c93c1b69..00000000
--- a/dev-qt/tqtinterface/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST tqtinterface-3.5.13.1.tar.gz 1203318 SHA256 72c8477867a4dfc0f65f00a22a3a4303eb1f1de7211c9e086053ed921a3693a1 SHA512 d0257a9e9eef332d60a13b37dbbbdd202837718384e9edc8d5d429531e914e5b42fab9a41bee65bedfcf5698c79419c04e9741c1a3ac6cafce10579bdec3654e WHIRLPOOL dd8827fc5c7025c111267c13dfb92fbd83635eb78e2af0a2175bf74837b5092050bbe0738d16a8f67173cb6e422b38fb8f730f29a7ee81ec0f6f42f6b8375a77
-DIST tqtinterface-trinity-3.5.13.2.tar.xz 795076 SHA256 385f1c7d38a978a9c43c18d9c65896beae9344fe6de87f72c884f7ec9ab7f84d SHA512 58894e9db01cffda9b2132553ac342d1d47d0f8db231e8be21438c5fcf171b09db3d64fcde065e01ab539f7d9ee7662b4907b19b585eb1aae0ca8c838b1144ee WHIRLPOOL 7ed1ff2f48a30b670be59e2b94bb3b37ec5d481c967d210484ebf3b48541957a8e30bfcd3415534b9aa85e64c87e9af2e777f11a93fe847a899d740df5855c1c
diff --git a/dev-qt/tqtinterface/tqtinterface-3.5.13.1.ebuild b/dev-qt/tqtinterface/tqtinterface-3.5.13.1.ebuild
deleted file mode 100644
index 5f94cfa8..00000000
--- a/dev-qt/tqtinterface/tqtinterface-3.5.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
-
-inherit trinity-base
-
-DESCRIPTION="Interface and abstraction library for Qt and Trinity"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-IUSE="+qt3 -qt4"
-SLOT="0"
-
-DEPEND="qt3? ( >=dev-qt/qt-3.3.8d:3 )
- qt4? ( dev-qt/qt-meta:4 )
- !!x11-libs/tqtinterface"
-
-RDEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use qt3 USE_QT3)
- $(cmake-utils_use qt4 USE_QT4)
- )
-
- cmake-utils_src_configure
-}
diff --git a/dev-qt/tqtinterface/tqtinterface-3.5.13.2.ebuild b/dev-qt/tqtinterface/tqtinterface-3.5.13.2.ebuild
deleted file mode 100644
index 7f7b7134..00000000
--- a/dev-qt/tqtinterface/tqtinterface-3.5.13.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
-
-inherit trinity-base
-
-DESCRIPTION="Interface and abstraction library for Qt and Trinity"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt3 -qt4"
-SLOT="0"
-
-DEPEND="qt3? ( >=dev-qt/qt-3.3.8d:3 )
- qt4? ( dev-qt/qt-meta:4 )
- !!x11-libs/tqtinterface"
-
-RDEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use qt3 USE_QT3)
- $(cmake-utils_use qt4 USE_QT4)
- )
-
- cmake-utils_src_configure
-}
diff --git a/app-misc/hal-info/metadata.xml b/dev-tqt/tqt/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/app-misc/hal-info/metadata.xml
+++ b/dev-tqt/tqt/metadata.xml
diff --git a/dev-qt/tqt/tqt-3.9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild
index 4ef34b57..81739589 100644
--- a/dev-qt/tqt/tqt-3.9999.ebuild
+++ b/dev-tqt/tqt/tqt-9999.ebuild
@@ -3,10 +3,11 @@
# $Id$
EAPI=5
-inherit eutils git-2 flag-o-matic toolchain-funcs
+RESTRICT=network-sandbox
+inherit eutils git-2 toolchain-funcs
SRCTYPE="free"
-DESCRIPTION="The Trinitie's Qt toolkit fork."
+DESCRIPTION="The Trinitie's TQt toolkit fork."
HOMEPAGE="http://trinitydesktop.org/"
# IMMTQT_P="tqt-x11-immodule-unified-tqt3.3.8-20070321-gentoo"
@@ -14,7 +15,7 @@ HOMEPAGE="http://trinitydesktop.org/"
#SRC_URI="ftp://ftp.trolltech.com/tqt/source/tqt-x11-${SRCTYPE}-${PV}.tar.gz
# immtqt? ( mirror://gentoo/${IMMTQT_P}.diff.bz2 )
# immtqt-bc? ( mirror://gentoo/${IMMTQT_P}.diff.bz2 )"
-EGIT_REPO_URI="http://scm.trinitydesktop.org/scm/git/tqt3"
+EGIT_REPO_URI="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3"
EGIT_PROJECT="trinity/tqt3"
LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
@@ -45,12 +46,8 @@ RDEPEND="
!dev-qt/qt:3
!dev-qt/qt-meta:3"
DEPEND="${RDEPEND}
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )"
+ x11-base/xorg-proto"
-# immtqt? ( x11-proto/xineramaproto )
-# immtqt-bc? ( x11-proto/xineramaproto )"
#PDEPEND="odbc? ( ~dev-db/tqt-unixODBC-$PV )"
#S="${WORKDIR}/tqt-x11-${SRCTYPE}-${PV}"
@@ -72,7 +69,7 @@ pkg_setup() {
# ewarn
# fi
- export QTDIR="${S}"
+ export TQTDIR="${S}"
CXX=$(tc-getCXX)
if [[ ${CXX/g++/} != ${CXX} ]]; then
@@ -121,7 +118,6 @@ src_prepare() {
# set c/xxflags and ldflags
strip-flags
- append-flags -fno-strict-aliasing
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
@@ -151,13 +147,13 @@ src_configure() {
export SYSCONF="${D}${TQTBASE}"/etc/settings
# Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
+ # as it makes TQt much happier.
addwrite "${TQTBASE}/etc/settings"
addwrite "${HOME}/.qt"
addwrite "${HOME}/.tqt"
# common opts
- myconf=" -sm -thread -stl -no-verbose -no-verbose -verbose -largefile -tablet"
+ myconf=" -sm -thread -stl -no-verbose -largefile -tablet -no-exceptions"
myconf+=" $(echo -{qt-imgfmt-,system-lib}{jpeg,mng,png})"
myconf+=" -platform ${PLATFORM} -xplatform ${PLATFORM}"
myconf+=" -xft -xrender -prefix ${TQTBASE}"
@@ -295,12 +291,11 @@ EOF
pkg_postinst() {
echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
+ elog "After a rebuild of TQt, it can happen that TQt plugins (such as TQt/TDE styles,"
+ elog "or widgets for the TQt designer) are no longer recognized. If this situation"
elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
+ elog "and you should also make sure that TQt and its plugins were compiled with the"
elog "same version of GCC. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
+ elog "tde-base/tdelibs, tde-base/tdeartwork and tde-base/tdeartwork-styles."
echo
}
diff --git a/dev-qt/tqtinterface/metadata.xml b/dev-tqt/tqtinterface/metadata.xml
index 1fb59563..1fb59563 100644
--- a/dev-qt/tqtinterface/metadata.xml
+++ b/dev-tqt/tqtinterface/metadata.xml
diff --git a/dev-qt/tqtinterface/tqtinterface-9999.ebuild b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
index f0e13167..e3f00612 100644
--- a/dev-qt/tqtinterface/tqtinterface-9999.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
@@ -7,29 +7,26 @@ TRINITY_MODULE_NAME="${PN}"
inherit trinity-base
-DESCRIPTION="Interface and abstraction library for Qt and Trinity"
+DESCRIPTION="Interface and abstraction library for TQt and Trinity"
HOMEPAGE="http://trinitydesktop.org/"
LICENSE="GPL-2"
KEYWORDS=
-IUSE="-qt3 +tqt"
-REQUIRED_USE="^^ ( qt3 tqt )"
+IUSE="+tqt"
+REQUIRED_USE="^^ ( tqt )"
SLOT="0"
-DEPEND="qt3? ( >=dev-qt/qt-3.9999:3 )
- tqt? ( >=dev-qt/tqt-3.9999 )
- !!x11-libs/tqtinterface"
+DEPEND="tqt? ( >=dev-tqt/tqt-9999 )"
RDEPEND="${DEPEND}"
pkg_setup() {
- use qt3 && export QTDIR="/usr/qt/3"
- use tqt && export QTDIR="/usr/tqt3"
+ use tqt && export TQTDIR="/usr/tqt3"
}
src_configure() {
mycmakeargs=(
-DUSE_QT3=ON
- -DQT_PREFIX_DIR="$QTDIR"
+ -DQT_PREFIX_DIR="$TQTDIR"
)
cmake-utils_src_configure
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
deleted file mode 100644
index f1094e7c..00000000
--- a/eclass/kde-functions.eclass
+++ /dev/null
@@ -1,706 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.175 2009/11/01 20:26:34 abcd Exp $
-
-# @ECLASS: kde-functions.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# Original author Dan Armak <danarmak@gentoo.org>
-#
-# @BLURB: This contains everything except things that modify ebuild variables and
-# @DESCRIPTION:
-# This contains everything except things that modify ebuild variables
-# and functions (e.g. $P, src_compile() etc.)
-
-inherit qt3 eutils
-
-# map of the monolithic->split ebuild derivation; used to build deps describing
-# the relationships between them
-KDE_DERIVATION_MAP='
-kde-base/kdeaccessibility kde-base/kbstateapplet
-kde-base/kdeaccessibility kde-base/kdeaccessibility-iconthemes
-kde-base/kdeaccessibility kde-base/kmag
-kde-base/kdeaccessibility kde-base/kmousetool
-kde-base/kdeaccessibility kde-base/kmouth
-kde-base/kdeaccessibility kde-base/kttsd
-kde-base/kdeaccessibility kde-base/ksayit
-kde-base/kdeaddons kde-base/atlantikdesigner
-kde-base/kdeaddons kde-base/kaddressbook-plugins
-kde-base/kdeaddons kde-base/kate-plugins
-kde-base/kdeaddons kde-base/kdeaddons-docs-konq-plugins
-kde-base/kdeaddons kde-base/kdeaddons-kfile-plugins
-kde-base/kdeaddons kde-base/kicker-applets
-kde-base/kdeaddons kde-base/knewsticker-scripts
-kde-base/kdeaddons kde-base/konq-plugins
-kde-base/kdeaddons kde-base/konqueror-akregator
-kde-base/kdeaddons kde-base/ksig
-kde-base/kdeaddons kde-base/noatun-plugins
-kde-base/kdeaddons kde-base/renamedlg-audio
-kde-base/kdeaddons kde-base/renamedlg-images
-kde-base/kdeadmin kde-base/kcron
-kde-base/kdeadmin kde-base/kdat
-kde-base/kdeadmin kde-base/kdeadmin-kfile-plugins
-kde-base/kdeadmin kde-base/knetworkconf
-kde-base/kdeadmin kde-base/kpackage
-kde-base/kdeadmin kde-base/ksysv
-kde-base/kdeadmin kde-base/kuser
-kde-base/kdeadmin kde-base/lilo-config
-kde-base/kdeadmin kde-base/secpolicy
-kde-base/kdeartwork kde-base/kdeartwork-emoticons
-kde-base/kdeartwork kde-base/kdeartwork-icewm-themes
-kde-base/kdeartwork kde-base/kdeartwork-iconthemes
-kde-base/kdeartwork kde-base/kdeartwork-kscreensaver
-kde-base/kdeartwork kde-base/kdeartwork-kwin-styles
-kde-base/kdeartwork kde-base/kdeartwork-kworldclock
-kde-base/kdeartwork kde-base/kdeartwork-kworldwatch
-kde-base/kdeartwork kde-base/kdeartwork-sounds
-kde-base/kdeartwork kde-base/kdeartwork-styles
-kde-base/kdeartwork kde-base/kdeartwork-wallpapers
-kde-base/kdebase kde-base/drkonqi
-kde-base/kdebase kde-base/kappfinder
-kde-base/kdebase kde-base/kate
-kde-base/kdebase kde-base/kcheckpass
-kde-base/kdebase kde-base/kcminit
-kde-base/kdebase kde-base/kcontrol
-kde-base/kdebase kde-base/kdcop
-kde-base/kdebase kde-base/kdebase-data
-kde-base/kdebase kde-base/kdebase-kioslaves
-kde-base/kdebase kde-base/kdebase-startkde
-kde-base/kdebase kde-base/kdebugdialog
-kde-base/kdebase kde-base/kdepasswd
-kde-base/kdebase kde-base/kdeprint
-kde-base/kdebase kde-base/kdesktop
-kde-base/kdebase kde-base/kdesu
-kde-base/kdebase kde-base/kdialog
-kde-base/kdebase kde-base/kdm
-kde-base/kdebase kde-base/kfind
-kde-base/kdebase kde-base/khelpcenter
-kde-base/kdebase kde-base/khotkeys
-kde-base/kdebase kde-base/kicker
-kde-base/kdebase kde-base/klipper
-kde-base/kdebase kde-base/kmenuedit
-kde-base/kdebase kde-base/knetattach
-kde-base/kdebase kde-base/konqueror
-kde-base/kdebase kde-base/konsole
-kde-base/kdebase kde-base/kpager
-kde-base/kdebase kde-base/kpersonalizer
-kde-base/kdebase kde-base/kreadconfig
-kde-base/kdebase kde-base/kscreensaver
-kde-base/kdebase kde-base/ksmserver
-kde-base/kdebase kde-base/ksplashml
-kde-base/kdebase kde-base/kstart
-kde-base/kdebase kde-base/ksysguard
-kde-base/kdebase kde-base/ksystraycmd
-kde-base/kdebase kde-base/ktip
-kde-base/kdebase kde-base/kwin
-kde-base/kdebase kde-base/kxkb
-kde-base/kdebase kde-base/libkonq
-kde-base/kdebase kde-base/nsplugins
-kde-base/kdebindings kde-base/dcopc
-kde-base/kdebindings kde-base/dcopjava
-kde-base/kdebindings kde-base/dcopperl
-kde-base/kdebindings kde-base/dcoppython
-kde-base/kdebindings kde-base/kalyptus
-kde-base/kdebindings kde-base/kdejava
-kde-base/kdebindings kde-base/kjsembed
-kde-base/kdebindings kde-base/korundum
-kde-base/kdebindings kde-base/pykde
-kde-base/kdebindings kde-base/qtjava
-kde-base/kdebindings kde-base/qtruby
-kde-base/kdebindings kde-base/qtsharp
-kde-base/kdebindings kde-base/smoke
-kde-base/kdebindings kde-base/xparts
-kde-base/kdeedu kde-base/blinken
-kde-base/kdeedu kde-base/kalzium
-kde-base/kdeedu kde-base/kanagram
-kde-base/kdeedu kde-base/kbruch
-kde-base/kdeedu kde-base/kdeedu-applnk
-kde-base/kdeedu kde-base/keduca
-kde-base/kdeedu kde-base/kgeography
-kde-base/kdeedu kde-base/khangman
-kde-base/kdeedu kde-base/kig
-kde-base/kdeedu kde-base/kiten
-kde-base/kdeedu kde-base/klatin
-kde-base/kdeedu kde-base/klettres
-kde-base/kdeedu kde-base/kmathtool
-kde-base/kdeedu kde-base/kmessedwords
-kde-base/kdeedu kde-base/kmplot
-kde-base/kdeedu kde-base/kpercentage
-kde-base/kdeedu kde-base/kstars
-kde-base/kdeedu kde-base/ktouch
-kde-base/kdeedu kde-base/kturtle
-kde-base/kdeedu kde-base/kverbos
-kde-base/kdeedu kde-base/kvoctrain
-kde-base/kdeedu kde-base/kwordquiz
-kde-base/kdeedu kde-base/libkdeedu
-kde-base/kdegames kde-base/atlantik
-kde-base/kdegames kde-base/kasteroids
-kde-base/kdegames kde-base/katomic
-kde-base/kdegames kde-base/kbackgammon
-kde-base/kdegames kde-base/kbattleship
-kde-base/kdegames kde-base/kblackbox
-kde-base/kdegames kde-base/kbounce
-kde-base/kdegames kde-base/kenolaba
-kde-base/kdegames kde-base/kfouleggs
-kde-base/kdegames kde-base/kgoldrunner
-kde-base/kdegames kde-base/kjumpingcube
-kde-base/kdegames kde-base/klickety
-kde-base/kdegames kde-base/klines
-kde-base/kdegames kde-base/kmahjongg
-kde-base/kdegames kde-base/kmines
-kde-base/kdegames kde-base/knetwalk
-kde-base/kdegames kde-base/kolf
-kde-base/kdegames kde-base/konquest
-kde-base/kdegames kde-base/kpat
-kde-base/kdegames kde-base/kpoker
-kde-base/kdegames kde-base/kreversi
-kde-base/kdegames kde-base/ksame
-kde-base/kdegames kde-base/kshisen
-kde-base/kdegames kde-base/ksirtet
-kde-base/kdegames kde-base/ksmiletris
-kde-base/kdegames kde-base/ksnake
-kde-base/kdegames kde-base/ksokoban
-kde-base/kdegames kde-base/kspaceduel
-kde-base/kdegames kde-base/ktron
-kde-base/kdegames kde-base/ktuberling
-kde-base/kdegames kde-base/kwin4
-kde-base/kdegames kde-base/libkdegames
-kde-base/kdegames kde-base/libksirtet
-kde-base/kdegames kde-base/lskat
-kde-base/kdegraphics kde-base/kamera
-kde-base/kdegraphics kde-base/kcoloredit
-kde-base/kdegraphics kde-base/kdegraphics-kfile-plugins
-kde-base/kdegraphics kde-base/kdvi
-kde-base/kdegraphics kde-base/kfax
-kde-base/kdegraphics kde-base/kgamma
-kde-base/kdegraphics kde-base/kghostview
-kde-base/kdegraphics kde-base/kiconedit
-kde-base/kdegraphics kde-base/kmrml
-kde-base/kdegraphics kde-base/kolourpaint
-kde-base/kdegraphics kde-base/kooka
-kde-base/kdegraphics kde-base/kpdf
-kde-base/kdegraphics kde-base/kpovmodeler
-kde-base/kdegraphics kde-base/kruler
-kde-base/kdegraphics kde-base/ksnapshot
-kde-base/kdegraphics kde-base/ksvg
-kde-base/kdegraphics kde-base/kuickshow
-kde-base/kdegraphics kde-base/kview
-kde-base/kdegraphics kde-base/kviewshell
-kde-base/kdegraphics kde-base/libkscan
-kde-base/kdemultimedia kde-base/akode
-kde-base/kdemultimedia kde-base/artsplugin-akode
-kde-base/kdemultimedia kde-base/artsplugin-audiofile
-kde-base/kdemultimedia kde-base/artsplugin-mpeglib
-kde-base/kdemultimedia kde-base/artsplugin-mpg123
-kde-base/kdemultimedia kde-base/artsplugin-xine
-kde-base/kdemultimedia kde-base/juk
-kde-base/kdemultimedia kde-base/kaboodle
-kde-base/kdemultimedia kde-base/kaudiocreator
-kde-base/kdemultimedia kde-base/kdemultimedia-arts
-kde-base/kdemultimedia kde-base/kdemultimedia-kappfinder-data
-kde-base/kdemultimedia kde-base/kdemultimedia-kfile-plugins
-kde-base/kdemultimedia kde-base/kdemultimedia-kioslaves
-kde-base/kdemultimedia kde-base/kmid
-kde-base/kdemultimedia kde-base/kmix
-kde-base/kdemultimedia kde-base/krec
-kde-base/kdemultimedia kde-base/kscd
-kde-base/kdemultimedia kde-base/libkcddb
-kde-base/kdemultimedia kde-base/mpeglib
-kde-base/kdemultimedia kde-base/noatun
-kde-base/kdenetwork kde-base/dcoprss
-kde-base/kdenetwork kde-base/kdenetwork-filesharing
-kde-base/kdenetwork kde-base/kdenetwork-kfile-plugins
-kde-base/kdenetwork kde-base/kdict
-kde-base/kdenetwork kde-base/kdnssd
-kde-base/kdenetwork kde-base/kget
-kde-base/kdenetwork kde-base/knewsticker
-kde-base/kdenetwork kde-base/kopete
-kde-base/kdenetwork kde-base/kpf
-kde-base/kdenetwork kde-base/kppp
-kde-base/kdenetwork kde-base/krdc
-kde-base/kdenetwork kde-base/krfb
-kde-base/kdenetwork kde-base/ksirc
-kde-base/kdenetwork kde-base/ktalkd
-kde-base/kdenetwork kde-base/kwifimanager
-kde-base/kdenetwork kde-base/librss
-kde-base/kdenetwork kde-base/lisa
-kde-base/kdepim kde-base/akregator
-kde-base/kdepim kde-base/certmanager
-kde-base/kdepim kde-base/kaddressbook
-kde-base/kdepim kde-base/kalarm
-kde-base/kdepim kde-base/kandy
-kde-base/kdepim kde-base/karm
-kde-base/kdepim kde-base/kdepim-kioslaves
-kde-base/kdepim kde-base/kdepim-kresources
-kde-base/kdepim kde-base/kdepim-wizards
-kde-base/kdepim kde-base/kitchensync
-kde-base/kdepim kde-base/kmail
-kde-base/kdepim kde-base/kmailcvt
-kde-base/kdepim kde-base/knode
-kde-base/kdepim kde-base/knotes
-kde-base/kdepim kde-base/kode
-kde-base/kdepim kde-base/konsolekalendar
-kde-base/kdepim kde-base/kontact
-kde-base/kdepim kde-base/kontact-specialdates
-kde-base/kdepim kde-base/korganizer
-kde-base/kdepim kde-base/korn
-kde-base/kdepim kde-base/kpilot
-kde-base/kdepim kde-base/ksync
-kde-base/kdepim kde-base/ktnef
-kde-base/kdepim kde-base/libkcal
-kde-base/kdepim kde-base/libkdenetwork
-kde-base/kdepim kde-base/libkdepim
-kde-base/kdepim kde-base/libkholidays
-kde-base/kdepim kde-base/libkmime
-kde-base/kdepim kde-base/libkpgp
-kde-base/kdepim kde-base/libkpimexchange
-kde-base/kdepim kde-base/libkpimidentities
-kde-base/kdepim kde-base/libksieve
-kde-base/kdepim kde-base/mimelib
-kde-base/kdepim kde-base/networkstatus
-kde-base/kdesdk kde-base/cervisia
-kde-base/kdesdk kde-base/kapptemplate
-kde-base/kdesdk kde-base/kbabel
-kde-base/kdesdk kde-base/kbugbuster
-kde-base/kdesdk kde-base/kcachegrind
-kde-base/kdesdk kde-base/kdesdk-kfile-plugins
-kde-base/kdesdk kde-base/kdesdk-kioslaves
-kde-base/kdesdk kde-base/kdesdk-misc
-kde-base/kdesdk kde-base/kdesdk-scripts
-kde-base/kdesdk kde-base/kmtrace
-kde-base/kdesdk kde-base/kompare
-kde-base/kdesdk kde-base/kspy
-kde-base/kdesdk kde-base/kuiviewer
-kde-base/kdesdk kde-base/umbrello
-kde-base/kdetoys kde-base/amor
-kde-base/kdetoys kde-base/eyesapplet
-kde-base/kdetoys kde-base/fifteenapplet
-kde-base/kdetoys kde-base/kmoon
-kde-base/kdetoys kde-base/kodo
-kde-base/kdetoys kde-base/kteatime
-kde-base/kdetoys kde-base/ktux
-kde-base/kdetoys kde-base/kweather
-kde-base/kdetoys kde-base/kworldclock
-kde-base/kdetoys kde-base/kworldwatch
-kde-base/kdeutils kde-base/ark
-kde-base/kdeutils kde-base/kcalc
-kde-base/kdeutils kde-base/kcharselect
-kde-base/kdeutils kde-base/kdelirc
-kde-base/kdeutils kde-base/kdf
-kde-base/kdeutils kde-base/kedit
-kde-base/kdeutils kde-base/kfloppy
-kde-base/kdeutils kde-base/kgpg
-kde-base/kdeutils kde-base/khexedit
-kde-base/kdeutils kde-base/kjots
-kde-base/kdeutils kde-base/klaptopdaemon
-kde-base/kdeutils kde-base/kmilo
-kde-base/kdeutils kde-base/kregexpeditor
-kde-base/kdeutils kde-base/ksim
-kde-base/kdeutils kde-base/ktimer
-kde-base/kdeutils kde-base/kwalletmanager
-kde-base/kdeutils kde-base/superkaramba
-kde-base/kdewebdev kde-base/kfilereplace
-kde-base/kdewebdev kde-base/kimagemapeditor
-kde-base/kdewebdev kde-base/klinkstatus
-kde-base/kdewebdev kde-base/kommander
-kde-base/kdewebdev kde-base/kxsldbg
-kde-base/kdewebdev kde-base/quanta
-app-office/koffice app-office/karbon
-app-office/koffice app-office/kchart
-app-office/koffice app-office/kexi
-app-office/koffice app-office/kformula
-app-office/koffice app-office/kivio
-app-office/koffice app-office/koffice-data
-app-office/koffice app-office/koffice-libs
-app-office/koffice app-office/koffice-meta
-app-office/koffice app-office/koshell
-app-office/koffice app-office/kplato
-app-office/koffice app-office/kpresenter
-app-office/koffice app-office/krita
-app-office/koffice app-office/kspread
-app-office/koffice app-office/kugar
-app-office/koffice app-office/kword
-'
-
-# @FUNCTION: get-parent-package
-# @USAGE: < name of split-ebuild >
-# @DESCRIPTION:
-# accepts 1 parameter, the name of a split ebuild; echoes the name of its mother package
-get-parent-package() {
- local parent child
- while read parent child; do
- if [[ ${child} == $1 ]]; then
- echo ${parent}
- return 0
- fi
- done <<EOF
-$KDE_DERIVATION_MAP
-EOF
- die "Package $1 not found in KDE_DERIVATION_MAP, please report bug"
-}
-
-# @FUNCTION: get-child-packages
-# @USAGE: < name of monolithic package >
-# @DESCRIPTION:
-# accepts 1 parameter, the name of a monolithic package; echoes the names of all ebuilds derived from it
-get-child-packages() {
- local parent child
- while read parent child; do
- [[ ${parent} == $1 ]] && echo -n "${child} "
- done <<EOF
-$KDE_DERIVATION_MAP
-EOF
-}
-
-# @FUNCTION: is-parent-package
-# @USAGE: < name >
-# @RETURN: 0 if <name> is a parent package, otherwise 1
-is-parent-package() {
- local parent child
- while read parent child; do
- [[ "${parent}" == "$1" ]] && return 0
- done <<EOF
-$KDE_DERIVATION_MAP
-EOF
- return 1
-}
-
-# ---------------------------------------------------------------
-# kde/qt directory management etc. functions, was kde-dirs.ebuild
-# ---------------------------------------------------------------
-
-# @FUNCTION: need-kde-at-least
-# @USAGE: < version >
-# @DESCRIPTION:
-# Sets the correct DEPEND and RDEPEND for the needed minimum kde < version >. Also takes
-# care of the correct Qt-version and correct RDEPEND handling.
-need-kde-at-least() {
- debug-print-function $FUNCNAME "$@"
-
- KDEVER="$1"
-
- # determine install locations
- set-kdedir ${KDEVER}
-
- if [[ "${RDEPEND-unset}" != "unset" ]]; then
- x_DEPEND="${RDEPEND}"
- else
- x_DEPEND="${DEPEND}"
- fi
-
- DEPEND="${DEPEND} >=kde-base/kdelibs-$KDEVER"
- RDEPEND="${x_DEPEND} >=kde-base/kdelibs-$KDEVER"
-
- qtver-from-kdever ${KDEVER}
- need-qt ${selected_version}
-
- if [[ -n "${KDEBASE}" ]]; then
- SLOT="$KDEMAJORVER.$KDEMINORVER"
- else
- : ${SLOT="0"}
- fi
-}
-
-# ---------------------------------------------------------------
-# kde/qt directory management etc. functions, was kde-dirs.ebuild
-# ---------------------------------------------------------------
-
-# @FUNCTION: need-kde
-# @USAGE: < version >
-# @DESCRIPTION:
-# Sets the correct DEPEND and RDEPEND for the needed kde < version >. Also takes
-# care of the correct Qt-version and correct RDEPEND handling.
-need-kde() {
- debug-print-function $FUNCNAME "$@"
-
- KDEVER="$1"
-
- # determine install locations
- set-kdedir ${KDEVER}
-
- if [[ "${RDEPEND-unset}" != "unset" ]]; then
- x_DEPEND="${RDEPEND}"
- else
- x_DEPEND="${DEPEND}"
- fi
- if [[ -n "${KDEBASE}" ]]; then
- # If we're a kde-base package, we need at least our own version of kdelibs.
- # Note: we only set RDEPEND if it is already set, otherwise
- # we break packages relying on portage copying RDEPEND from DEPEND.
- DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
- RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
- else
- # Things outside kde-base need a minimum version,
- # but kde-base/kdelibs:kde-4 mustn't satisfy it.
- min-kde-ver ${KDEVER}
- DEPEND="${DEPEND} =kde-base/kdelibs-3.5*"
- RDEPEND="${x_DEPEND} =kde-base/kdelibs-3.5*"
- fi
-
- qtver-from-kdever ${KDEVER}
- need-qt ${selected_version}
-
- if [[ -n "${KDEBASE}" ]]; then
- SLOT="$KDEMAJORVER.$KDEMINORVER"
- else
- : ${SLOT="0"}
- fi
-}
-
-# @FUNCTION: set-kdedir
-# @USAGE: < version >
-# @DESCRIPTION:
-# Sets the right directories for the kde <version> wrt what kind of package will
-# be installed, e. g. third-party-apps, kde-base-packages, ...
-set-kdedir() {
- debug-print-function $FUNCNAME "$@"
-
-
- # set install location:
- # - 3rd party apps go into /usr, and have SLOT="0".
- # - kde-base category ebuilds go into /usr/kde/$MAJORVER.$MINORVER,
- # and have SLOT="$MAJORVER.$MINORVER".
- # - kde-base category cvs ebuilds have major version 5 and go into
- # /usr/kde/cvs; they have SLOT="cvs".
- # - Backward-compatibility exceptions: all kde2 packages (kde-base or otherwise)
- # go into /usr/kde/2. kde 3.0.x goes into /usr/kde/3 (and not 3.0).
- # - kde-base category ebuilds always depend on their exact matching version of
- # kdelibs and link against it. Other ebuilds link aginst the latest one found.
- # - This function exports $PREFIX (location to install to) and $KDEDIR
- # (location of kdelibs to link against) for all ebuilds.
- #
- # -- Overrides - deprecated but working for now: --
- # - If $KDEPREFIX is defined (in the profile or env), it overrides everything
- # and both base and 3rd party kde stuff goes in there.
- # - If $KDELIBSDIR is defined, the kdelibs installed in that location will be
- # used, even by kde-base packages.
-
- # get version elements
- IFSBACKUP="$IFS"
- IFS=".-_"
- for x in $1; do
- if [[ -z "$KDEMAJORVER" ]]; then KDEMAJORVER=$x
- else if [[ -z "$KDEMINORVER" ]]; then KDEMINORVER=$x
- else if [[ -z "$KDEREVISION" ]]; then KDEREVISION=$x
- fi; fi; fi
- done
- [[ -z "$KDEMINORVER" ]] && KDEMINORVER="0"
- [[ -z "$KDEREVISION" ]] && KDEREVISION="0"
- IFS="$IFSBACKUP"
- debug-print "$FUNCNAME: version breakup: KDEMAJORVER=$KDEMAJORVER KDEMINORVER=$KDEMINORVER KDEREVISION=$KDEREVISION"
-
- # install prefix
- if [[ -n "$KDEPREFIX" ]]; then
- export PREFIX="$KDEPREFIX"
- else
- if [[ -z "$KDEBASE" ]]; then
- PREFIX="/usr/kde/3.5"
- else
- case $KDEMAJORVER.$KDEMINORVER in
- 3*) export PREFIX="/usr/kde/3.5";;
- 5.0) export PREFIX="/usr/kde/svn";;
- *) die "failed to set PREFIX";;
- esac
- fi
- fi
-
- # kdelibs location
- if [[ -n "$KDELIBSDIR" ]]; then
- export KDEDIR="$KDELIBSDIR"
- else
- if [[ -z "$KDEBASE" ]]; then
- # find the latest kdelibs installed
- for x in /usr/kde/{svn,3.5} "${PREFIX}" \
- "${KDE3LIBSDIR}" "${KDELIBSDIR}" "${KDE3DIR}" "${KDEDIR}" /usr/kde/*; do
- if [[ -f "${x}/include/kwin.h" ]]; then
- debug-print found
- export KDEDIR="$x"
- break
- fi
- done
- else
- # kde-base ebuilds must always use the exact version of kdelibs they came with
- case $KDEMAJORVER.$KDEMINORVER in
- 3*) export KDEDIR="/usr/kde/3.5";;
- 5.0) export KDEDIR="/usr/kde/svn";;
- *) die "failed to set KDEDIR";;
- esac
- fi
- fi
-
- debug-print "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX."
-}
-
-# @FUNCTION: need-qt
-# @USAGE: < version >
-# @DESCRIPTION:
-# Sets the DEPEND and RDEPEND for Qt <version>.
-need-qt() {
- debug-print-function $FUNCNAME "${@}"
-
- QTVER="$1"
-
- QT=qt
-
- if [[ "${RDEPEND-unset}" != "unset" ]]; then
- x_DEPEND="${RDEPEND}"
- else
- x_DEPEND="${DEPEND}"
- fi
-
- case ${QTVER} in
- 3*) DEPEND="${DEPEND} =dev-qt/qt-meta-3*"
- RDEPEND="${RDEPEND} =dev-qt/qt-meta-3*"
- ;;
- *) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
- esac
-
-}
-
-# @FUNCTION: set-qtdir
-# @DESCRIPTION:
-# This function is not needed anymore.
-set-qtdir() {
- :
-}
-
-# @FUNCTION: qtver-from-kdever
-# @USAGE: < kde-version >
-# @DESCRIPTION:
-# returns minimal qt version needed for specified kde version
-qtver-from-kdever() {
- debug-print-function $FUNCNAME "$@"
-
- local ver
-
- case $1 in
- 3.1*) ver=3.1;;
- 3.2*) ver=3.2;;
- 3.3*) ver=3.3;;
- 3.4*) ver=3.3;;
- 3.5*) ver=3.3;;
- 3*) ver=3.0.5;;
- 5) ver=3.3;; # cvs version
- *) echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;;
- esac
-
- selected_version="$ver"
-
-}
-
-min-kde-ver() {
- debug-print-function $FUNCNAME "$@"
-
- case $1 in
- 3.0*) selected_version="3.0";;
- 3.1*) selected_version="3.1";;
- 3.2*) selected_version="3.2";;
- 3.3*) selected_version="3.3";;
- 3.4*) selected_version="3.4";;
- 3.5*) selected_version="3.5";;
- 3*) selected_version="3.0";;
- 5) selected_version="5";;
- *) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;
- esac
-
-}
-
-# @FUNCTION: kde_sandbox_patch
-# @USAGE: < dir > [ dir ] [ dir ] [...]
-# @DESCRIPTION:
-# generic makefile sed for sandbox compatibility. for some reason when the kde makefiles (of many packages
-# and versions) try to chown root and chmod 4755 some binaries (after installing, target install-exec-local),
-# they do it to the files in $(bindir), not $(DESTDIR)/$(bindir). Most of these have been fixed in latest cvs
-# but a few remain here and there.
-#
-# Pass a list of dirs to sed, Makefile.{am,in} in these dirs will be sed'ed.
-# This should be harmless if the makefile doesn't need fixing.
-kde_sandbox_patch() {
- debug-print-function $FUNCNAME "$@"
-
- while [[ -n "$1" ]]; do
- # can't use dosed, because it only works for things in ${D}, not ${S}
- cd $1
- for x in Makefile.am Makefile.in Makefile
- do
- if [[ -f "$x" ]]; then
- echo Running sed on $x
- cp $x ${x}.orig
- sed -e 's: $(bindir): $(DESTDIR)/$(bindir):g' -e 's: $(kde_datadir): $(DESTDIR)/$(kde_datadir):g' -e 's: $(TIMID_DIR): $(DESTDIR)/$(TIMID_DIR):g' ${x}.orig > ${x}
- rm ${x}.orig
- fi
- done
- shift
- done
-
-}
-
-# @FUNCTION: kde_remove_flag
-# @USAGE: < dir > < flag >
-# @DESCRIPTION:
-# remove an optimization flag from a specific subdirectory's makefiles.
-# currently kdebase and koffice use it to compile certain subdirs without
-# -fomit-frame-pointer which breaks some things.
-kde_remove_flag() {
- debug-print-function $FUNCNAME "$@"
-
- cd "${S}"/${1} || die "cd to '${S}/${1}' failed."
- [[ -n "$2" ]] || die "missing argument to kde_remove_flag"
-
- cp Makefile Makefile.orig
- sed -e "/CFLAGS/ s/${2}//g
-/CXXFLAGS/ s/${2}//g" Makefile.orig > Makefile
-
- cd "${OLDPWD}"
-
-}
-
-buildsycoca() {
- [[ $EBUILD_PHASE != postinst ]] && [[ $EBUILD_PHASE != postrm ]] && \
- die "buildsycoca() has to be calles in pkg_postinst() and pkg_postrm()."
-
- if [[ -x ${KDEDIR}/bin/kbuildsycoca ]] && [[ -z ${ROOT} || ${ROOT} == "/" ]] ; then
- # First of all, make sure that the /usr/share/services directory exists
- # and it has the right permissions
- mkdir -p /usr/share/services
- chown root:0 /usr/share/services
- chmod 0755 /usr/share/services
-
- ebegin "Running kbuildsycoca to build global database"
- # Filter all KDEDIRs not belonging to the current SLOT from XDG_DATA_DIRS
- # before running kbuildsycoca. This makes sure they don't show up in the
- # 3.5 K-menu unless the user manually adds them.
- XDG_DATA_DIRS="/usr/share:${KDEDIR}/share:/usr/local/share"
- "${KDEDIR}"/bin/kbuildsycoca --global --noincremental &> /dev/null
- eend $?
- fi
-}
-
-postprocess_desktop_entries() {
- [[ $EBUILD_PHASE != preinst ]] && [[ $EBUILD_PHASE != install ]] && \
- die "postprocess_desktop_entries() has to be called in src_install() or pkg_preinst()."
-
- if [[ -d ${D}${PREFIX}/share/applnk ]] ; then
- # min/max depth is _important_ as it excludes legacy KDE stuff. Moving it would cause breakage.
- local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \
- -name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)"
-
- if [[ -n ${desktop_entries} ]]; then
- for entry in ${desktop_entries} ; do
- if ! [[ -f "${D}${PREFIX}"/share/applications/kde/${entry##*/} ]] ; then
- dodir "${PREFIX}"/share/applications/kde
- mv ${entry} "${D}${PREFIX}"/share/applications/kde
- fi
- done
- fi
- fi
-
- validate_desktop_entries "${PREFIX}"/share/applications
-}
-
-# is this a kde-base ebuid?
-if [[ "${CATEGORY}" == "kde-base" ]]; then
- debug-print "${ECLASS}: KDEBASE ebuild recognized"
- export KDEBASE="true"
- export KDEREVISION
-fi
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
deleted file mode 100644
index b85a9bb8..00000000
--- a/eclass/kde.eclass
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.223 2009/05/12 12:55:46 tampakrap Exp $
-
-# @ECLASS: kde.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-#
-# original author Dan Armak <danarmak@gentoo.org>
-#
-# Revisions Caleb Tennis <caleb@gentoo.org>
-# @BLURB: The kde eclass is inherited by all kde-* eclasses.
-# @DESCRIPTION:
-# This eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
-
-[[ -z ${WANT_AUTOMAKE} ]] && WANT_AUTOMAKE="1.9"
-
-inherit base eutils kde-functions flag-o-matic libtool autotools
-
-DESCRIPTION="Based on the $ECLASS eclass"
-HOMEPAGE="http://www.kde.org/"
-IUSE="debug elibc_FreeBSD"
-
-
-if [[ ${CATEGORY} == "kde-base" ]]; then
- if [[ ${PV##*.} -lt 10 ]] ; then
- # Keep old ebuilds as is
- IUSE="${IUSE} kdeenablefinal"
- else
- # Don't use --enable-final anymore. Does only cause problems for users and
- # as an unwelcome extra invalid bug reports, without any reasonable benefit.
-
- # Get the aRts dependencies right - finally.
- case "${PN}" in
- blinken|juk|kalarm|kanagram|kbounce|kcontrol|konq-plugins|kscd|kscreensaver|kttsd|kwifimanager|kdelibs) ARTS_REQUIRED="" ;;
- artsplugin-*|kaboodle|kasteroids|kdemultimedia-arts|kolf|krec|ksayit|noatun*) ARTS_REQUIRED="yes" ;;
- *) ARTS_REQUIRED="never" ;;
- esac
- fi
-fi
-
-if [[ ${ARTS_REQUIRED} != "yes" && ${ARTS_REQUIRED} != "never" && ${PN} != "arts" ]]; then
- IUSE="${IUSE} arts"
-fi
-
-# @ECLASS-VARIABLE: KDE_S
-# @DESCRIPTION:
-# Like the 'normal' ${S} this variable takes the path to the temporary build
-# directory. If unset ${S} will be used.
-
-# @ECLASS-VARIABLE: USE_KEG_PACKAGING
-# @DESCRIPTION:
-# Set USE_KEG_PACKAGING=1 before inheriting if the package use extragear-like
-# packaging and then supports ${LANGS} and ${LANGS_DOC} variables. By default
-# translations are found in the po subdirectory of ${S}. Set KEG_PO_DIR to
-# override this default.
-if [[ -n ${USE_KEG_PACKAGING} && -n "${LANGS}${LANGS_DOC}" ]]; then
- for lang in ${LANGS} ${LANGS_DOC}; do
- IUSE="${IUSE} linguas_${lang}"
- done
-fi
-
-DEPEND="sys-devel/make
- dev-util/pkgconfig
- dev-lang/perl"
-
-if [[ ${CATEGORY} != "kde-base" ]] || [[ ${CATEGORY} == "kde-base" && ${PV##*.} -lt 10 ]] ; then
- DEPEND="${DEPEND}
- x11-libs/libXt
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )"
- RDEPEND="xinerama? ( x11-libs/libXinerama )"
- IUSE="${IUSE} xinerama"
-else
- RDEPEND=""
-fi
-
-if [[ ${ARTS_REQUIRED} == "yes" ]]; then
- DEPEND="${DEPEND} kde-base/arts"
- RDEPEND="${RDEPEND} kde-base/arts"
-elif [[ ${ARTS_REQUIRED} != "never" && ${PN} != "arts" ]]; then
- DEPEND="${DEPEND} arts? ( kde-base/arts )"
- RDEPEND="${RDEPEND} arts? ( kde-base/arts )"
-fi
-
-# overridden in other places like kde-dist, kde-source and some individual ebuilds
-SLOT="0"
-
-# @ECLASS-VARIABLE: ARTS_REQUIRED
-# @DESCRIPTION:
-# Is aRTs-support required or not? Possible values are 'yes', 'never'. Otherwise
-# leave this variable unset. This results in an arts USE flag.
-
-# @FUNCTION: kde_pkg_setup
-# @DESCRIPTION:
-# Some basic test about arts-support. It also filters some compiler flags
-kde_pkg_setup() {
- if [[ ${PN} != "arts" ]] && [[ ${PN} != "kdelibs" ]] ; then
- if [[ ${ARTS_REQUIRED} == 'yes' ]] || \
- ( [[ ${ARTS_REQUIRED} != "never" ]] && use arts ) ; then
- if ! built_with_use =kde-base/kdelibs-3.5* arts ; then
- if has arts ${IUSE} && use arts; then
- eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled."
- else
- eerror "The package ${CATEGORY}/${PF} you're trying to merge requires aRTs."
- fi
- eerror "However, $(best_version =kde-base/kdelibs-3.5*) was compiled with the arts USE flag disabled."
- eerror
- if has arts ${IUSE} && use arts; then
- eerror "You must either disable this USE flag, or recompile"
- else
- eerror "To build this package you have to recompile"
- fi
- eerror "$(best_version =kde-base/kdelibs-3.5*) with the arts USE flag enabled."
- die "kdelibs missing arts"
- fi
- fi
- fi
-
- if [[ "${PN}" = "kdelibs" ]]; then
- use doc && if ! built_with_use =dev-qt/qt-meta-3* doc ; then
- eerror "Building kdelibs with the doc USE flag requires qt to be built with the doc USE flag."
- eerror "Please re-emerge qt-3 with this USE flag enabled."
- fi
- fi
-
- # Let filter visibility flags that will *really* hurt your KDE
- # _experimental_ support for this is enabled by kdehiddenvisibility useflag
- filter-flags -fvisibility=hidden -fvisibility-inlines-hidden
-}
-
-# @FUNCTION: kde_src_unpack
-# @DESCRIPTION:
-# This function unpacks the sources.
-# For EAPI 0 and 1 it allso runs kde_src_prepare.
-kde_src_unpack() {
- debug-print-function $FUNCNAME "$@"
- [[ -z "$*" ]] || die "$FUNCNAME no longer supports stages."
- [[ -z "${KDE_S}" ]] && KDE_S="${S}"
- # Don't use base_src_unpack, as that will call base_src_prepare
- # in the wrong place
- [[ -d "${KDE_S}" ]] || unpack ${A}
- case ${EAPI:-0} in
- 0|1) kde_src_prepare ;;
- esac
-}
-
-# @FUNCTION: kde_src_prepare
-# @DESCRIPTION:
-# This function patches the sources. The patches need to be named
-# $PN-$PV-*{diff,patch}
-#
-# This function also handles the linguas if extragear-like packaging is enabled.
-# (See USE_KEG_PACKAGING)
-kde_src_prepare() {
- debug-print-function $FUNCNAME "$@"
- local PATCHDIR="${WORKDIR}/patches/"
-
- # Unpack first and deal with KDE patches after examing possible patch sets.
- # To be picked up, patches need to be named $PN-$PV-*{diff,patch} and be
- # placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches.
- if [[ -d "${PATCHDIR}" ]] ; then
- local packages p f
- if is-parent-package ${CATEGORY}/${PN} ; then
- packages="$(get-child-packages ${CATEGORY}/${PN})"
- packages="${packages//${CATEGORY}\//} ${PN}"
- else
- packages="${PN}"
- fi
- if [[ -n ${PATCHES[@]} && $(declare -p PATCHES) != 'declare -a '* ]]; then
- PATCHES=(${PATCHES})
- fi
- for p in ${packages}; do
- for f in "${PATCHDIR}"/${p}-${PV}-*{diff,patch}; do
- [[ -e ${f} ]] && PATCHES+=("${f}")
- done
- if [[ -n "${KDEBASE}" ]]; then
- for f in "${PATCHDIR}"/${p}-${SLOT}-*{diff,patch}; do
- [[ -e ${f} ]] && PATCHES+=("${f}")
- done
- fi
- done
- fi
-
- base_src_prepare
-
- # if extragear-like packaging is enabled, set the translations and the
- # documentation depending on LINGUAS settings
- if [[ -n ${USE_KEG_PACKAGING} ]]; then
- if [[ -z ${LINGUAS} ]]; then
- einfo "You can drop some of the translations of the interface and"
- einfo "documentation by setting the \${LINGUAS} variable to the"
- einfo "languages you want installed."
- einfo
- einfo "Enabling all languages"
- else
- # we sanitise LINGUAS to avoid issues when a user specifies the same
- # linguas twice. bug #215016.
- local sanitised_linguas=$(echo "${LINGUAS}" | tr '[[:space:]]' '\n' | sort | uniq)
- if [[ -n ${LANGS} ]]; then
- MAKE_PO=$(echo "${sanitised_linguas} ${LANGS}" | tr '[[:space:]]' '\n' | sort | uniq -d | tr '\n' ' ')
- einfo "Enabling translations for: ${MAKE_PO}"
- sed -i -e "s:^SUBDIRS[ \t]*=.*:SUBDIRS = ${MAKE_PO}:" "${KDE_S}/${KEG_PO_DIR:-po}/Makefile.am" \
- || die "sed for locale failed"
- rm -f "${KDE_S}/configure"
- fi
-
- if [[ -n ${LANGS_DOC} ]]; then
- MAKE_DOC=$(echo "${sanitised_linguas} ${LANGS_DOC}" | tr '[[:space:]]' '\n' | sort | uniq -d | tr '\n' ' ')
- einfo "Enabling documentation for: ${MAKE_DOC}"
- [[ -n ${MAKE_DOC} ]] && [[ -n ${DOC_DIR_SUFFIX} ]] && MAKE_DOC=$(echo "${MAKE_DOC}" | tr '\n' ' ') && MAKE_DOC="${MAKE_DOC// /${DOC_DIR_SUFFIX} }"
- sed -i -e "s:^SUBDIRS[ \t]*=.*:SUBDIRS = ${MAKE_DOC} ${PN}:" \
- "${KDE_S}/doc/Makefile.am" || die "sed for locale failed"
- rm -f "${KDE_S}/configure"
- fi
- fi
- fi
-
- # fix the 'languageChange undeclared' bug group: touch all .ui files, so that the
- # makefile regenerate any .cpp and .h files depending on them.
- cd "${KDE_S}"
- debug-print "$FUNCNAME: Searching for .ui files in ${PWD}"
- UIFILES="$(find . -name '*.ui' -print)"
- debug-print "$FUNCNAME: .ui files found:"
- debug-print "$UIFILES"
- # done in two stages, because touch doens't have a silent/force mode
- if [[ -n "$UIFILES" ]]; then
- debug-print "$FUNCNAME: touching .ui files..."
- touch $UIFILES
- fi
-
- if [[ -d "${WORKDIR}/admin" ]] && [[ -d "${KDE_S}/admin" ]]; then
- ebegin "Updating admin/ directory..."
- rm -rf "${KDE_S}/admin" "${KDE_S}/configure" || die "Unable to remove old admin/ directory"
- ln -s "${WORKDIR}/admin" "${KDE_S}/admin" || die "Unable to symlink the new admin/ directory"
- eend 0
- fi
-}
-
-# @FUNCTION: kde_src_configure
-# @USAGE: [ myconf ] [ configure ] [ all ]
-# @DESCRIPTION:
-# This function compiles the sources. It takes care of "cannot write to .kde
-# or .qt"-problem due to sandbox and some other sandbox issues.
-#
-# If no argument is given, all is assumed.
-kde_src_configure() {
- debug-print-function $FUNCNAME "$@"
-
- [[ -z "$1" ]] && kde_src_configure all
-
- [[ -z "${KDE_S}" ]] && KDE_S="${S}"
- cd "${KDE_S}"
-
- export kde_widgetdir="$KDEDIR/$(get_libdir)/kde3/plugins/designer"
-
- # fix the sandbox errors "can't writ to .kde or .qt" problems.
- # this is a fake homedir that is writeable under the sandbox, so that the build process
- # can do anything it wants with it.
- REALHOME="$HOME"
- mkdir -p "${T}"/fakehome/.kde
- mkdir -p "${T}"/fakehome/.qt
- export HOME="${T}"/fakehome
- addwrite "${QTDIR}/etc/settings"
-
- # Fix bug 96177: if KDEROOTHOME is defined, the ebuild accesses the real homedir via it, and not our exported $HOME
- unset KDEHOME
- unset KDEROOTHOME
-
- # things that should access the real homedir
- [[ -d "$REALHOME/.ccache" ]] && ln -sf "$REALHOME/.ccache" "$HOME/"
-
- while [[ "$1" ]]; do
-
- case $1 in
- myconf)
- debug-print-section myconf
- if [[ ${CATEGORY} != "kde-base" ]] || [[ ${CATEGORY} == "kde-base" && ${PV##*.} -lt 10 ]] ; then
- myconf+=" --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)"
- else
- myconf+=" --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)"
- fi
- # calculate dependencies separately from compiling, enables ccache to work on kde compiles
- myconf="$myconf --disable-dependency-tracking"
- if use debug ; then
- myconf="$myconf --enable-debug=full --with-debug"
- else
- myconf="$myconf --disable-debug --without-debug"
- fi
- if hasq kdeenablefinal ${IUSE}; then
- myconf="$myconf $(use_enable kdeenablefinal final)"
- fi
- if [[ ${ARTS_REQUIRED} == "never" ]]; then
- myconf="$myconf --without-arts"
- elif [[ ${ARTS_REQUIRED} != 'yes' && ${PN} != "arts" ]]; then
- # This might break some external package until
- # ARTS_REQUIRED="yes" is set on them, KDE 3.2 is no more
- # supported anyway.
- myconf="$myconf $(use_with arts)"
- fi
- debug-print "$FUNCNAME: myconf: set to ${myconf}"
- ;;
- configure)
- debug-print-section configure
- debug-print "$FUNCNAME::configure: myconf=$myconf"
-
- export WANT_AUTOMAKE
-
- # rebuild configure script, etc
- # This can happen with e.g. a cvs snapshot
- if [[ ! -f "./configure" ]]; then
- # This is needed to fix building with autoconf 2.60.
- # Many thanks to who preferred such a stupid check rather
- # than a working arithmetic comparison.
- if [[ -f admin/cvs.sh ]]; then
- sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
- admin/cvs.sh
- fi
-
- # Replace the detection script with a dummy, let our wrappers do the work
- if [[ -f admin/detect-autoconf.sh ]]; then
- cat - > admin/detect-autoconf.sh <<EOF
-#!/bin/sh
-export AUTOCONF="autoconf"
-export AUTOHEADER="autoheader"
-export AUTOM4TE="autom4te"
-export AUTOMAKE="automake"
-export ACLOCAL="aclocal"
-export WHICH="which"
-EOF
- fi
-
- # Make build succeed with >=autoconf-2.65, see http://tinyurl.com/yc4nbhq
- if [[ -f admin/acinclude.m4.in ]] && \
- [[ ! -f ${T}/acinclude.m4.in ]]; then
- cp admin/acinclude.m4.in "${T}"
- einfo "Patching admin/acinclude.m4.in"
- patch -f --ignore-whitespace admin/acinclude.m4.in <<'EOF'
---- admin/acinclude.m4.in
-+++ admin/acinclude.m4.in
-@@ -3081,6 +3081,13 @@
- fi
- ])
-
-+AC_DEFUN([GENTOO_DUMMY_CFLAGS],
-+[
-+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+ CFLAGS=" $CFLAGS"
-+])
-+AC_BEFORE([GENTOO_DUMMY_CFLAGS],[AC_PROG_CC])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
- AC_ARG_ENABLE(debug,
-@@ -3141,12 +3148,10 @@
- [kde_use_profiling="no"]
- )
-
-- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-- CFLAGS=" $CFLAGS"
--
-- AC_PROG_CC
-+ AC_REQUIRE([GENTOO_DUMMY_CFLAGS])
-+ AC_REQUIRE([AC_PROG_CC])
-
-- AC_PROG_CPP
-+ AC_REQUIRE([AC_PROG_CPP])
-
- if test "$GCC" = "yes"; then
- if test "$kde_use_debug_code" != "no"; then
-@@ -3176,7 +3181,7 @@
-
- CXXFLAGS=" $CXXFLAGS"
-
-- AC_PROG_CXX
-+ AC_REQUIRE([AC_PROG_CXX])
-
- KDE_CHECK_FOR_BAD_COMPILER
-
-EOF
- if [[ $? != 0 ]]; then
- ewarn "Failed to patch admin/acinclude.m4.in"
- cp "${T}/acinclude.m4.in" admin/acinclude.m4.in
- fi
- fi
- for x in Makefile.cvs admin/Makefile.common; do
- if [[ -f "$x" && -z "$makefile" ]]; then makefile="$x"; fi
- done
- if [[ -f "$makefile" ]]; then
- debug-print "$FUNCNAME: configure: generating configure script, running make -f $makefile"
- emake -f $makefile
- fi
- [[ -f "./configure" ]] || die "no configure script found, generation unsuccessful"
- fi
-
- export PATH="${KDEDIR}/bin:${PATH}"
-
- # configure doesn't need to know about the other KDEs installed.
- # in fact, if it does, it sometimes tries to use the wrong dcopidl, etc.
- # due to the messed up way configure searches for things
- export KDEDIRS="${PREFIX}:${KDEDIR}"
-
- # Visiblity stuff is broken. Just disable it when it's present.
- export kde_cv_prog_cxx_fvisibility_hidden=no
-
- if hasq kdehiddenvisibility ${IUSE} && use kdehiddenvisibility; then
- if [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]]; then
- if [[ ${PN} != "kdelibs" && ${PN} != "arts" ]] && \
- ! fgrep -q "#define __KDE_HAVE_GCC_VISIBILITY" "${KDEDIR}/include/kdemacros.h"; then
-
- eerror "You asked to enable hidden visibility, but your kdelibs was"
- eerror "built without its support. Please rebuild kdelibs with the"
- eerror "kdehiddenvisibility useflag enabled."
- die "kdelibs without hidden visibility"
- else
- unset kde_cv_prog_cxx_fvisibility_hidden
- myconf="$myconf $(use_enable kdehiddenvisibility gcc-hidden-visibility)"
- fi
- else
- eerror "You're trying to enable hidden visibility, but"
- eerror "you are using an old GCC version. Hidden visibility"
- eerror "can be enabled only with GCC 4.1 and later."
- fi
- fi
-
- # If we're in a kde-base ebuild, set the prefixed directories to
- # override the ones set by econf.
- if [[ -n ${PREFIX} && ${PREFIX} != "/usr" ]]; then
- myconf="${myconf} --prefix=${PREFIX}
- --mandir=${PREFIX}/share/man
- --infodir=${PREFIX}/share/info
- --datadir=${PREFIX}/share
- --sysconfdir=${PREFIX}/etc"
- fi
-
- # Use libsuffix to keep KDE happy, the --libdir parameter get
- # still honored.
- if [[ $(get_libdir) != "lib" ]] ; then
- myconf="${myconf} --enable-libsuffix=$(get_libdir | sed s/lib//)"
- fi
-
- export PATH="${KDEDIR}/bin:${PATH}"
-
- # The configure checks for kconfig_compiler do not respect PATH
- export KCONFIG_COMPILER="${KDEDIR}/bin/kconfig_compiler"
-
- # Sometimes it doesn't get the include and library paths right,
- # so hints them.
- if [[ -z ${PREFIX} || ${PREFIX} != ${KDEDIR} ]]; then
- myconf="${myconf} --with-extra-includes=${KDEDIR}/include
- --with-extra-libs=${KDEDIR}/$(get_libdir)"
- fi
-
- if grep "cope with newer libtools" "${KDE_S}/admin/ltconfig" &> /dev/null; then
- einfo "Removing the dummy ltconfig file."
- rm "${KDE_S}/admin/ltconfig"
- fi
-
- use elibc_FreeBSD && myconf="${myconf} --disable-pie"
-
- elibtoolize
- econf ${myconf}
-
- # Seems ./configure add -O2 by default but hppa don't want that but we need -ffunction-sections
- if [[ "${ARCH}" = "hppa" ]]
- then
- einfo "Fixing Makefiles"
- find "${KDE_S}" -name Makefile -print0 | xargs -0 sed -i -e \
- 's:-O2:-ffunction-sections:g'
- fi
- ;;
- all)
- debug-print-section all
- kde_src_configure myconf configure
- ;;
- esac
-
- shift
- done
-
-}
-# @FUNCTION: kde_src_compile
-# @USAGE: [ myconf ] [ configure ] [ make ] [ all ]
-# @DESCRIPTION:
-# This function compiles the sources. It takes care of "cannot write to .kde
-# or .qt"-problem due to sandbox and some other sandbox issues.
-#
-# If no argument is given, all is assumed.
-kde_src_compile() {
- debug-print-function $FUNCNAME "$@"
-
- [[ -z "$1" ]] && kde_src_compile all
-
- [[ -z "${KDE_S}" ]] && KDE_S="${S}"
- cd "${KDE_S}"
- while [[ "$1" ]]; do
- case $1 in
- make)
- debug-print-section make
- emake || die "died running emake, $FUNCNAME:make"
- ;;
- all)
- case ${EAPI:-0} in
- 0|1) kde_src_configure all ;;
- esac
- kde_src_compile make
- ;;
- *)
- case ${EAPI:-0} in
- 0|1) kde_src_configure $1 ;;
- esac
- ;;
- esac
-
- shift
- done
-}
-
-# @FUNCTION: kde_src_install
-# @USAGE: [ make ] [ dodoc ] [ all ]
-# @DESCRIPTION:
-# This installs the software, including the right handling of the
-# "/usr/share/doc/kde"-dir, but it only installs AUTHORS, ChangeLog*, README*,
-# NEWS, and TODO (if available) as docs.
-#
-# If no argument is given, all is assumed
-kde_src_install() {
- debug-print-function $FUNCNAME "$@"
-
- [[ -z "$1" ]] && kde_src_install all
-
- [[ -z ${KDE_S} ]] && KDE_S="${S}"
- cd "${KDE_S}"
-
- # Ensure that KDE binaries take precedence
- export PATH="${KDEDIR}/bin:${PATH}"
-
- while [[ "$1" ]]; do
-
- case $1 in
- make)
- debug-print-section make
- emake install DESTDIR="${D}" destdir="${D}" || die "died running make install, $FUNCNAME:make"
- ;;
- dodoc)
- debug-print-section dodoc
- for doc in AUTHORS ChangeLog* README* NEWS TODO; do
- [[ -s "$doc" ]] && dodoc $doc
- done
- ;;
- all)
- debug-print-section all
- kde_src_install make dodoc
- ;;
- esac
-
- shift
- done
-
- if [[ -n ${KDEBASE} && "${PN}" != "arts" && -d "${D}"/usr/share/doc/${PF} ]]; then
- # work around bug #97196
- dodir /usr/share/doc/kde && \
- mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ || \
- die "Failed to move docs to kde/ failed."
- fi
-}
-
-# @FUNCTION: slot_rebuild
-# @USAGE: [ list_of_packages_to_check ]
-# @RETURN: False, if no rebuild is required
-# @DESCRIPTION:
-# Unneeded and therefore deprecated for a long, long time now. Ebuilds are still
-# referencing it, so replacing with a stub.
-# Looks for packages in the supplied list of packages which have not been linked
-# against this kde SLOT. It does this by looking for lib*.la files that doesn't
-# contain the current ${KDEDIR}. If it finds any thus broken packages it prints
-# eerrors and return True.
-#
-# Thanks to Carsten Lohrke in bug 98425.
-slot_rebuild() {
- :
-}
-
-# @FUNCTION: kde_pkg_preinst
-# @DESCRIPTION:
-# Calls postprocess_desktop_entries
-kde_pkg_preinst() {
- postprocess_desktop_entries
-}
-
-# @FUNCTION: kde_pkg_postinst
-# @DESCRIPTION:
-# Calls buildsycoca
-kde_pkg_postinst() {
- buildsycoca
-}
-
-# @FUNCTION: kde_pkg_postrm
-# @DESCRIPTION:
-# Calls buildsycoca
-kde_pkg_postrm() {
- buildsycoca
-}
-
-case ${EAPI:-0} in
- 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_preinst;;
- 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postinst pkg_postrm pkg_preinst;;
-esac
diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass
deleted file mode 100644
index f24091e7..00000000
--- a/eclass/qt3.eclass
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2005-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.41 2009/05/17 15:17:03 hwoarang Exp $
-
-# @ECLASS: qt3.eclass
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @BLURB: Eclass for Qt3 packages
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful
-# when dealing with packages using Qt3 libraries.
-
-inherit toolchain-funcs versionator eutils
-
-if [[ -z "${QTDIR}" ]]; then
- export QTDIR="/usr/qt/3"
-fi
-
-addwrite "${QTDIR}/etc/settings"
-addpredict "${QTDIR}/etc/settings"
-
-# @FUNCTION: eqmake3
-# @USAGE: [.pro file] [additional parameters to qmake]
-# @MAINTAINER:
-# Przemyslaw Maciag <troll@gentoo.org>
-# Davide Pesavento <davidepesa@gmail.com>
-# @DESCRIPTION:
-# Runs qmake on the specified .pro file (defaults to
-# ${PN}.pro if eqmake3 was called with no argument).
-# Additional parameters are passed unmodified to qmake.
-eqmake3() {
- local LOGFILE="${T}/qmake-$$.out"
- local projprofile="${1}"
- [[ -z ${projprofile} ]] && projprofile="${PN}.pro"
- shift 1
-
- ebegin "Processing qmake ${projprofile}"
-
- # file exists?
- if [[ ! -f ${projprofile} ]]; then
- echo
- eerror "Project .pro file \"${projprofile}\" does not exist"
- eerror "qmake cannot handle non-existing .pro files"
- echo
- eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
- echo
- die "Project file not found in ${PN} sources"
- fi
-
- echo >> ${LOGFILE}
- echo "****** qmake ${projprofile} ******" >> ${LOGFILE}
- echo >> ${LOGFILE}
-
- # some standard config options
- local configoptplus="CONFIG += no_fixpath"
- local configoptminus="CONFIG -="
- if has debug ${IUSE} && use debug; then
- configoptplus="${configoptplus} debug"
- configoptminus="${configoptminus} release"
- else
- configoptplus="${configoptplus} release"
- configoptminus="${configoptminus} debug"
- fi
-
- ${QTDIR}/bin/qmake ${projprofile} \
- QTDIR=${QTDIR} \
- QMAKE=${QTDIR}/bin/qmake \
- QMAKE_CC=$(tc-getCC) \
- QMAKE_CXX=$(tc-getCXX) \
- QMAKE_LINK=$(tc-getCXX) \
- QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
- QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
- QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
- QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
- QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
- QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
- "${configoptminus}" \
- "${configoptplus}" \
- QMAKE_RPATH= \
- QMAKE_STRIP= \
- ${@} >> ${LOGFILE} 2>&1
-
- local result=$?
- eend ${result}
-
- # was qmake successful?
- if [[ ${result} -ne 0 ]]; then
- echo
- eerror "Running qmake on \"${projprofile}\" has failed"
- echo
- eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
- echo
- die "qmake failed on ${projprofile}"
- fi
-
- return ${result}
-}
diff --git a/eclass/trinity-base.eclass b/eclass/trinity-base.eclass
index 52b1c399..ff116ba9 100644
--- a/eclass/trinity-base.eclass
+++ b/eclass/trinity-base.eclass
@@ -7,6 +7,7 @@
# Purpose: support planty of ebuilds for trinity project (a kde3 fork).
#
+RESTRICT=network-sandbox
inherit trinity-functions cmake-utils base
# FIXME we don't need to write to both
@@ -125,7 +126,7 @@ if [[ ${BUILD_TYPE} = live ]]; then
#set some varyables
case ${TRINITY_SCM} in
git)
- EGIT_REPO_URI="${TRINITY_GIT_MIRROR:=http://scm.trinitydesktop.org/scm/git}/${TRINITY_MODULE_NAME}"
+ EGIT_REPO_URI="${TRINITY_GIT_MIRROR:=https://mirror.git.trinitydesktop.org/gitea/TDE}/${TRINITY_MODULE_NAME}"
EGIT_BRANCH="${TRINITY_GIT_BRANCH:=master}"
EGIT_PROJECT="trinity/${TRINITY_MODULE_NAME}"
EGIT_HAS_SUBMODULES="yes"
diff --git a/eclass/trinity-shared-files/kdetoys-3.5.13.1/patches/add-initial-cmake-support.patch.bz2 b/eclass/trinity-shared-files/kdetoys-3.5.13.1/patches/add-initial-cmake-support.patch.bz2
deleted file mode 100644
index 00ab641c..00000000
--- a/eclass/trinity-shared-files/kdetoys-3.5.13.1/patches/add-initial-cmake-support.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/eclass/trinity-shared-files/kdeutils-3.5.13.1/patches/add-initial-cmake-support-1.patch.bz2 b/eclass/trinity-shared-files/kdeutils-3.5.13.1/patches/add-initial-cmake-support-1.patch.bz2
deleted file mode 100644
index e48e0921..00000000
--- a/eclass/trinity-shared-files/kdeutils-3.5.13.1/patches/add-initial-cmake-support-1.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
deleted file mode 100644
index df67858a..00000000
--- a/net-irc/konversation/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX konversation-3.5.13.1-initial-cmake.patch 37503 SHA256 069bf79e9163564ac2a13ce9b15e9d04a9d59df6cffae43df8cc2a59e241167f SHA512 50461488d835ebe9ab6ce50e48999b5ac47a5ababe845fb8ee30026965335685c4e90a57a5e3f92927fcad295ceae1923e4a89e170c33881d89d363b0e64b368 WHIRLPOOL 2e89a43fe42e78ddd32149fe42a9456d2c050e7a5cbfe63652d7c9d3b3aa22dbe7499cfe7cae62d60081303699ca4710aa8b18175cb24ace6a4bbf2a1cf8a1e1
-DIST konversation-3.5.13.1.tar.gz 6113646 SHA256 039f40d85356014fd2485532c62e8b8d51721f23ea242999721f53cc9d93ab6d SHA512 39f47283d12c3ba58c5980fc167803048b16018635af5667935b1791c5499373af46b7c21ca2167eb486ce39e9e19e675f3ec29e4badbbd8658091988ab59875 WHIRLPOOL c4c09be3921744d60329b4035aa6467cc34361fc424237e02e69d0eb6ee45792b5922892d97337f6d70f7b1e27df17bb41fa2f94bba119fc7ea05d7cb1f8aa0c
diff --git a/net-irc/konversation/files/konversation-3.5.13.1-initial-cmake.patch b/net-irc/konversation/files/konversation-3.5.13.1-initial-cmake.patch
deleted file mode 100644
index 9e280922..00000000
--- a/net-irc/konversation/files/konversation-3.5.13.1-initial-cmake.patch
+++ /dev/null
@@ -1,1413 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..4f8da3f
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,84 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+cmake_minimum_required( VERSION 2.8 )
-+
-+
-+##### general package setup #####################
-+
-+project( konversation )
-+
-+
-+##### include essential cmake modules ###########
-+
-+include( FindPkgConfig )
-+include( CheckIncludeFile )
-+include( CheckLibraryExists )
-+# @Add othere required cmake modules here@
-+#
-+# EXAMPLE:
-+# include( CheckTypeSize )
-+# include( CheckCSourceCompiles )
-+include( CheckCXXSourceCompiles )
-+
-+
-+##### include our cmake modules #################
-+
-+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
-+include( TDEMacros )
-+
-+
-+##### setup install paths #######################
-+
-+include( TDESetupPaths )
-+tde_setup_paths( )
-+
-+
-+##### optional stuff ############################
-+
-+option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
-+# set WITH_XSCREENSAVER to use XScreensaver for auto-away feature
-+
-+
-+##### user requested modules ####################
-+
-+option( BUILD_ALL "Build all" OFF )
-+option( BUILD_KONVERSATION "Build konversation" ${BUILD_ALL} )
-+option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
-+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
-+
-+
-+##### configure checks ##########################
-+
-+include( ConfigureChecks.cmake )
-+
-+
-+###### global compiler settings #################
-+
-+add_definitions(
-+ -DHAVE_CONFIG_H
-+)
-+
-+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
-+set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-+set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-+
-+
-+##### konversation directories ##################
-+
-+tde_conditional_add_subdirectory( BUILD_KONVERSATION konversation )
-+tde_conditional_add_subdirectory( BUILD_DOC doc )
-+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
-+
-+
-+##### write configure files #####################
-+
-+configure_file( config.h.cmake config.h @ONLY )
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-new file mode 100644
-index 0000000..df74bc5
---- /dev/null
-+++ b/ConfigureChecks.cmake
-@@ -0,0 +1,53 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+##### check for gcc visibility support #########
-+# FIXME
-+# This should check for [T]Qt3 visibility support
-+
-+if( WITH_GCC_VISIBILITY )
-+ if( NOT UNIX )
-+ tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
-+ endif( NOT UNIX )
-+ set( __KDE_HAVE_GCC_VISIBILITY 1 )
-+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-+endif( WITH_GCC_VISIBILITY )
-+
-+
-+tde_setup_architecture_flags( )
-+
-+# XScreenSaver
-+if( BUILD_KONVERSATION AND WITH_XSCREENSAVER )
-+ pkg_search_module( XSCREENSAVER xscrnsaver )
-+ if( XSCREENSAVER_FOUND )
-+ set( HAVE_XSCREENSAVER 1 )
-+ else( XSCREENSAVER_FOUND )
-+ tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
-+ endif( )
-+endif( BUILD_KONVERSATION AND WITH_XSCREENSAVER )
-+
-+# gettext
-+if( BUILD_TRANSLATIONS )
-+ include( FindGettext )
-+ if( GETTEXT_FOUND )
-+ set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE}
-+ CACHE FILEPATH "path to msgfmt executable" )
-+ endif( GETTEXT_FOUND )
-+
-+ if( NOT MSGFMT_EXECUTABLE )
-+ tde_message_fatal( "msgfmt is required but was not found on your system." )
-+ endif( NOT MSGFMT_EXECUTABLE )
-+endif( BUILD_TRANSLATIONS )
-+
-+# required stuff
-+find_package( TQt )
-+find_package( TDE )
-diff --git a/config.h.cmake b/config.h.cmake
-new file mode 100644
-index 0000000..9fed7f2
---- /dev/null
-+++ b/config.h.cmake
-@@ -0,0 +1,9 @@
-+#cmakedefine VERSION "@VERSION@"
-+
-+#cmakedefine HAVE_XSCREENSAVER
-+
-+// FIXME: add KONVI_VERSION define
-+
-+// Sane configuration options for modern KDE
-+#define USE_KNOTIFY
-+#define USE_INFOLIST
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-new file mode 100644
-index 0000000..dc6bb77
---- /dev/null
-+++ b/doc/CMakeLists.txt
-@@ -0,0 +1,12 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_auto_add_subdirectories( )
-diff --git a/doc/da/CMakeLists.txt b/doc/da/CMakeLists.txt
-new file mode 100644
-index 0000000..f4d15d6
---- /dev/null
-+++ b/doc/da/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG da
-+)
-+
-diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt
-new file mode 100644
-index 0000000..2d0902b
---- /dev/null
-+++ b/doc/es/CMakeLists.txt
-@@ -0,0 +1,10 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-diff --git a/doc/et/CMakeLists.txt b/doc/et/CMakeLists.txt
-new file mode 100644
-index 0000000..9089f26
---- /dev/null
-+++ b/doc/et/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG et
-+)
-+
-diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt
-new file mode 100644
-index 0000000..97d745e
---- /dev/null
-+++ b/doc/it/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG it
-+)
-+
-diff --git a/doc/konversation/CMakeLists.txt b/doc/konversation/CMakeLists.txt
-new file mode 100644
-index 0000000..f85e562
---- /dev/null
-+++ b/doc/konversation/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook( DESTINATION konversation )
-+
-diff --git a/doc/pt/CMakeLists.txt b/doc/pt/CMakeLists.txt
-new file mode 100644
-index 0000000..e0dac75
---- /dev/null
-+++ b/doc/pt/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG pt
-+)
-+
-diff --git a/doc/ru/CMakeLists.txt b/doc/ru/CMakeLists.txt
-new file mode 100644
-index 0000000..f0976ef
---- /dev/null
-+++ b/doc/ru/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG ru
-+)
-+
-diff --git a/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt
-new file mode 100644
-index 0000000..80cafc9
---- /dev/null
-+++ b/doc/sv/CMakeLists.txt
-@@ -0,0 +1,17 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+
-+tde_create_handbook(
-+ DESTINATION konversation
-+ LANG sv
-+)
-+
-diff --git a/konversation/CMakeLists.txt b/konversation/CMakeLists.txt
-new file mode 100644
-index 0000000..fb8a913
---- /dev/null
-+++ b/konversation/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( src )
-+add_subdirectory( images )
-+add_subdirectory( scripts )
-diff --git a/konversation/images/CMakeLists.txt b/konversation/images/CMakeLists.txt
-new file mode 100644
-index 0000000..be0d6c3
---- /dev/null
-+++ b/konversation/images/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( icons )
-+add_subdirectory( nickicons )
-diff --git a/konversation/images/icons/CMakeLists.txt b/konversation/images/icons/CMakeLists.txt
-new file mode 100644
-index 0000000..9a7c073
---- /dev/null
-+++ b/konversation/images/icons/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_install_icons( )
-+
-diff --git a/konversation/images/nickicons/CMakeLists.txt b/konversation/images/nickicons/CMakeLists.txt
-new file mode 100644
-index 0000000..e2ef273
---- /dev/null
-+++ b/konversation/images/nickicons/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( alternative )
-+add_subdirectory( christmas )
-+add_subdirectory( classic )
-+add_subdirectory( default )
-+add_subdirectory( smiling )
-+add_subdirectory( square )
-+add_subdirectory( oxygen )
-diff --git a/konversation/images/nickicons/alternative/CMakeLists.txt b/konversation/images/nickicons/alternative/CMakeLists.txt
-new file mode 100644
-index 0000000..6acb10e
---- /dev/null
-+++ b/konversation/images/nickicons/alternative/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/alternative
-+)
-+
-diff --git a/konversation/images/nickicons/christmas/CMakeLists.txt b/konversation/images/nickicons/christmas/CMakeLists.txt
-new file mode 100644
-index 0000000..98f7eb4
---- /dev/null
-+++ b/konversation/images/nickicons/christmas/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/christmas
-+)
-+
-diff --git a/konversation/images/nickicons/classic/CMakeLists.txt b/konversation/images/nickicons/classic/CMakeLists.txt
-new file mode 100644
-index 0000000..58fddd9
---- /dev/null
-+++ b/konversation/images/nickicons/classic/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/classic
-+)
-+
-diff --git a/konversation/images/nickicons/default/CMakeLists.txt b/konversation/images/nickicons/default/CMakeLists.txt
-new file mode 100644
-index 0000000..4b0be7d
---- /dev/null
-+++ b/konversation/images/nickicons/default/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/default
-+)
-+
-diff --git a/konversation/images/nickicons/oxygen/CMakeLists.txt b/konversation/images/nickicons/oxygen/CMakeLists.txt
-new file mode 100644
-index 0000000..e52cfca
---- /dev/null
-+++ b/konversation/images/nickicons/oxygen/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/oxygen
-+)
-+
-diff --git a/konversation/images/nickicons/smiling/CMakeLists.txt b/konversation/images/nickicons/smiling/CMakeLists.txt
-new file mode 100644
-index 0000000..c82a658
---- /dev/null
-+++ b/konversation/images/nickicons/smiling/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/smiling
-+)
-+
-diff --git a/konversation/images/nickicons/square/CMakeLists.txt b/konversation/images/nickicons/square/CMakeLists.txt
-new file mode 100644
-index 0000000..2ef90be
---- /dev/null
-+++ b/konversation/images/nickicons/square/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES irc_admin.png irc_away.png
-+ irc_halfop.png irc_normal.png irc_op.png
-+ irc_owner.png irc_voice.png index.desktop
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/themes/square
-+)
-+
-diff --git a/konversation/scripts/CMakeLists.txt b/konversation/scripts/CMakeLists.txt
-new file mode 100644
-index 0000000..5591cd1
---- /dev/null
-+++ b/konversation/scripts/CMakeLists.txt
-@@ -0,0 +1,16 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES fortunes.dat
-+ DESTINATION
-+ ${DATA_INSTALL_DIR}/konversation/scripts
-+)
-+
-diff --git a/konversation/src/CMakeLists.txt b/konversation/src/CMakeLists.txt
-new file mode 100644
-index 0000000..3920e18
---- /dev/null
-+++ b/konversation/src/CMakeLists.txt
-@@ -0,0 +1,113 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( config )
-+add_subdirectory( linkaddressbook )
-+add_subdirectory( blowfish )
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}/config
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}/config
-+ ${CMAKE_CURRENT_SOURCE_DIR}/linkaddressbook
-+ ${CMAKE_CURRENT_SOURCE_DIR}/blowfish
-+ ${TDE_INCLUDE_DIR}
-+ ${TQT_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+ ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### konversation (executable) #################
-+
-+tde_add_executable( konversation AUTOMOC
-+ SOURCES konviface.skel konviconfigdialog.cpp konversationstatusbar.cpp
-+ konvisettingsdialog.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp
-+ konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp
-+ scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp
-+ konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp
-+ topiccombobox.cpp nicksonline.cpp dcctransferpanel.cpp
-+ dcctransferpanelitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp
-+ ignore_preferencesui.ui ignore_preferences.cpp ignore.cpp nicklistview.cpp
-+ ircinput.cpp channeloptionsui.ui channeloptionsdialog.cpp
-+ ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp
-+ outputfilter.cpp logfilereader.cpp query.cpp konversationapplication.cpp
-+ nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp
-+ dcc_preferencesui.ui log_preferences.ui tabs_preferencesui.ui
-+ tabs_preferences.cpp chatwindowappearance_preferences.ui
-+ irccolorchooserui.ui colorsappearance_preferences.ui irccolorchooser.cpp
-+ channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp multilineedit.cpp
-+ nickinfo.cpp dccresumedialog.cpp konversationsound.cpp
-+ quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp
-+ dcctransferrecv.cpp channelnick.cpp insertchardialog.cpp irccharsets.cpp
-+ editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp
-+ servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp
-+ ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp
-+ topiclabel.cpp notificationhandler.cpp joinchannelui.ui
-+ joinchanneldialog.cpp emoticon.cpp chatwindowbehaviour_preferences.ui
-+ alias_preferencesui.ui osd_preferencesui.ui theme_preferencesui.ui
-+ highlight_preferencesui.ui warnings_preferencesui.ui
-+ warnings_preferences.cpp quickbuttons_preferencesui.ui
-+ watchednicknames_preferencesui.ui generalbehavior_preferences.ui
-+ connectionbehavior_preferences.ui fontappearance_preferences.ui
-+ nicklistbehavior_preferencesui.ui konvibookmarkhandler.cpp
-+ konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp
-+ theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp
-+ highlight_preferences.cpp watchednicknames_preferences.cpp
-+ quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp
-+ tabnotifications_preferences.ui multilinetextedit.cpp serverlistview.cpp
-+ nicksonlineitem.cpp searchbarbase.ui autoreplace_preferencesui.ui
-+ autoreplace_preferences.cpp servergroupdialogui.ui dcctransfer.cpp
-+ dcctransfermanager.cpp dcctransferdetailedinfopanelui.ui
-+ dcctransferdetailedinfopanel.cpp dcccommon.cpp queuetunerbase.ui
-+ queuetuner.cpp ircqueue.cpp connectionsettings.cpp connectionmanager.cpp
-+ awaymanager.cpp
-+ LINK linkaddressbookui-static konversationconfig-static blowfish-static
-+ kio-shared kabc-shared kimproxy-shared ${XSCREENSAVER_LIBRARIES}
-+ DESTINATION ${BIN_INSTALL_DIR}
-+)
-+
-+
-+##### other data ################################
-+
-+install( FILES konversationui.rc eventsrc
-+ DESTINATION ${DATA_INSTALL_DIR}/konversation
-+)
-+
-+install( FILES konversation-0.19-colors.pl
-+ konversation-0.19-sortorder.pl
-+ konversation-0.19-appearance.pl
-+ konversation-0.19-tabplacement.pl
-+ konversation-0.19-custombrowser.pl
-+ konversation-0.19-colorcodes.pl
-+ konversation-0.19-notifylists.pl
-+ konversation-0.20-quickbuttons.pl
-+ konversation-0.20-customfonts.pl
-+ PERMISSIONS WORLD_EXECUTE
-+ DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
-+)
-+
-+install( FILES konversation.desktop
-+ DESTINATION ${XDG_APPS_INSTALL_DIR}
-+)
-+
-+install( FILES konvirc.protocol konvirc6.protocol
-+ DESTINATION ${SERVICES_INSTALL_DIR}
-+)
-+
-+install( FILES konversation.upd
-+ DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
-+)
-+
-diff --git a/konversation/src/blowfish/CMakeLists.txt b/konversation/src/blowfish/CMakeLists.txt
-new file mode 100644
-index 0000000..090fede
---- /dev/null
-+++ b/konversation/src/blowfish/CMakeLists.txt
-@@ -0,0 +1,33 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_SOURCE_DIR}/konversation/src
-+ ${TDE_INCLUDE_DIR}
-+ ${TQT_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+ ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### blowfish (static) #########################
-+
-+tde_add_library( blowfish STATIC_PIC AUTOMOC
-+ SOURCES b64stuff.cpp BlowfishCbc.cpp
-+ blowfish.cpp mc_blowfish.cpp newblowfish.cpp
-+ oldblowfish.cpp
-+)
-+
-diff --git a/konversation/src/config/CMakeLists.txt b/konversation/src/config/CMakeLists.txt
-new file mode 100644
-index 0000000..60ac82a
---- /dev/null
-+++ b/konversation/src/config/CMakeLists.txt
-@@ -0,0 +1,38 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_SOURCE_DIR}/konversation/src
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${TDE_INCLUDE_DIR}
-+ ${TQT_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+ ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### konversationconfig (static) ###############
-+
-+tde_add_library( konversationconfig STATIC_PIC AUTOMOC
-+ SOURCES preferences_base.kcfgc preferences.cpp
-+)
-+
-+
-+##### other data ################################
-+
-+install( FILES konversation.kcfg
-+ DESTINATION ${KCFG_INSTALL_DIR}
-+)
-+
-diff --git a/konversation/src/konviconfigdialog.cpp b/konversation/src/konviconfigdialog.cpp
-index 2e5050f..95701ba 100644
---- a/konversation/src/konviconfigdialog.cpp
-+++ b/konversation/src/konviconfigdialog.cpp
-@@ -282,3 +282,4 @@ void KonviConfigDialog::updateWidgetsDefault()
- {
- }
-
-+#include "konviconfigdialog.moc"
-diff --git a/konversation/src/linkaddressbook/CMakeLists.txt b/konversation/src/linkaddressbook/CMakeLists.txt
-new file mode 100644
-index 0000000..92de297
---- /dev/null
-+++ b/konversation/src/linkaddressbook/CMakeLists.txt
-@@ -0,0 +1,37 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_CURRENT_SOURCE_DIR}
-+ ${CMAKE_SOURCE_DIR}/konversation/src
-+ ${CMAKE_SOURCE_DIR}/konversation/src/config
-+ ${CMAKE_BINARY_DIR}/konversation/src/config
-+ ${TDE_INCLUDE_DIR}
-+ ${TQT_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+ ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### linkaddressbookui (static) ################
-+
-+tde_add_library( linkaddressbookui STATIC_PIC AUTOMOC
-+ SOURCES linkaddressbookui_base.ui
-+ linkaddressbookui.cpp addressbook_base.cpp
-+ addressbook.cpp nicklisttooltip.cpp
-+ nicksonlinetooltip.cpp kimiface.skel
-+ addresseeitem.cpp
-+)
-+
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-new file mode 100644
-index 0000000..dc6bb77
---- /dev/null
-+++ b/po/CMakeLists.txt
-@@ -0,0 +1,12 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_auto_add_subdirectories( )
-diff --git a/po/ar/CMakeLists.txt b/po/ar/CMakeLists.txt
-new file mode 100644
-index 0000000..fd44998
---- /dev/null
-+++ b/po/ar/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ar )
-+
-diff --git a/po/bg/CMakeLists.txt b/po/bg/CMakeLists.txt
-new file mode 100644
-index 0000000..e197abe
---- /dev/null
-+++ b/po/bg/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG bg )
-+
-diff --git a/po/ca/CMakeLists.txt b/po/ca/CMakeLists.txt
-new file mode 100644
-index 0000000..319d43d
---- /dev/null
-+++ b/po/ca/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ca )
-+
-diff --git a/po/da/CMakeLists.txt b/po/da/CMakeLists.txt
-new file mode 100644
-index 0000000..bf44b3c
---- /dev/null
-+++ b/po/da/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG da )
-+
-diff --git a/po/de/CMakeLists.txt b/po/de/CMakeLists.txt
-new file mode 100644
-index 0000000..ab9efc7
---- /dev/null
-+++ b/po/de/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG de )
-+
-diff --git a/po/el/CMakeLists.txt b/po/el/CMakeLists.txt
-new file mode 100644
-index 0000000..029e5ef
---- /dev/null
-+++ b/po/el/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG el )
-+
-diff --git a/po/en_GB/CMakeLists.txt b/po/en_GB/CMakeLists.txt
-new file mode 100644
-index 0000000..a97c853
---- /dev/null
-+++ b/po/en_GB/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG en_GB )
-+
-diff --git a/po/es/CMakeLists.txt b/po/es/CMakeLists.txt
-new file mode 100644
-index 0000000..274684f
---- /dev/null
-+++ b/po/es/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG es )
-+
-diff --git a/po/et/CMakeLists.txt b/po/et/CMakeLists.txt
-new file mode 100644
-index 0000000..eee279e
---- /dev/null
-+++ b/po/et/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG et )
-+
-diff --git a/po/fi/CMakeLists.txt b/po/fi/CMakeLists.txt
-new file mode 100644
-index 0000000..a02ad60
---- /dev/null
-+++ b/po/fi/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG fi )
-+
-diff --git a/po/fr/CMakeLists.txt b/po/fr/CMakeLists.txt
-new file mode 100644
-index 0000000..8adcfdf
---- /dev/null
-+++ b/po/fr/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG fr )
-+
-diff --git a/po/gl/CMakeLists.txt b/po/gl/CMakeLists.txt
-new file mode 100644
-index 0000000..79b4a9e
---- /dev/null
-+++ b/po/gl/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG gl )
-+
-diff --git a/po/he/CMakeLists.txt b/po/he/CMakeLists.txt
-new file mode 100644
-index 0000000..c18caa3
---- /dev/null
-+++ b/po/he/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG he )
-+
-diff --git a/po/hu/CMakeLists.txt b/po/hu/CMakeLists.txt
-new file mode 100644
-index 0000000..983f91c
---- /dev/null
-+++ b/po/hu/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG hu )
-+
-diff --git a/po/it/CMakeLists.txt b/po/it/CMakeLists.txt
-new file mode 100644
-index 0000000..e0d701d
---- /dev/null
-+++ b/po/it/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG it )
-+
-diff --git a/po/ja/CMakeLists.txt b/po/ja/CMakeLists.txt
-new file mode 100644
-index 0000000..83f254a
---- /dev/null
-+++ b/po/ja/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ja )
-+
-diff --git a/po/ka/CMakeLists.txt b/po/ka/CMakeLists.txt
-new file mode 100644
-index 0000000..b0407b8
---- /dev/null
-+++ b/po/ka/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ka )
-+
-diff --git a/po/ko/CMakeLists.txt b/po/ko/CMakeLists.txt
-new file mode 100644
-index 0000000..171a528
---- /dev/null
-+++ b/po/ko/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ko )
-+
-diff --git a/po/pa/CMakeLists.txt b/po/pa/CMakeLists.txt
-new file mode 100644
-index 0000000..4245166
---- /dev/null
-+++ b/po/pa/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG pa )
-+
-diff --git a/po/pt/CMakeLists.txt b/po/pt/CMakeLists.txt
-new file mode 100644
-index 0000000..93916be
---- /dev/null
-+++ b/po/pt/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG pt )
-+
-diff --git a/po/ru/CMakeLists.txt b/po/ru/CMakeLists.txt
-new file mode 100644
-index 0000000..62b3622
---- /dev/null
-+++ b/po/ru/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG ru )
-+
-diff --git a/po/sr/CMakeLists.txt b/po/sr/CMakeLists.txt
-new file mode 100644
-index 0000000..be06fcb
---- /dev/null
-+++ b/po/sr/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG sr )
-+
-diff --git a/po/sr@Latn/CMakeLists.txt b/po/sr@Latn/CMakeLists.txt
-new file mode 100644
-index 0000000..5768b19
---- /dev/null
-+++ b/po/sr@Latn/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG sr@Latn )
-+
-diff --git a/po/sv/CMakeLists.txt b/po/sv/CMakeLists.txt
-new file mode 100644
-index 0000000..2451444
---- /dev/null
-+++ b/po/sv/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG sv )
-+
-diff --git a/po/tr/CMakeLists.txt b/po/tr/CMakeLists.txt
-new file mode 100644
-index 0000000..2fe7323
---- /dev/null
-+++ b/po/tr/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG tr )
-+
-diff --git a/po/zh_CN/CMakeLists.txt b/po/zh_CN/CMakeLists.txt
-new file mode 100644
-index 0000000..49d25fd
---- /dev/null
-+++ b/po/zh_CN/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG zh_CN )
-+
-diff --git a/po/zh_TW/CMakeLists.txt b/po/zh_TW/CMakeLists.txt
-new file mode 100644
-index 0000000..98f2a40
---- /dev/null
-+++ b/po/zh_TW/CMakeLists.txt
-@@ -0,0 +1,13 @@
-+#################################################
-+#
-+# (C) 2012 Golubev Alexander
-+# fatzer2 (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+tde_create_translation( LANG zh_TW )
-+
diff --git a/net-irc/konversation/konversation-1.1.13-r1.ebuild b/net-irc/konversation/konversation-1.1.13-r1.ebuild
deleted file mode 100644
index da9f3efc..00000000
--- a/net-irc/konversation/konversation-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_TYPE="applications"
-TRINITY_MODULE_VER="3.5.13.1"
-
-TRINITY_EXTRAGEAR_PACKAGING="yes"
-TRINITY_HANDBOOK="optional"
-TRINITY_LANGS="ar bg ca da de el en_GB es et fi fr gl he hu it ja ka ko pa pt ru sr sr@Latn sv tr zh_CN zh_TW"
-TRINITY_DOC_LANGS="da es et it pt ru sv"
-
-inherit trinity-base
-
-DESCRIPTION="A user friendly IRC Client for Trinity"
-HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-
-need-trinity 3.5.13
-
-SLOT="${TRINITY_VER}"
-IUSE="xscreensaver"
-
-DEPEND="xscreensaver? ( x11-libs/libXScrnSaver )"
-RDEPEND="$DEPEND"
-
-PATCHES=( "${FILESDIR}/${PN}-${TRINITY_MODULE_VER}-initial-cmake.patch" )
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with xscreensaver XSCREENSAVER)
- )
-
- trinity-base_src_configure
-}
diff --git a/profiles/categories b/profiles/categories
index 9be96594..e3974106 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -1,2 +1,3 @@
+dev-tqt
trinity-apps
trinity-base
diff --git a/profiles/package.mask b/profiles/package.mask
index b5477625..d7bb49b2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,12 +1,3 @@
-# an issue with kviewshell-static library in trinity-base/kviewshell;
-# making it shared solves the problem
-# or may be we should just install it ?
-=trinity-base/kdvi-3.5.13.1
-=trinity-base/kfax-3.5.13.1
-
-# masked due masked dependencies
-=trinity-base/kdegraphics-meta-3.5.13.1
-
# 2017-01-08
# mask due to missing dependency: trinity-base/noatun
trinity-base/noatun-plugins
diff --git a/profiles/package.unmask b/profiles/package.unmask
deleted file mode 100644
index 9eceba14..00000000
--- a/profiles/package.unmask
+++ /dev/null
@@ -1,2 +0,0 @@
-sys-apps/hal
-sys-apps/policycoreutils
diff --git a/profiles/package.use.force b/profiles/package.use.force
deleted file mode 100644
index e02679f2..00000000
--- a/profiles/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-#kdm currently doesn't attempt to login without pam support
-kde-base/kdm pam
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
deleted file mode 100644
index dad9a509..00000000
--- a/profiles/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# unmask this if we will support powerpc
-trinity-base/kmilo powerbook-laptop
-
-dev-qt/tqtinterface qt4
-trinity-base/kdelibs avahi
-trinity-base/tdelibs avahi
-
-#doesn't really work
->dev-qt/tqtinterface-14.0.0 qt3
-
-# FIXME: FTBFS
-=trinity-base/ksmserver-9999 hal
diff --git a/profiles/repo_name b/profiles/repo_name
index baca3ee9..b708c66a 100644
--- a/profiles/repo_name
+++ b/profiles/repo_name
@@ -1 +1 @@
-trinity
+trinity-official
diff --git a/profiles/use.desc b/profiles/use.desc
index 652ce992..aaced4ca 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,6 +1,3 @@
arts - Adds support for aRts: the Trinity sound daemon
-esd - Adds support for media-sound/esound (Enlightened Sound Daemon)
-hal - Enable Hardware Abstraction Layer (HAL) support
upower - Adds support for sys-power/upower
-qt3 - Adds support for the Qt GUI/Application Toolkit version 3.x
xrandr - Add support for xrandr
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
deleted file mode 100644
index 93c47322..00000000
--- a/profiles/use.local.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-sys-apps/hal:dell - FIXME <unknown>
-sys-apps/hal:disk-partition - FIXME <unknown>
-sys-apps/hal:laptop - FIXME <unknown>
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
deleted file mode 100644
index dd756fdc..00000000
--- a/sys-apps/hal/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.5.14-hald.conf 119 SHA256 b19e6df9c78b6f813405a7cbff20e049714db1a000e6b71ab2eca02d372d58af SHA512 6cdb3d06175a94537047e7fe6c1652496a2960344601b8741a33385903cf551cec272f59a958bf27ba879817575b1e2d0610f631ec70dcee8506973f259d2878 WHIRLPOOL 492a5852dd69d5faf11f4c85ff7b8e2c0271a42d8d786a945d918d0a13d0f60c24b12a5548493574d970114e2d88f926df9f6410c4323e783dbe75b373a1f959
-AUX 0.5.14-hald.rc.1 1121 SHA256 77303218b30e39c4f14ab06245d3e9a0ed272d98d5a143c3b6c05b73daed94ab SHA512 2d1f6e72d15e1c87dc7994a01f9d1caa6182218719c33e56858e3395c3db025c8fedada8380ecda7b9071cc36e90efa933b23d88b5e3e3feddd7b5d9de71f066 WHIRLPOOL 45e9c706eef47b5a89c8fbc518ebc447dbf9b697f0b685ec638bec047349ccc6236e8accb1274bb7f7bd75f39516e5ada02ecac03a6de189b525388a36164e3c
-AUX hal-0.5.14-fix-glib-includes-in-addons.patch 4499 SHA256 54a96c9628d0a22a5b43b9a939ec7a08dd17a497e60d4626f398c92b8cac7e0e SHA512 080389d36f87ca400ed93c83a678d74bad7fbb0fe5638a2c8ff5cd6ea7f922f1aa1dab03e7e18223eff0c80fc3a06ac0e1009183e39b85b2a05bb52593da7c41 WHIRLPOOL 8aaa90adc4790be12f79814e9a07799cb0915630ebd4aa67b61704e596a2baa083dd15c6dc4226ed23ea1a46921242c6e4079d5cded8d4992a1d17d876f2a266
-AUX hal-0.5.14-fix-gtk-doc-automake.patch 399 SHA256 9936cb0d3c29cc7401e6592b40f62961e84050d641e4dd66c8cc1e4cf7ea6371 SHA512 ef44b8968acee09e98ecb74779738d8824c4b951549aa4ab04161dacf60f7f6e1e417b13e89fabe0d29a5d0b72d4a144cddc7c7a795b628353d58d08410bbf06 WHIRLPOOL bc76f7ae2754a8fb352053a97ec0360d63b113db0b02cc9f0e445b7c7e0246e0dfa38b01d56f6bd56fe191e7fbdda218247e08b9c59ffca715d6ef2bb87960d1
-AUX hal-0.5.14-gentoo-patches-5.tar.bz2 6494 SHA256 5919bf1e3e5ff8b3682b8163e8b9cd86269263f9d023783d0c13dc759b36849c SHA512 501a005e27d57cfb289495d09e8b060e69546e5c78b53da8c86b79a964ec7ba172d044501239fadf683f6d11749e93527008726d739db5d4eabdebead6d3a96d WHIRLPOOL 80093db135d4ec03b58dd2c9110e30bdcb5545179d66c3b5e94efc87b8df5979f4b8d477e84bf94eeeed3bbc4affc0a91a4c4740f2ffc0d7ae3d03a177747ce3
-AUX hal-unmount.dev 397 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b SHA512 6a340f19ba3f915281597e18c32555db3e1f12128b51fad4136f6077795d66595ef0689f0d07e26a7ce6ae39c68e37a092622eab918b657f9c9ada27af9184cf WHIRLPOOL 8c096c5864ea18953ed60febaa3af4fe8621ff4c7ba0d30612467b15ba9688607d82da5044aff372b05424015c729f38970c0767e5c9a97c9d60be42ad2a1bc4
-DIST hal-0.5.14.tar.bz2 942954 SHA256 c4c5ecc5d50d5d9c061dc06c405461b1f71c12f2c60ed062350b2e6db2f1c51e SHA512 fe34e0dd0a630b943ea1ce2a2af71260309144fb76ae0f482c475610f0347f403f2a3bac81d27a95868bf640fca78e6e8de0051e8e1a3f39ff6804232ecc333c WHIRLPOOL b5231dde8331a9986f3f44c454e1b953a6039c7675306c92647c8aff5fa3181229f6c2198ffa3dd577cceace03aeb0613dabe5456091566542a1f4c41f95a24c
diff --git a/sys-apps/hal/Reasons b/sys-apps/hal/Reasons
deleted file mode 100644
index ab753149..00000000
--- a/sys-apps/hal/Reasons
+++ /dev/null
@@ -1,16 +0,0 @@
-sys-apps/hal
-
-Ebuild originally added Dec 7, 2006
-Added by Fabio Erculiani <lxnay@sabayonlinux.org>
-
-Ebuild added to fix/add the following issues:
-Enable plugdev support
-NTFS-3G support
-Fix HAL mount when extra options specified
-Fix Gentoo bug #299483
-
-======
-02.08.08 - Wael Nasreddine <wael.nasreddine@sabayonlinux.org>
- - depend on >=app-misc/hal-info-20080310 instead of
- =app-misc/hal-info-20080310 because gentoo has marked
- app-misc/hal-info-20080508 stable.
diff --git a/sys-apps/hal/files/0.5.14-hald.conf b/sys-apps/hal/files/0.5.14-hald.conf
deleted file mode 100644
index 941005a4..00000000
--- a/sys-apps/hal/files/0.5.14-hald.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/hald
-
-# Should HAL be verbose to syslog? Useful for debugging
-HALD_VERBOSE="no"
-
-# vim: ft=gentoo-conf-d
diff --git a/sys-apps/hal/files/0.5.14-hald.rc.1 b/sys-apps/hal/files/0.5.14-hald.rc.1
deleted file mode 100644
index 2bd99fed..00000000
--- a/sys-apps/hal/files/0.5.14-hald.rc.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/Attic/0.5.14-hald.rc.1,v 1.2 2011/09/18 09:08:28 ssuominen dead $
-
-depend() {
- use logger acpid
- need dbus
- after coldplug dns nscd
-}
-
-start() {
- [ -z "${HALD_VERBOSE}" ] && HALD_VERBOSE="no"
- ebegin "Starting Hardware Abstraction Layer daemon"
-
-# REAL_ROOT=`mount -fv / | cut -d' ' -f1`
-# TEST_ROOT=`cat /proc/mounts | cut -d' ' -f1 | head -n 2 | tail -n 1`
-
-# if [ ! -e ${TEST_ROOT} ]; then
-# echo "You need a ${TEST_ROOT} that points to your ${REAL_ROOT}"
-# echo "See http://bugs.gentoo.org/show_bug.cgi?id=175243"
-# echo "Quick fix is: ln -s ${REAL_ROOT} ${TEST_ROOT}"
-# eend 2
-# fi
-
- if [ -f /proc/acpi/event ]; then
- chgrp haldaemon /proc/acpi/event
- chmod 440 /proc/acpi/event
- fi
-
- start-stop-daemon --start -q --exec /usr/sbin/hald -- --use-syslog --verbose=${HALD_VERBOSE}
- eend $?
-}
-
-stop() {
- ebegin "Stopping Hardware Abstraction Layer daemon"
- start-stop-daemon --stop -q --pidfile /var/run/hald.pid
- eend $?
-}
diff --git a/sys-apps/hal/files/hal-0.5.14-fix-glib-includes-in-addons.patch b/sys-apps/hal/files/hal-0.5.14-fix-glib-includes-in-addons.patch
deleted file mode 100644
index 7d797188..00000000
--- a/sys-apps/hal/files/hal-0.5.14-fix-glib-includes-in-addons.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- ./hald/linux/addons/addon-acpi-buttons-toshiba.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-acpi-buttons-toshiba.c 2012-11-29 04:47:18.000000000 +0300
-@@ -40,7 +40,7 @@
- #include <string.h>
- #include <unistd.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
-
- #include "libhal/libhal.h"
- #include "../../logger.h"
---- ./hald/linux/addons/addon-storage.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-storage.c 2012-11-29 04:47:52.000000000 +0300
-@@ -39,7 +39,7 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-dell-backlight.cpp.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-dell-backlight.cpp 2012-11-29 04:46:51.000000000 +0300
-@@ -29,7 +29,7 @@
-
- #include <string.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-imac-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-imac-backlight.c 2012-11-29 04:47:34.000000000 +0300
-@@ -29,7 +29,7 @@
- #include <stdlib.h>
- #include <sys/io.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-ipw-killswitch.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-ipw-killswitch.c 2012-11-29 04:48:16.000000000 +0300
-@@ -36,8 +36,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/gmain.h>
--#include <glib/gstdio.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-rfkill-killswitch.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-rfkill-killswitch.c 2012-11-29 04:47:12.000000000 +0300
-@@ -36,8 +36,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/gmain.h>
--#include <glib/gstdio.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-usb-csr.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-usb-csr.c 2012-11-29 04:47:55.000000000 +0300
-@@ -29,7 +29,7 @@
- #include <string.h>
- #include <usb.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-input.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-input.c 2012-11-29 05:00:31.000000000 +0300
-@@ -41,8 +41,7 @@
- #else
- #include <linux/input.h>
- #endif
--#include <glib/gmain.h>
--#include <glib/gprintf.h>
-+#include <glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
- #include "libhal/libhal.h"
---- ./hald/linux/addons/addon-omap-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-omap-backlight.c 2012-11-29 04:47:38.000000000 +0300
-@@ -41,7 +41,7 @@
- #include <fcntl.h>
- #include <unistd.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-macbookpro-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-macbookpro-backlight.c 2012-11-29 04:47:43.000000000 +0300
-@@ -39,7 +39,7 @@
- #include <pci/pci.h>
- #include <unistd.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-leds.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-leds.c 2012-11-29 04:47:25.000000000 +0300
-@@ -36,8 +36,6 @@
- #include <unistd.h>
-
- #include <glib.h>
--#include <glib/gmain.h>
--#include <glib/gstdio.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
---- ./hald/linux/addons/addon-cpufreq.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-cpufreq.c 2012-11-29 04:48:01.000000000 +0300
-@@ -32,7 +32,6 @@
- #include <unistd.h>
- #include <signal.h>
- #include <getopt.h>
--#include <glib/gprintf.h>
-
- #include "addon-cpufreq.h"
- #include "addon-cpufreq-userspace.h"
---- ./hald/linux/addons/addon-generic-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400
-+++ ./hald/linux/addons/addon-generic-backlight.c 2012-11-29 05:11:49.000000000 +0300
-@@ -35,7 +35,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
diff --git a/sys-apps/hal/files/hal-0.5.14-fix-gtk-doc-automake.patch b/sys-apps/hal/files/hal-0.5.14-fix-gtk-doc-automake.patch
deleted file mode 100644
index 30beb341..00000000
--- a/sys-apps/hal/files/hal-0.5.14-fix-gtk-doc-automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.inorig 2012-11-29 19:37:25.000000000 +0300
-+++ configure.in 2012-11-29 19:37:35.000000000 +0300
-@@ -10,6 +10,8 @@
- AC_INIT(hal, 0.5.14, david@fubar.dk)
- AM_INIT_AUTOMAKE([gnu 1.9])
- AM_MAINTAINER_MODE
-+AC_CONFIG_MACRO_DIR([.])
-+m4_include([gtk-doc.m4])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
- glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
diff --git a/sys-apps/hal/files/hal-0.5.14-gentoo-patches-5.tar.bz2 b/sys-apps/hal/files/hal-0.5.14-gentoo-patches-5.tar.bz2
deleted file mode 100644
index 917905b3..00000000
--- a/sys-apps/hal/files/hal-0.5.14-gentoo-patches-5.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/sys-apps/hal/files/hal-unmount.dev b/sys-apps/hal/files/hal-unmount.dev
deleted file mode 100644
index 04d1fa81..00000000
--- a/sys-apps/hal/files/hal-unmount.dev
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# sanity check. DEVNAME should start with a /
-[ "$DEVNAME" != "${DEVNAME#/}" ] || exit 0
-
-# Lazily unmount drives which are removed, but still mounted
-if [ "$ACTION" = remove ] \
- && (grep -q "^$DEVNAME" /proc/mounts || grep -q "^$DEVNAME" /etc/mtab); then
- if [ -x /usr/bin/pumount ] ; then
- /usr/bin/pumount -l "$DEVNAME";
- else
- /bin/umount -l "$DEVNAME";
- fi
-fi
-
-exit 0
-
diff --git a/sys-apps/hal/hal-0.5.14-r4.ebuild b/sys-apps/hal/hal-0.5.14-r4.ebuild
deleted file mode 100644
index 87014d10..00000000
--- a/sys-apps/hal/hal-0.5.14-r4.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils linux-info autotools flag-o-matic multilib
-
-PATCH_VERSION="5"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2"
-# patches are now removed from gentoo.org
-# http://dev.gentoo.org/~ssuominen/${PATCHNAME}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
- >=dev-libs/glib-2.14
- >=dev-libs/expat-1.95.8
- =virtual/libusb-0*
- >=sys-apps/pciutils-2.2.7-r1
- sys-apps/usbutils
- virtual/eject
- amd64? ( >=sys-apps/dmidecode-2.7 )
- dell? ( >=sys-libs/libsmbios-0.13.4 )
- disk-partition? ( >=sys-block/parted-1.8.0 )
- ia64? ( >=sys-apps/dmidecode-2.7 )
- kernel_linux? (
- >=virtual/udev-125
- >=sys-apps/util-linux-2.16
- >=sys-kernel/linux-headers-2.6.22
- crypt? ( >=sys-fs/cryptsetup-1.0.5 )
- )
- kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
- x86? ( >=sys-apps/dmidecode-2.7 )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-util/gperf-3.0.3
- >=dev-util/intltool-0.35
- doc? (
- app-text/xmlto
- dev-libs/libxml2
- dev-util/gtk-doc
- app-text/docbook-sgml-utils
- app-text/docbook-xml-dtd:4.1.2
- )"
-PDEPEND=">=app-misc/hal-info-20081219
- !gnome-extra/hal-device-manager
- laptop? ( >=sys-power/pm-utils-0.99.3 )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
-
-function check_hotplug_net() {
- local CONFIG_CHECK="~HOTPLUG ~NET"
- local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
- local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
- check_extra_config
-}
-
-function check_inotify() {
- local CONFIG_CHECK="~INOTIFY_USER"
- local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
- check_extra_config
-}
-
-function check_acpi_proc() {
- local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
- local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
- local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
- check_extra_config
-}
-
-pkg_setup() {
- if use kernel_linux ; then
- if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
- kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
-
- if kernel_is lt 2 6 23 && use acpi ; then
- check_acpi_proc
- fi
- fi
-
- check_hotplug_net
- check_inotify
- fi
-
- # http://devmanual.gentoo.org/ebuild-writing/functions/
- # http://bugs.gentoo.org/show_bug.cgi?id=191605
-
- # Create groups for hotplugging and HAL
- enewgroup haldaemon
- enewgroup plugdev
-
- # HAL drops priviledges by default now ...
- # ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
- if use kernel_linux; then
- enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
- elif use kernel_FreeBSD; then
- enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
- fi
-
- # Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
- # If users have a problem with this, let them file a bug
- if [[ ${ROOT} == / ]] ; then
- if use kernel_linux; then
- usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
- elif use kernel_FreeBSD; then
- pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
- fi
- fi
-}
-
-src_prepare() {
- # FIXME: really BAD style
- tar -xjf "${FILESDIR}/${PATCHNAME}.tar.bz2" -C "${WORKDIR}"
- EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
- EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/patches/" \
- EPATCH_FORCE="yes" \
- epatch
- epatch "${FILESDIR}/${P}-fix-glib-includes-in-addons.patch"
-
- # the last one is a work-around for an issue described in:
- # mail-list: gentoo-desktop
- # tread: [kde-sunset] sys-apps/hal
- # start-date: 2012-11-19
- # if somebody got a better solution, please contact me
- gtkdocize --version >/dev/null 2>&1 && epatch "${FILESDIR}/${P}-fix-gtk-doc-automake.patch"
-
- eautoreconf
-}
-
-src_configure() {
- local acpi="$(use_enable acpi)"
- local backend=
- local hardware=
-
- append-flags -rdynamic
-
- if use kernel_linux ; then
- backend="linux"
- elif use kernel_FreeBSD ; then
- backend="freebsd"
- else
- eerror "Invalid backend"
- fi
-
- if use kernel_linux ; then
- if use acpi ; then
- # Using IBM ACPI and Toshiba ACPI results in double notification as this
- # was merged into the Linux Kernel 2.6.22
- if kernel_is lt 2 6 22 ; then
- acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
- else
- acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
- fi
-
- acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
- else
- acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
- acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
- fi
-
- hardware="--with-cpufreq --with-usb-csr --with-keymaps"
- use arm && hardware="$hardware --with-omap --enable-pmu"
- use ppc && hardware="$hardware --enable-pmu"
- if use x86 || use amd64; then
- hardware="$hardware --with-macbook --with-macbookpro"
- fi
-
- if use dell ; then
- hardware="$hardware --with-dell-backlight"
- else
- hardware="$hardware --without-dell-backlight"
- fi
-
- hardware="$hardware --enable-sonypic"
- else
- hardware="--without-cpufreq --without-usb-csr --without-keymaps"
- hardware="$hardware --without-omap"
- hardware="$hardware --without-dell-backlight"
- hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
- hardware="$hardware --disable-sonypic"
- fi
-
- econf --with-backend=${backend} \
- --with-os-type=gentoo \
- --with-pid-file=/var/run/hald.pid \
- --with-hwdata=/usr/share/misc \
- --with-socket-dir=/var/run/hald \
- --with-udev-prefix=/etc \
- --enable-umount-helper \
- --enable-man-pages \
- --disable-acl-management \
- --enable-pci \
- --disable-policy-kit \
- --disable-console-kit \
- $(use_enable apm) \
- $(use_enable debug verbose-mode) \
- $(use_enable disk-partition parted) \
- $(use_enable doc docbook-docs) \
- $(use_enable doc gtk-doc) \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var \
- ${acpi} ${hardware} \
- || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
-
- # hal umount for unclean unmounts
- exeinto /$(get_libdir)/udev/
- newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
-
- # initscript
- cp "${FILESDIR}/0.5.14-hald.rc.1" "${WORKDIR}/" || \
- die "failed to copy hald.rc.1"
- newinitd "${WORKDIR}/0.5.14-hald.rc.1" hald || die "init script failed"
-
- # configuration
- cp "${FILESDIR}/0.5.14-hald.conf" "${WORKDIR}/" || \
- die "failed to copy hald.conf"
-
- if use debug; then
- sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
- -i "${WORKDIR}/0.5.14-hald.conf" || die "failed to change verbose"
- fi
- newconfd "${WORKDIR}/0.5.14-hald.conf" hald || \
- die "failed to install hald.conf"
-
- if use X ; then
- # New Configuration Snippets
- dodoc "${WORKDIR}/${PATCHNAME}/config-examples/"*.fdi || \
- die "dodoc X examples failed"
- fi
-
- # We now create and keep /media here as both gnome-mount and pmount
- # use these directories, to avoid collision.
- keepdir /media
-
- # We also need to create and keep /etc/fdi/{information,policy,preprobe}
- # or else hal bombs.
- keepdir /etc/hal/fdi/{information,policy,preprobe}
-
- # HAL stores it's fdi cache in /var/cache/hald
- keepdir /var/cache/hald
-
- # HAL keeps its unix socket here
- keepdir /var/run/hald
- keepdir /var/lib/hal
-}
-
-pkg_postinst() {
- # Despite what people keep changing this location. Either one works.. it doesn't matter
- # http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
- elog "The HAL daemon needs to be running for certain applications to"
- elog "work. Suggested is to add the init script to your start-up"
- elog "scripts, this should be done like this :"
- elog "\`rc-update add hald default\`"
- echo
- elog "Access to hal is now protected by either at_console or the plugdev group."
- elog "If you have problems discovering/configuring hardware, try adding"
- elog "yourself to plugdev, or ensuring consolekit is started"
- echo
- elog "IF you have additional applications which consume ACPI events, you"
- elog "should consider installing acpid to allow applications to share ACPI"
- elog "events."
- if use X ; then
- echo
- elog "If you wish to use a non US layout, you may do so by executing:"
- elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
- elog "Keyboard Layout Settings mechanism."
- elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
- elog "it is kxkb."
- fi
- echo
- elog "In order have suspend/hibernate function with HAL or apps that use HAL"
- elog "(such as gnome-power-manager), you should build HAL with the laptop"
- elog "useflag which will install pm-utils."
- if use X ; then
- echo
- elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
- elog "reads user specific configuration from /etc/hal/fdi/policy/."
- echo
- elog "You should remove the Input sections from your xorg.conf once you have"
- elog "migrated the rules to a HAL fdi file."
- fi
-
- ebeep 5
- epause 5
-}
diff --git a/sys-apps/hal/metadata.xml b/sys-apps/hal/metadata.xml
deleted file mode 100644
index 8cfcc369..00000000
--- a/sys-apps/hal/metadata.xml
+++ /dev/null
@@ -1,36 +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='acpi'>Enables HAL to attempt to read from /proc/acpi/event, if
- unavailable, HAL will read events from <pkg>sys-power/acpid</pkg>. If
- you need multiple acpi readers, ensure acpid is in your default
- runlevel (rc-update add acpid default) along with HAL. This will also
- enable HAL to read Toshiba and IBM acpi events which do not get sent
- via /proc/acpi/event</flag>
- <flag name='crypt'>Allows HAL to mount volumes that are encrypted using
- LUKS. <pkg>sys-fs/cryptsetup-luks</pkg> which has recently been renamed
- to <pkg>sys-fs/cryptsetup</pkg> allows you to create such encrypted
- volumes. HAL will be able to handle volumes that are removable or
- fixed.</flag>
- <flag name='dell'>Builds and installs the Dell addon, which reads data from
- the Dell SM BIOS via <pkg>sys-libs/libsmbios</pkg>. It will read your
- service tag information and your hardware backlight data as well as
- allow you to modify the backlight settings on a Dell laptop.</flag>
- <flag name='disk-partition'>Allows HAL to use libparted from
- <pkg>sys-block/parted</pkg> to read raw partition data from your disks
- and process that data. Future versions of HAL (possibly 0.5.11 and
- higher) will allow you to create, modify, delete and format partitions
- from a GUI interface agnostic of your desktop environment.</flag>
- <flag name='doc'>Generates documentation that describes HAL's fdi
- format.</flag>
- <flag name='laptop'>Adds support for power management scripts
- (<pkg>sys-power/pm-utils</pkg>)</flag>
- <flag name='selinux'>Installs SELinux policies and links HAL to the SELinux
- libraries.</flag>
-</use>
-</pkgmetadata>
diff --git a/net-irc/konversation/konversation-1.1.9999.ebuild b/trinity-apps/konversation/konversation-9999.ebuild
index c9f07147..c9f07147 100644
--- a/net-irc/konversation/konversation-1.1.9999.ebuild
+++ b/trinity-apps/konversation/konversation-9999.ebuild
diff --git a/dev-qt/qt-meta/metadata.xml b/trinity-apps/konversation/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/dev-qt/qt-meta/metadata.xml
+++ b/trinity-apps/konversation/metadata.xml
diff --git a/trinity-apps/ktron/metadata.xml b/trinity-apps/ktron/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-apps/ktron/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-apps/ktuberling/metadata.xml b/trinity-apps/ktuberling/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-apps/ktuberling/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-apps/lskat/metadata.xml b/trinity-apps/lskat/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-apps/lskat/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-apps/twin4/metadata.xml b/trinity-apps/twin4/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-apps/twin4/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/akregator/Manifest b/trinity-base/akregator/Manifest
deleted file mode 100644
index 4a730c44..00000000
--- a/trinity-base/akregator/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdepim-3.5.13.1.tar.gz 12954293 SHA256 29755dd66b6da83cb1105fd22954869b911c836f806c19d6a56cdfd6ee79287f SHA512 52f0133f0d296488786f26fe118eefb2018542a36de82d2fd253b7af4e1496ffbee1470869510259202b0a1b5cc6fb1b1b7b8a3ec0b27197fa60927281d1cb9e WHIRLPOOL b34852363e6a6ecdeaacbd9b0775ed0c8c5f692181dc1eee14543c0761a92af43bd96139a7588585ac9715721f62f2aaee603af11240a9a5a93d662262168887
-DIST kdepim-trinity-3.5.13.2.tar.xz 10148724 SHA256 2cbd61e28322e4c7d67ffb16ac59329b3f15ba1a4485095994b9bce6786df7c4 SHA512 a84319183813dc78dc97397c8c3871faa3961b458eda8107525b8b9c6789d13aedd8e3c7cb0706c4ca8dd63f69ff67de02716219c8af44ebf96d484d820eb2bf WHIRLPOOL 907d9d86f1b0094b915989ca7f0feb4f67ac1b238a4c6d176ab1ef9164eff78778b2714ebedeb40de28536a8384b39ec7e637f1bb6911cccb40f7d8663811edb
diff --git a/trinity-base/akregator/akregator-3.5.13.1.ebuild b/trinity-base/akregator/akregator-3.5.13.1.ebuild
deleted file mode 100644
index dc1511e6..00000000
--- a/trinity-base/akregator/akregator-3.5.13.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdepim"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity news feed aggregator."
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- >=trinity-base/ktnef-${PV}:${SLOT}
- >=trinity-base/libkmime-${PV}:${SLOT}
- >=trinity-base/libkdepim-${PV}:${SLOT}
- >=trinity-base/libkcal-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
-
-TSM_EXTRACT_ALSO="libkdepim"
diff --git a/trinity-base/akregator/akregator-3.5.13.2.ebuild b/trinity-base/akregator/akregator-3.5.13.2.ebuild
deleted file mode 100644
index 24f019e9..00000000
--- a/trinity-base/akregator/akregator-3.5.13.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdepim"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity news feed aggregator."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=trinity-base/ktnef-${PV}:${SLOT}
- >=trinity-base/libkmime-${PV}:${SLOT}
- >=trinity-base/libkdepim-${PV}:${SLOT}
- >=trinity-base/libkcal-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
-
-TSM_EXTRACT_ALSO="libkdepim/"
diff --git a/trinity-base/amor/Manifest b/trinity-base/amor/Manifest
deleted file mode 100644
index 23ad5010..00000000
--- a/trinity-base/amor/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdetoys-3.5.13.1.tar.gz 3037255 SHA256 41e4224bcf816e52877b17d2dcdc86d94e8f304fee2d3fb35b97921544eafd9d SHA512 e7cd7943004e5d1ec83c0fe484fab82f2cdd5f5d39ee77db419938f023cd3c42ba0b257d0ddc783de7bd528c90195821d810babfa193c60856437593c24ce879 WHIRLPOOL 8d482537f972a24b1cef9ad789edd314517f4e3a6b37056f47d92292c8c30e70def24e99efc552b4504503e2224e1209ae946ff34ac94feaf128c038c54f010d
-DIST kdetoys-trinity-3.5.13.2.tar.xz 2757260 SHA256 a0533ceb6fb103600eb33ef3136d40f84ec826e24e0b95cc45e68ef73a5232f6 SHA512 eb67a70d75a473f885db8993f5eebd3480e68e43e4de60240fde411696ed8b895029505a5125fe51a41d6ccb583ba50c4c67465d770f14f9a1c1533281154f78 WHIRLPOOL d79f58085d2af17453fc50c621ea6fe6909d476cf5f0a6b6ccf51ef69eed0ba073091f587439eb5afd644e0286dfe2ee86ccd903346d3060c3fe90299511018a
diff --git a/trinity-base/amor/amor-3.5.13.1.ebuild b/trinity-base/amor/amor-3.5.13.1.ebuild
deleted file mode 100644
index f9e407cf..00000000
--- a/trinity-base/amor/amor-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/trinity-base/amor/amor-3.5.13.2.ebuild b/trinity-base/amor/amor-3.5.13.2.ebuild
deleted file mode 100644
index eef2164b..00000000
--- a/trinity-base/amor/amor-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-base/ark/Manifest b/trinity-base/ark/Manifest
deleted file mode 100644
index c59ac62b..00000000
--- a/trinity-base/ark/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdeutils-3.5.13.1.tar.gz 2829393 SHA256 3e7ab07fe1bb3e7be7ac3a3796366c88d3b79a58af911546e2c65e32363db527 SHA512 48733e472d0f5da85ef8a32ed6db7fa5e61f0682e49842439e6ea38a1e407059bb35efffe41fc6ed1a718511fd5b2b2c8222d816a23500a4dcbca17461f9a3bd WHIRLPOOL 1488e0c44f60b4d5e397dd2cf93de048eae1b915d4b2b7b1cf27768946f5aae3b5bcc3971ee28b5fa6a57a0b94cca6db0866138b69ad74f1f7bb97cdaaebdbe2
-DIST kdeutils-trinity-3.5.13.2.tar.xz 2259232 SHA256 b2999b9ef39bb2f269b84fdf34a814b5a5599aae7d05538d0bf680c18fb334fa SHA512 f501aa4b61bf440e873eec96f09c0c24ad780db2f9f14b884001c04c04aafccb5afb2b492dcf4fc640f3ec35d86aa419d67936122648a986662cd7b7f4f8a2d8 WHIRLPOOL 49296006875250212f0fdeb0c90c4f69cf0aa7cfd38415e2f7b50bdf81754de64562df2400f4932a502adbe84b58be34cae6c029d68cc62d0e91de5158513239
diff --git a/trinity-base/ark/ark-3.5.13.1.ebuild b/trinity-base/ark/ark-3.5.13.1.ebuild
deleted file mode 100644
index 0b1bac87..00000000
--- a/trinity-base/ark/ark-3.5.13.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity Archiving tool"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-pkg_postinst(){
- elog "You may want to install app-arch/lha, app-arch/p7zip, app-arch/rar,"
- elog "app-arch/zip or app-arch/zoo for support of these archive types."
-}
diff --git a/trinity-base/ark/ark-3.5.13.2.ebuild b/trinity-base/ark/ark-3.5.13.2.ebuild
deleted file mode 100644
index ec054974..00000000
--- a/trinity-base/ark/ark-3.5.13.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity Archiving tool"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-pkg_postinst(){
- elog "You may want to install app-arch/lha, app-arch/p7zip, app-arch/rar,"
- elog "app-arch/zip or app-arch/zoo for support of these archive types."
-}
diff --git a/trinity-base/arts/Manifest b/trinity-base/arts/Manifest
deleted file mode 100644
index ab59b6c0..00000000
--- a/trinity-base/arts/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST arts-3.5.13.1.tar.gz 907039 SHA256 ab0f66866d92f3b5f99cc7f96a99615f6873b2326aa0c81670cafb05d4c19b60 SHA512 287ced8a2251929cb9a47c1c158c11c48d8e1174fa9a41dbd32103e1aed64e51f38a641b6600b966c6ac147c913fe6a21db73e57287fdc7de85c535284f1e9e2 WHIRLPOOL de76330c608d31d99c5fe1d95e457d5b7ca286287e329f1d8adfa7cff0c4d7df0ad0235fa2152fee81b7e4aca193e1b960bb2db28e5a25890d8e819d5f8da4fb
-DIST arts-trinity-3.5.13.2.tar.xz 669044 SHA256 5498d299698b1a0148f31b9d1f807d486ee2d06a0119997eb143f27cab682a3b SHA512 2efd1ed900d909e49e8083bb223efa577968a5b4ed2f3bb5292adaedac20ed804fb177aa5206d62707a18a0198a443141f00b5dec1cdabd834f9abf7107e0548 WHIRLPOOL 02142a7fb8f0d1022178ca422590f57ea06bdf490d528ee1f6a396e9b16c55db226a053dcf7a8dcd09437eb2e9887cd9b89a0a93697b372b9657e9e3cc3cbcb8
diff --git a/trinity-base/arts/arts-3.5.13.1.ebuild b/trinity-base/arts/arts-3.5.13.1.ebuild
deleted file mode 100644
index 69f717f6..00000000
--- a/trinity-base/arts/arts-3.5.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
-
-inherit trinity-base
-
-set-trinityver
-
-DESCRIPTION="aRts, the Trinity sound (and all-around multimedia) server/output manager"
-HOMEPAGE="http://trinitydesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-IUSE="alsa -artswrappersuid jack mp3 nas vorbis"
-SLOT="${TRINITY_VER}"
-
-DEPEND="dev-qt/tqtinterface
- dev-libs/glib:2
- media-libs/audiofile
- mp3? ( media-libs/libmad )
- nas? ( media-libs/nas )
- alsa? ( media-libs/alsa-lib )
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- jack? ( >=media-sound/jack-audio-connection-kit-0.90 )"
-RDEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- -DAUDIOFILE=ON
- $(cmake-utils_use_with mp3 MAD)
- $(cmake-utils_use_with nas NAS)
- $(cmake-utils_use_with alsa ALSA)
- $(cmake-utils_use_with vorbis VORBIS)
- $(cmake-utils_use_with jack JACK)
- # NOTE: WITH_ESD dropped due to remove of esound long ago
- )
-
- trinity-base_src_configure
-}
-
-src_install() {
- trinity-base_src_install
-
- # used for realtime priority, but off by default as it is a security hazard
- use artswrappersuid && chmod u+s "${D}/${PREFIX}/bin/artswrapper"
-}
-
-pkg_postinst() {
- if ! use artswrappersuid ; then
- elog "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
- elog "and so avoid possible skips in sound. However, on untrusted systems this"
- elog "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
- elog "priority, and so is off by default. See bug #7883."
- elog "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
- fi
-}
diff --git a/trinity-base/arts/arts-3.5.13.2.ebuild b/trinity-base/arts/arts-3.5.13.2.ebuild
deleted file mode 100644
index a788528e..00000000
--- a/trinity-base/arts/arts-3.5.13.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
-
-inherit trinity-base
-
-set-trinityver
-
-DESCRIPTION="aRts, the Trinity sound (and all-around multimedia) server/output manager"
-HOMEPAGE="http://trinitydesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa -artswrappersuid jack mp3 nas vorbis"
-SLOT="${TRINITY_VER}"
-
-DEPEND="dev-qt/tqtinterface
- dev-libs/glib:2
- media-libs/audiofile
- mp3? ( media-libs/libmad )
- nas? ( media-libs/nas )
- alsa? ( media-libs/alsa-lib )
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- jack? ( >=media-sound/jack-audio-connection-kit-0.90 )"
-RDEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- -DAUDIOFILE=ON
- $(cmake-utils_use_with mp3 MAD)
- $(cmake-utils_use_with nas NAS)
- $(cmake-utils_use_with alsa ALSA)
- $(cmake-utils_use_with vorbis VORBIS)
- $(cmake-utils_use_with jack JACK)
- # NOTE: WITH_ESD dropped due to remove of esound long ago
- )
-
- trinity-base_src_configure
-}
-
-src_install() {
- trinity-base_src_install
-
- # used for realtime priority, but off by default as it is a security hazard
- use artswrappersuid && chmod u+s "${D}/${PREFIX}/bin/artswrapper"
-}
-
-pkg_postinst() {
- if ! use artswrappersuid ; then
- elog "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
- elog "and so avoid possible skips in sound. However, on untrusted systems this"
- elog "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
- elog "priority, and so is off by default. See bug #7883."
- elog "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
- fi
-}
diff --git a/trinity-base/arts/arts-9999.ebuild b/trinity-base/arts/arts-9999.ebuild
index b205996d..4735503b 100644
--- a/trinity-base/arts/arts-9999.ebuild
+++ b/trinity-base/arts/arts-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=
IUSE="alsa -artswrappersuid jack mp3 nas vorbis"
SLOT="$TRINITY_VER"
-DEPEND="dev-qt/tqtinterface
+DEPEND="dev-tqt/tqtinterface
dev-libs/glib:2
media-libs/audiofile
mp3? ( media-libs/libmad )
diff --git a/trinity-apps/atlantik/atlantik-9999.ebuild b/trinity-base/atlantik/atlantik-9999.ebuild
index 91b6e03b..91b6e03b 100644
--- a/trinity-apps/atlantik/atlantik-9999.ebuild
+++ b/trinity-base/atlantik/atlantik-9999.ebuild
diff --git a/dev-qt/qt/metadata.xml b/trinity-base/atlantik/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/dev-qt/qt/metadata.xml
+++ b/trinity-base/atlantik/metadata.xml
diff --git a/trinity-apps/atlantikdesigner/atlantikdesigner-9999.ebuild b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
index 02f74c70..ff68e820 100644
--- a/trinity-apps/atlantikdesigner/atlantikdesigner-9999.ebuild
+++ b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
@@ -9,4 +9,4 @@ inherit trinity-meta
DESCRIPTION="Atlantik gameboard designer"
KEYWORDS=""
IUSE+=""
-DEPEND=">=trinity-apps/atlantik-${PV}:${SLOT}"
+DEPEND=">=trinity-base/atlantik-${PV}:${SLOT}"
diff --git a/dev-qt/qt4-tqt-engine/metadata.xml b/trinity-base/atlantikdesigner/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/dev-qt/qt4-tqt-engine/metadata.xml
+++ b/trinity-base/atlantikdesigner/metadata.xml
diff --git a/trinity-base/certmanager/Manifest b/trinity-base/certmanager/Manifest
deleted file mode 100644
index d6ce26a1..00000000
--- a/trinity-base/certmanager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdepim-trinity-3.5.13.2.tar.xz 10148724 SHA256 2cbd61e28322e4c7d67ffb16ac59329b3f15ba1a4485095994b9bce6786df7c4 SHA512 a84319183813dc78dc97397c8c3871faa3961b458eda8107525b8b9c6789d13aedd8e3c7cb0706c4ca8dd63f69ff67de02716219c8af44ebf96d484d820eb2bf WHIRLPOOL 907d9d86f1b0094b915989ca7f0feb4f67ac1b238a4c6d176ab1ef9164eff78778b2714ebedeb40de28536a8384b39ec7e637f1bb6911cccb40f7d8663811edb
diff --git a/trinity-base/certmanager/certmanager-3.5.13.2.ebuild b/trinity-base/certmanager/certmanager-3.5.13.2.ebuild
deleted file mode 100644
index 473d1a62..00000000
--- a/trinity-base/certmanager/certmanager-3.5.13.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdepim"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity certificate manager gui"
-KEYWORDS="~amd64 ~x86"
-IUSE+=""
-
-COMMON_DEPEND=">=trinity-base/libkdenetwork-${PV}:${SLOT}
- >=app-crypt/gpgme-1.1.2-r1
- || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )"
- #CHECKME: this is an old kde3-times assertion
- # We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-
-TSM_EXTRACT_ALSO="libkdepim/ libkpgp/ libkdenetwork/"
-
-pkg_postinst() {
- trinity-meta_pkg_postinst
- elog "For X.509 CRL and OCSP support, install app-crypt/dirmngr, please."
-}
diff --git a/trinity-base/dcoprss/Manifest b/trinity-base/dcoprss/Manifest
deleted file mode 100644
index 1d49700d..00000000
--- a/trinity-base/dcoprss/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65
diff --git a/trinity-base/dcoprss/dcoprss-3.5.13.1.ebuild b/trinity-base/dcoprss/dcoprss-3.5.13.1.ebuild
deleted file mode 100644
index def15367..00000000
--- a/trinity-base/dcoprss/dcoprss-3.5.13.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdenetwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity RSS server and client for DCOP"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=trinity-base/librss-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
-
-TSM_EXTRACT_ALSO="librss/"
diff --git a/trinity-base/drkonqi/Manifest b/trinity-base/drkonqi/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/drkonqi/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/drkonqi/drkonqi-3.5.13.1.ebuild b/trinity-base/drkonqi/drkonqi-3.5.13.1.ebuild
deleted file mode 100644
index bfb91450..00000000
--- a/trinity-base/drkonqi/drkonqi-3.5.13.1.ebuild
+++ /dev/null
@@ -1,13 +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
-
-DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND="sys-devel/gdb"
diff --git a/trinity-base/drkonqi/drkonqi-3.5.13.2.ebuild b/trinity-base/drkonqi/drkonqi-3.5.13.2.ebuild
deleted file mode 100644
index 010e9de1..00000000
--- a/trinity-base/drkonqi/drkonqi-3.5.13.2.ebuild
+++ /dev/null
@@ -1,13 +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
-
-DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-devel/gdb"
diff --git a/trinity-base/eyesapplet/Manifest b/trinity-base/eyesapplet/Manifest
deleted file mode 100644
index 23ad5010..00000000
--- a/trinity-base/eyesapplet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdetoys-3.5.13.1.tar.gz 3037255 SHA256 41e4224bcf816e52877b17d2dcdc86d94e8f304fee2d3fb35b97921544eafd9d SHA512 e7cd7943004e5d1ec83c0fe484fab82f2cdd5f5d39ee77db419938f023cd3c42ba0b257d0ddc783de7bd528c90195821d810babfa193c60856437593c24ce879 WHIRLPOOL 8d482537f972a24b1cef9ad789edd314517f4e3a6b37056f47d92292c8c30e70def24e99efc552b4504503e2224e1209ae946ff34ac94feaf128c038c54f010d
-DIST kdetoys-trinity-3.5.13.2.tar.xz 2757260 SHA256 a0533ceb6fb103600eb33ef3136d40f84ec826e24e0b95cc45e68ef73a5232f6 SHA512 eb67a70d75a473f885db8993f5eebd3480e68e43e4de60240fde411696ed8b895029505a5125fe51a41d6ccb583ba50c4c67465d770f14f9a1c1533281154f78 WHIRLPOOL d79f58085d2af17453fc50c621ea6fe6909d476cf5f0a6b6ccf51ef69eed0ba073091f587439eb5afd644e0286dfe2ee86ccd903346d3060c3fe90299511018a
diff --git a/trinity-base/eyesapplet/eyesapplet-3.5.13.1.ebuild b/trinity-base/eyesapplet/eyesapplet-3.5.13.1.ebuild
deleted file mode 100644
index dd796568..00000000
--- a/trinity-base/eyesapplet/eyesapplet-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/trinity-base/eyesapplet/eyesapplet-3.5.13.2.ebuild b/trinity-base/eyesapplet/eyesapplet-3.5.13.2.ebuild
deleted file mode 100644
index 5660d0e0..00000000
--- a/trinity-base/eyesapplet/eyesapplet-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-base/fifteenapplet/Manifest b/trinity-base/fifteenapplet/Manifest
deleted file mode 100644
index 23ad5010..00000000
--- a/trinity-base/fifteenapplet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdetoys-3.5.13.1.tar.gz 3037255 SHA256 41e4224bcf816e52877b17d2dcdc86d94e8f304fee2d3fb35b97921544eafd9d SHA512 e7cd7943004e5d1ec83c0fe484fab82f2cdd5f5d39ee77db419938f023cd3c42ba0b257d0ddc783de7bd528c90195821d810babfa193c60856437593c24ce879 WHIRLPOOL 8d482537f972a24b1cef9ad789edd314517f4e3a6b37056f47d92292c8c30e70def24e99efc552b4504503e2224e1209ae946ff34ac94feaf128c038c54f010d
-DIST kdetoys-trinity-3.5.13.2.tar.xz 2757260 SHA256 a0533ceb6fb103600eb33ef3136d40f84ec826e24e0b95cc45e68ef73a5232f6 SHA512 eb67a70d75a473f885db8993f5eebd3480e68e43e4de60240fde411696ed8b895029505a5125fe51a41d6ccb583ba50c4c67465d770f14f9a1c1533281154f78 WHIRLPOOL d79f58085d2af17453fc50c621ea6fe6909d476cf5f0a6b6ccf51ef69eed0ba073091f587439eb5afd644e0286dfe2ee86ccd903346d3060c3fe90299511018a
diff --git a/trinity-base/fifteenapplet/fifteenapplet-3.5.13.1.ebuild b/trinity-base/fifteenapplet/fifteenapplet-3.5.13.1.ebuild
deleted file mode 100644
index 79103ef1..00000000
--- a/trinity-base/fifteenapplet/fifteenapplet-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/trinity-base/fifteenapplet/fifteenapplet-3.5.13.2.ebuild b/trinity-base/fifteenapplet/fifteenapplet-3.5.13.2.ebuild
deleted file mode 100644
index b38224d4..00000000
--- a/trinity-base/fifteenapplet/fifteenapplet-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdetoys"
-
-inherit trinity-meta
-
-DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-apps/filelight/filelight-9999.ebuild b/trinity-base/filelight/filelight-9999.ebuild
index b99b9b37..b99b9b37 100644
--- a/trinity-apps/filelight/filelight-9999.ebuild
+++ b/trinity-base/filelight/filelight-9999.ebuild
diff --git a/dev-qt/tqt/metadata.xml b/trinity-base/filelight/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/dev-qt/tqt/metadata.xml
+++ b/trinity-base/filelight/metadata.xml
diff --git a/trinity-base/kaddressbook/Manifest b/trinity-base/kaddressbook/Manifest
deleted file mode 100644
index d6ce26a1..00000000
--- a/trinity-base/kaddressbook/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdepim-trinity-3.5.13.2.tar.xz 10148724 SHA256 2cbd61e28322e4c7d67ffb16ac59329b3f15ba1a4485095994b9bce6786df7c4 SHA512 a84319183813dc78dc97397c8c3871faa3961b458eda8107525b8b9c6789d13aedd8e3c7cb0706c4ca8dd63f69ff67de02716219c8af44ebf96d484d820eb2bf WHIRLPOOL 907d9d86f1b0094b915989ca7f0feb4f67ac1b238a4c6d176ab1ef9164eff78778b2714ebedeb40de28536a8384b39ec7e637f1bb6911cccb40f7d8663811edb
diff --git a/trinity-base/kaddressbook/kaddressbook-3.5.13.2.ebuild b/trinity-base/kaddressbook/kaddressbook-3.5.13.2.ebuild
deleted file mode 100644
index 9e41727b..00000000
--- a/trinity-base/kaddressbook/kaddressbook-3.5.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdepim"
-
-inherit trinity-meta
-
-DESCRIPTION="The Trinity Address Book"
-KEYWORDS="~amd64 ~x86"
-IUSE+=" gnokii"
-
-COMMON_DEPEND=">=trinity-base/libkdepim-${PV}:${SLOT}
- >=trinity-base/libkcal-${PV}:${SLOT}
- >=trinity-base/certmanager-${PV}:${SLOT}
- >=trinity-base/libkdenetwork-${PV}:${SLOT}
- gnokii? ( app-mobilephone/gnokii )"
-
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-
-TSM_EXTRACT_ALSO="certmanager/lib/
- libkdepim/
- libkdenetwork/
- libkcal/
- libemailfunctions/"
-
-src_configure () {
- mycmakeargs=(
- $(cmake-utils_use_with gnokii GNOKII )
- )
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kamera/Manifest b/trinity-base/kamera/Manifest
deleted file mode 100644
index f0ba54e9..00000000
--- a/trinity-base/kamera/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-3.5.13.1.tar.gz 7526074 SHA256 19bd36e261bb6c5d2c9c1eba5f736c642b48422d917d44e576835f7ebb44906b SHA512 693e5ad70dbb00c587e588acfb81fc9475c3a4dbc86f41d6053c0584c533349a7564e34b870cb7bbc57361ac539da6f7d7f1b002ac3cfe8b0201db3eeb9147dd WHIRLPOOL fd2c46c517b3a0293880eaf35967295485555b936d0f1e80e0f2c261a1164cfcc5c4b2d943a12c073914d33b59974cc2dd92a78414614caa10f46dd048d518b4
diff --git a/trinity-base/kamera/kamera-3.5.13.1.ebuild b/trinity-base/kamera/kamera-3.5.13.1.ebuild
deleted file mode 100644
index adf2f405..00000000
--- a/trinity-base/kamera/kamera-3.5.13.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdegraphics"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity digital camera manager"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="media-libs/libgphoto2"
-RDEPEND="$DEPEND"
diff --git a/trinity-base/kappfinder/Manifest b/trinity-base/kappfinder/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kappfinder/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/kappfinder/kappfinder-3.5.13.1.ebuild b/trinity-base/kappfinder/kappfinder-3.5.13.1.ebuild
deleted file mode 100644
index 04e7dfdd..00000000
--- a/trinity-base/kappfinder/kappfinder-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Trinity tool that generates *.desktop files for well known apps"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kappfinder/kappfinder-3.5.13.2.ebuild b/trinity-base/kappfinder/kappfinder-3.5.13.2.ebuild
deleted file mode 100644
index 4efc413e..00000000
--- a/trinity-base/kappfinder/kappfinder-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Trinity tool that generates *.desktop files for well known apps"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-apps/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild
index d9691a0c..d9691a0c 100644
--- a/trinity-apps/kasteroids/kasteroids-9999.ebuild
+++ b/trinity-base/kasteroids/kasteroids-9999.ebuild
diff --git a/net-irc/konversation/metadata.xml b/trinity-base/kasteroids/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/net-irc/konversation/metadata.xml
+++ b/trinity-base/kasteroids/metadata.xml
diff --git a/trinity-base/kate/Manifest b/trinity-base/kate/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kate/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/kate/kate-3.5.13.1.ebuild b/trinity-base/kate/kate-3.5.13.1.ebuild
deleted file mode 100644
index 42a04559..00000000
--- a/trinity-base/kate/kate-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kate/kate-3.5.13.2.ebuild b/trinity-base/kate/kate-3.5.13.2.ebuild
deleted file mode 100644
index 7703f9c3..00000000
--- a/trinity-base/kate/kate-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-apps/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild
index 6b601094..6b601094 100644
--- a/trinity-apps/katomic/katomic-9999.ebuild
+++ b/trinity-base/katomic/katomic-9999.ebuild
diff --git a/trinity-apps/atlantik/metadata.xml b/trinity-base/katomic/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/trinity-apps/atlantik/metadata.xml
+++ b/trinity-base/katomic/metadata.xml
diff --git a/trinity-apps/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
index 7f8d4728..7f8d4728 100644
--- a/trinity-apps/kbackgammon/kbackgammon-9999.ebuild
+++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
diff --git a/trinity-apps/atlantikdesigner/metadata.xml b/trinity-base/kbackgammon/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/trinity-apps/atlantikdesigner/metadata.xml
+++ b/trinity-base/kbackgammon/metadata.xml
diff --git a/trinity-apps/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild
index 11e94f70..11e94f70 100644
--- a/trinity-apps/kbattleship/kbattleship-9999.ebuild
+++ b/trinity-base/kbattleship/kbattleship-9999.ebuild
diff --git a/trinity-apps/filelight/metadata.xml b/trinity-base/kbattleship/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/trinity-apps/filelight/metadata.xml
+++ b/trinity-base/kbattleship/metadata.xml
diff --git a/trinity-apps/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild
index 4b8ec143..4b8ec143 100644
--- a/trinity-apps/kblackbox/kblackbox-9999.ebuild
+++ b/trinity-base/kblackbox/kblackbox-9999.ebuild
diff --git a/trinity-apps/kasteroids/metadata.xml b/trinity-base/kblackbox/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/trinity-apps/kasteroids/metadata.xml
+++ b/trinity-base/kblackbox/metadata.xml
diff --git a/trinity-apps/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild
index ee2216cf..ee2216cf 100644
--- a/trinity-apps/kbounce/kbounce-9999.ebuild
+++ b/trinity-base/kbounce/kbounce-9999.ebuild
diff --git a/trinity-apps/katomic/metadata.xml b/trinity-base/kbounce/metadata.xml
index 6e9f5e4a..6e9f5e4a 100644
--- a/trinity-apps/katomic/metadata.xml
+++ b/trinity-base/kbounce/metadata.xml
diff --git a/trinity-base/kcalc/Manifest b/trinity-base/kcalc/Manifest
deleted file mode 100644
index c59ac62b..00000000
--- a/trinity-base/kcalc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdeutils-3.5.13.1.tar.gz 2829393 SHA256 3e7ab07fe1bb3e7be7ac3a3796366c88d3b79a58af911546e2c65e32363db527 SHA512 48733e472d0f5da85ef8a32ed6db7fa5e61f0682e49842439e6ea38a1e407059bb35efffe41fc6ed1a718511fd5b2b2c8222d816a23500a4dcbca17461f9a3bd WHIRLPOOL 1488e0c44f60b4d5e397dd2cf93de048eae1b915d4b2b7b1cf27768946f5aae3b5bcc3971ee28b5fa6a57a0b94cca6db0866138b69ad74f1f7bb97cdaaebdbe2
-DIST kdeutils-trinity-3.5.13.2.tar.xz 2259232 SHA256 b2999b9ef39bb2f269b84fdf34a814b5a5599aae7d05538d0bf680c18fb334fa SHA512 f501aa4b61bf440e873eec96f09c0c24ad780db2f9f14b884001c04c04aafccb5afb2b492dcf4fc640f3ec35d86aa419d67936122648a986662cd7b7f4f8a2d8 WHIRLPOOL 49296006875250212f0fdeb0c90c4f69cf0aa7cfd38415e2f7b50bdf81754de64562df2400f4932a502adbe84b58be34cae6c029d68cc62d0e91de5158513239
diff --git a/trinity-base/kcalc/kcalc-3.5.13.1.ebuild b/trinity-base/kcalc/kcalc-3.5.13.1.ebuild
deleted file mode 100644
index 37989f20..00000000
--- a/trinity-base/kcalc/kcalc-3.5.13.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity calculator"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="dev-libs/gmp:*"
-RDEPEND="${DEPEND}"
diff --git a/trinity-base/kcalc/kcalc-3.5.13.2.ebuild b/trinity-base/kcalc/kcalc-3.5.13.2.ebuild
deleted file mode 100644
index 00e77886..00000000
--- a/trinity-base/kcalc/kcalc-3.5.13.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity calculator"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-libs/gmp:*"
-RDEPEND="${DEPEND}"
diff --git a/trinity-base/kcharselect/Manifest b/trinity-base/kcharselect/Manifest
deleted file mode 100644
index c59ac62b..00000000
--- a/trinity-base/kcharselect/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdeutils-3.5.13.1.tar.gz 2829393 SHA256 3e7ab07fe1bb3e7be7ac3a3796366c88d3b79a58af911546e2c65e32363db527 SHA512 48733e472d0f5da85ef8a32ed6db7fa5e61f0682e49842439e6ea38a1e407059bb35efffe41fc6ed1a718511fd5b2b2c8222d816a23500a4dcbca17461f9a3bd WHIRLPOOL 1488e0c44f60b4d5e397dd2cf93de048eae1b915d4b2b7b1cf27768946f5aae3b5bcc3971ee28b5fa6a57a0b94cca6db0866138b69ad74f1f7bb97cdaaebdbe2
-DIST kdeutils-trinity-3.5.13.2.tar.xz 2259232 SHA256 b2999b9ef39bb2f269b84fdf34a814b5a5599aae7d05538d0bf680c18fb334fa SHA512 f501aa4b61bf440e873eec96f09c0c24ad780db2f9f14b884001c04c04aafccb5afb2b492dcf4fc640f3ec35d86aa419d67936122648a986662cd7b7f4f8a2d8 WHIRLPOOL 49296006875250212f0fdeb0c90c4f69cf0aa7cfd38415e2f7b50bdf81754de64562df2400f4932a502adbe84b58be34cae6c029d68cc62d0e91de5158513239
diff --git a/trinity-base/kcharselect/kcharselect-3.5.13.1.ebuild b/trinity-base/kcharselect/kcharselect-3.5.13.1.ebuild
deleted file mode 100644
index a2bd385c..00000000
--- a/trinity-base/kcharselect/kcharselect-3.5.13.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-TRINITY_SUBMODULE="${PN} charselectapplet"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity character selection utility and panel applet"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kcharselect/kcharselect-3.5.13.2.ebuild b/trinity-base/kcharselect/kcharselect-3.5.13.2.ebuild
deleted file mode 100644
index f333242b..00000000
--- a/trinity-base/kcharselect/kcharselect-3.5.13.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-TRINITY_SUBMODULE="${PN} charselectapplet"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity character selection utility and panel applet"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
diff --git a/trinity-base/kcheckpass/Manifest b/trinity-base/kcheckpass/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kcheckpass/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/kcheckpass/kcheckpass-3.5.13.1.ebuild b/trinity-base/kcheckpass/kcheckpass-3.5.13.1.ebuild
deleted file mode 100644
index ccae69c9..00000000
--- a/trinity-base/kcheckpass/kcheckpass-3.5.13.1.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="x86 amd64"
-IUSE="pam"
-
-RDEPEND="
- pam? ( trinity-base/tdebase-pam )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- -D_WITH_SHADOW=ON
- $(cmake-utils_use_with pam PAM)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kcheckpass/kcheckpass-3.5.13.2.ebuild b/trinity-base/kcheckpass/kcheckpass-3.5.13.2.ebuild
deleted file mode 100644
index 326b0578..00000000
--- a/trinity-base/kcheckpass/kcheckpass-3.5.13.2.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~amd64 ~x86"
-IUSE="pam"
-
-RDEPEND="
- pam? ( trinity-base/tdebase-pam )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- mycmakeargs=(
- -D_WITH_SHADOW=ON
- $(cmake-utils_use_with pam PAM)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kcheckpass/kcheckpass-9999.ebuild b/trinity-base/kcheckpass/kcheckpass-9999.ebuild
index 3e9cfadd..ce4b8640 100644
--- a/trinity-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/trinity-base/kcheckpass/kcheckpass-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=
IUSE="pam"
RDEPEND="
- pam? ( virtual/pam )"
+ pam? ( sys-libs/pam )"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/trinity-base/kcminit/Manifest b/trinity-base/kcminit/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kcminit/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/kcminit/files/shared b/trinity-base/kcminit/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kcminit/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files \ No newline at end of file
diff --git a/trinity-base/kcminit/kcminit-3.5.13.1.ebuild b/trinity-base/kcminit/kcminit-3.5.13.1.ebuild
deleted file mode 100644
index c811abce..00000000
--- a/trinity-base/kcminit/kcminit-3.5.13.1.ebuild
+++ /dev/null
@@ -1,17 +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
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst"
-RDEPEND="${RDEPEND}"
diff --git a/trinity-base/kcminit/kcminit-3.5.13.2.ebuild b/trinity-base/kcminit/kcminit-3.5.13.2.ebuild
deleted file mode 100644
index c9666663..00000000
--- a/trinity-base/kcminit/kcminit-3.5.13.2.ebuild
+++ /dev/null
@@ -1,17 +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
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst"
-RDEPEND="${RDEPEND}"
diff --git a/trinity-base/kcoloredit/Manifest b/trinity-base/kcoloredit/Manifest
deleted file mode 100644
index f0ba54e9..00000000
--- a/trinity-base/kcoloredit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-3.5.13.1.tar.gz 7526074 SHA256 19bd36e261bb6c5d2c9c1eba5f736c642b48422d917d44e576835f7ebb44906b SHA512 693e5ad70dbb00c587e588acfb81fc9475c3a4dbc86f41d6053c0584c533349a7564e34b870cb7bbc57361ac539da6f7d7f1b002ac3cfe8b0201db3eeb9147dd WHIRLPOOL fd2c46c517b3a0293880eaf35967295485555b936d0f1e80e0f2c261a1164cfcc5c4b2d943a12c073914d33b59974cc2dd92a78414614caa10f46dd048d518b4
diff --git a/trinity-base/kcoloredit/kcoloredit-3.5.13.1.ebuild b/trinity-base/kcoloredit/kcoloredit-3.5.13.1.ebuild
deleted file mode 100644
index 672997d8..00000000
--- a/trinity-base/kcoloredit/kcoloredit-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdegraphics"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity color selector/editor"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kcontrol/Manifest b/trinity-base/kcontrol/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kcontrol/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/kcontrol/kcontrol-3.5.13.1.ebuild b/trinity-base/kcontrol/kcontrol-3.5.13.1.ebuild
deleted file mode 100644
index bc339bb3..00000000
--- a/trinity-base/kcontrol/kcontrol-3.5.13.1.ebuild
+++ /dev/null
@@ -1,47 +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
-
-DESCRIPTION="The Trinity Control Center"
-KEYWORDS="x86 amd64"
-IUSE="samba logitech-mouse ieee1394"
-
-SLOT="$TRINITY_VER"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXcursor
- x11-libs/libXrandr
- samba? ( net-fs/samba )
- logitech-mouse? ( virtual/libusb:0 )
- ieee1394? ( sys-libs/libraw1394 )
- >=trinity-base/libkonq-${PV}:${SLOT}
- >=trinity-base/kicker-${PV}:${SLOT}"
-
-RDEPEND="${DEPEND}
- sys-apps/usbutils
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/kdebase-data-${PV}:${SLOT}
- >=trinity-base/kdesu-${PV}:${SLOT}
- >=trinity-base/khelpcenter-${PV}:${SLOT}
- >=trinity-base/khotkeys-${PV}:${SLOT}"
-
-TSM_EXTRACT_ALSO="kicker/ kwin/ kdesktop/ klipper/ kxkb/"
-
-src_configure() {
- mycmakeargs=(
- -DWITH_XCURSOR=ON
- -DWITH_XRANDR=ON
- -DWITH_XRENDER=ON
- -DWITH_USBIDS=/usr/share/misc/usb.ids
- $(cmake-utils_use_with samba SAMBA)
- $(cmake-utils_use_with logitech-mouse LIBUSB)
- $(cmake-utils_use_with ieee1394 LIBRAW1394)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kcontrol/kcontrol-3.5.13.2.ebuild b/trinity-base/kcontrol/kcontrol-3.5.13.2.ebuild
deleted file mode 100644
index 043b575b..00000000
--- a/trinity-base/kcontrol/kcontrol-3.5.13.2.ebuild
+++ /dev/null
@@ -1,47 +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
-
-DESCRIPTION="The Trinity Control Center"
-KEYWORDS="~amd64 ~x86"
-IUSE="samba logitech-mouse ieee1394"
-
-SLOT="$TRINITY_VER"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXcursor
- x11-libs/libXrandr
- samba? ( net-fs/samba )
- logitech-mouse? ( virtual/libusb:0 )
- ieee1394? ( sys-libs/libraw1394 )
- >=trinity-base/libkonq-${PV}:${SLOT}
- >=trinity-base/kicker-${PV}:${SLOT}"
-
-RDEPEND="${DEPEND}
- sys-apps/usbutils
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/kdebase-data-${PV}:${SLOT}
- >=trinity-base/kdesu-${PV}:${SLOT}
- >=trinity-base/khelpcenter-${PV}:${SLOT}
- >=trinity-base/khotkeys-${PV}:${SLOT}"
-
-TSM_EXTRACT_ALSO="kicker/ kwin/ kdesktop/ klipper/ kxkb/"
-
-src_configure() {
- mycmakeargs=(
- -DWITH_XCURSOR=ON
- -DWITH_XRANDR=ON
- -DWITH_XRENDER=ON
- -DWITH_USBIDS=/usr/share/misc/usb.ids
- $(cmake-utils_use_with samba SAMBA)
- $(cmake-utils_use_with logitech-mouse LIBUSB)
- $(cmake-utils_use_with ieee1394 LIBRAW1394)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kdcop/Manifest b/trinity-base/kdcop/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdcop/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/kdcop/kdcop-3.5.13.1.ebuild b/trinity-base/kdcop/kdcop-3.5.13.1.ebuild
deleted file mode 100644
index c8bac756..00000000
--- a/trinity-base/kdcop/kdcop-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Trinity: graphical DCOP browser/client"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdcop/kdcop-3.5.13.2.ebuild b/trinity-base/kdcop/kdcop-3.5.13.2.ebuild
deleted file mode 100644
index d25a0dfd..00000000
--- a/trinity-base/kdcop/kdcop-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="Trinity: graphical DCOP browser/client"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-base/kde-i18n/Manifest b/trinity-base/kde-i18n/Manifest
deleted file mode 100644
index 648109bc..00000000
--- a/trinity-base/kde-i18n/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-i18n-3.5.13.1.tar.gz 378322677 SHA256 659ce86b7b86583c59ffd6118c563b69f185ce0125b58a6d1babcf1f020a1e0a SHA512 cbfdacd92b2e064ecc9fc00cbab3d362e6a8c015e15db7b63255209f9b20ecbea6e32c503720834c8a7882447eefd659cb2198ac5cc4ecfdd3baabc741e5ddc1 WHIRLPOOL b4478ad7fff628fd152e84c98f2e19a945a46aa579a79f97823ffff961763b83554ae21a4725bc1534e28fe2795b8dea746fb920a1def9da8c4dafa56ba448f9
diff --git a/trinity-base/kde-i18n/kde-i18n-3.5.13.1.ebuild b/trinity-base/kde-i18n/kde-i18n-3.5.13.1.ebuild
deleted file mode 100644
index 00b9d15e..00000000
--- a/trinity-base/kde-i18n/kde-i18n-3.5.13.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kde-i18n"
-
-inherit eutils trinity-base
-
-set-trinityver
-
-DESCRIPTION="Trinity internationalization package"
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2"
-
-SLOT="${TRINITY_VER}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- sys-devel/libtool
- >=sys-devel/automake-1.10.1"
-RDEPEND=""
-
-LANGS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et
-eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms
-nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te
-tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW"
-
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
- local tarball tarfile tarparams f extractlist postfix
-
- case ${A} in
- *.gz)
- tarparams=" --gzip"
- postfix="gz"
- ;;
- *.bz2)
- tarparams=" --bzip2"
- postfix="bz2"
- ;;
- esac
-
- tarfile="${DISTDIR}/${A}"
- topdir="${A%.tar.*}"
-
- for X in ${LANGS} ; do
- use "linguas_${X}" && extractlist+=" ${topdir}/tde-i18n-${X#linguas_}"
- done
-
- if [[ -z ${LINGUAS} ]] || [[ -z "${extractlist}" && "${LINGUAS}" != "en" ]]; then
- echo
- ewarn "You either have the LINGUAS environment variable unset or it"
- ewarn "contains languages not supported by trinity-base/kde-i18n."
- ewarn "Because of that, kde-i18n will not add any kind of language"
- ewarn "support."
- ewarn
- ewarn "If you didn't intend this to happen, the available language"
- ewarn "codes are:"
- ewarn "${LANGS}"
- echo
- fi
-
- extractlist+=" ${topdir}/admin"
-
- ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
- tar -xpf "${tarfile}" ${tarparams} -C "${WORKDIR}" ${extractlist} 2> /dev/null \
- || echo "tar extract command failed at least partially - continuing anyway"
-}
-
-src_prepare(){
- cp -Rp /usr/share/libtool/config/ltmain.sh "${S}/admin/ltmain.sh"
- cp -Rp /usr/share/aclocal/libtool.m4 "${S}/admin/libtool.m4.in"
- for dir in $(ls -d "${S}"/tde-i18n-*); do
- einfo "Preparing $dir"
- cd "$dir" && emake -f "admin/Makefile.common";
- done
-}
-
-src_configure() {
- PREFIX="${TDEDIR}"
- for dir in $(ls -d "${S}"/tde-i18n-*); do
- einfo "Configuring $dir"
- cd "${dir}" && econf \
- --without-arts \
- --prefix="${PREFIX}" \
- --mandir="${PREFIX}/share/man"\
- --infodir="${PREFIX}/share/info" \
- --datadir="${PREFIX}/share" \
- --sysconfdir="${PREFIX}/etc"
- done
-}
-
-src_compile() {
- for dir in $(ls -d "${S}"/tde-i18n-*); do
- einfo "Compiling $dir"
- cd "${dir}" && emake;
- done
-}
-
-src_install() {
- for dir in $(ls -d "${S}"/tde-i18n-*); do
- einfo "Installing $dir"
- cd "${dir}" && emake install DESTDIR="${D}"
- done
-}
diff --git a/trinity-base/kde-i18n/metadata.xml b/trinity-base/kde-i18n/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kde-i18n/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-emoticons/Manifest b/trinity-base/kdeartwork-emoticons/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-emoticons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.13.1.ebuild b/trinity-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.13.1.ebuild
deleted file mode 100644
index 514c60be..00000000
--- a/trinity-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdeartwork-emoticons/metadata.xml b/trinity-base/kdeartwork-emoticons/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-emoticons/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-icewm-themes/Manifest b/trinity-base/kdeartwork-icewm-themes/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-icewm-themes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.13.1.ebuild b/trinity-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.13.1.ebuild
deleted file mode 100644
index 82efd335..00000000
--- a/trinity-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.13.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Themes for IceWM from the Trinityartwork package."
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND="$DEPEND
- >=trinity-base/kdeartwork-kwin-styles-${PV}:${SLOT}"
-
-pkg_postinst() {
- elog "More IceWM themes are available installing x11-themes/icewm-themes"
-}
diff --git a/trinity-base/kdeartwork-icewm-themes/metadata.xml b/trinity-base/kdeartwork-icewm-themes/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-icewm-themes/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-icon-themes/Manifest b/trinity-base/kdeartwork-icon-themes/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-icon-themes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-icon-themes/kdeartwork-icon-themes-3.5.13.1.ebuild b/trinity-base/kdeartwork-icon-themes/kdeartwork-icon-themes-3.5.13.1.ebuild
deleted file mode 100644
index 44b6e14e..00000000
--- a/trinity-base/kdeartwork-icon-themes/kdeartwork-icon-themes-3.5.13.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-KMMODULE="IconThemes"
-
-DESCRIPTION="Icon themes for Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-TSM_EXTRACT="IconThemes/"
diff --git a/trinity-base/kdeartwork-icon-themes/metadata.xml b/trinity-base/kdeartwork-icon-themes/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-icon-themes/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-kscreensaver/Manifest b/trinity-base/kdeartwork-kscreensaver/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-kscreensaver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.13.1.ebuild b/trinity-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.13.1.ebuild
deleted file mode 100644
index d76efa4b..00000000
--- a/trinity-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.13.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Extra screensavers for Trinity"
-KEYWORDS="x86 amd64"
-IUSE="opengl xscreensaver arts"
-
-DEPEND="
- >=trinity-base/kscreensaver-${PV}:${SLOT}
- >=trinity-base/krootbacking-${PV}:${SLOT}
- media-libs/libart_lgpl
- opengl? ( virtual/opengl )
- xscreensaver? ( x11-misc/xscreensaver )
- arts? ( trinity-base/arts )"
-RDEPEND="$DEPEND"
-
-TSM_EXTRACT_ALSO="FindXscreensaver.cmake"
-
-src_configure() {
- mycmakeargs=(
- -DWITH_LIBART=ON
- $(cmake-utils_use_with opengl OPENGL)
- $(cmake-utils_use_with xscreensaver XSCREENSAVER)
- $(cmake-utils_use_with arts ARTS)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kdeartwork-kscreensaver/metadata.xml b/trinity-base/kdeartwork-kscreensaver/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-kscreensaver/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-kwin-styles/Manifest b/trinity-base/kdeartwork-kwin-styles/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-kwin-styles/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.13.1.ebuild b/trinity-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.13.1.ebuild
deleted file mode 100644
index 1efdbc7e..00000000
--- a/trinity-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.13.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-DESCRIPTION="Window styles for Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND=">=trinity-base/kwin-${PV}:${SLOT}"
-RDEPEND="$DEPEND"
diff --git a/trinity-base/kdeartwork-kwin-styles/metadata.xml b/trinity-base/kdeartwork-kwin-styles/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-kwin-styles/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-kworldclock/Manifest b/trinity-base/kdeartwork-kworldclock/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-kworldclock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.13.1.ebuild b/trinity-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.13.1.ebuild
deleted file mode 100644
index 6cd0eda1..00000000
--- a/trinity-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.13.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND="$DEPEND
- >=trinity-base/kworldclock-${PV}:${SLOT}"
diff --git a/trinity-base/kdeartwork-kworldclock/metadata.xml b/trinity-base/kdeartwork-kworldclock/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-kworldclock/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-meta/kdeartwork-meta-3.5.13.1.ebuild b/trinity-base/kdeartwork-meta/kdeartwork-meta-3.5.13.1.ebuild
deleted file mode 100644
index 662646f9..00000000
--- a/trinity-base/kdeartwork-meta/kdeartwork-meta-3.5.13.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit trinity-functions
-
-set-trinityver
-
-DESCRIPTION="kdeartwork meta package - merge this to pull in all kdeartwork-derived packages"
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64"
-
-SLOT="$TRINITY_VER"
-IUSE=""
-
-RDEPEND="
- >=trinity-base/kdeartwork-emoticons-${PV}:${SLOT}
- >=trinity-base/kdeartwork-icon-themes-${PV}:${SLOT}
- >=trinity-base/kdeartwork-icewm-themes-${PV}:${SLOT}
- >=trinity-base/kdeartwork-kscreensaver-${PV}:${SLOT}
- >=trinity-base/kdeartwork-kwin-styles-${PV}:${SLOT}
- >=trinity-base/kdeartwork-kworldclock-${PV}:${SLOT}
- >=trinity-base/kdeartwork-sounds-${PV}:${SLOT}
- >=trinity-base/kdeartwork-styles-${PV}:${SLOT}
- >=trinity-base/kdeartwork-wallpapers-${PV}:${SLOT}"
diff --git a/trinity-base/kdeartwork-meta/metadata.xml b/trinity-base/kdeartwork-meta/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-meta/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-sounds/Manifest b/trinity-base/kdeartwork-sounds/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-sounds/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-sounds/kdeartwork-sounds-3.5.13.1.ebuild b/trinity-base/kdeartwork-sounds/kdeartwork-sounds-3.5.13.1.ebuild
deleted file mode 100644
index f1e9fc1a..00000000
--- a/trinity-base/kdeartwork-sounds/kdeartwork-sounds-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Extra sound themes for Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdeartwork-sounds/metadata.xml b/trinity-base/kdeartwork-sounds/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-sounds/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-styles/Manifest b/trinity-base/kdeartwork-styles/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-styles/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-styles/kdeartwork-styles-3.5.13.1.ebuild b/trinity-base/kdeartwork-styles/kdeartwork-styles-3.5.13.1.ebuild
deleted file mode 100644
index ce394cf1..00000000
--- a/trinity-base/kdeartwork-styles/kdeartwork-styles-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Extra styles for Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdeartwork-styles/metadata.xml b/trinity-base/kdeartwork-styles/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-styles/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeartwork-wallpapers/Manifest b/trinity-base/kdeartwork-wallpapers/Manifest
deleted file mode 100644
index 339bae1e..00000000
--- a/trinity-base/kdeartwork-wallpapers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeartwork-3.5.13.1.tar.gz 27560795 SHA256 048f7eb031808d9216156c76fde96844021bd0d310301f8b83593b57f121b641 SHA512 4fc5a1746af087ba7f6852751533efd918a1e617553ba7e8280c00ecd59b51ef0eaad622a9d0f2e675a16aa427f36049dc46adbbfd58b27cac4fbe1ff3442172 WHIRLPOOL 43151d5639d0aa26530b5b52b071955ca3f1b0be007557b57fb17d955820105ea11a96c397eb0a8a41ac2a61e5e1d243cae74d6e7f2e31eb4f1a4128988a4e81
diff --git a/trinity-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.13.1.ebuild b/trinity-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.13.1.ebuild
deleted file mode 100644
index fff19374..00000000
--- a/trinity-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeartwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Wallpapers from Trinity"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdeartwork-wallpapers/metadata.xml b/trinity-base/kdeartwork-wallpapers/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeartwork-wallpapers/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdebase-data/Manifest b/trinity-base/kdebase-data/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdebase-data/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/kdebase-data/kdebase-data-3.5.13.1.ebuild b/trinity-base/kdebase-data/kdebase-data-3.5.13.1.ebuild
deleted file mode 100644
index 086034d1..00000000
--- a/trinity-base/kdebase-data/kdebase-data-3.5.13.1.ebuild
+++ /dev/null
@@ -1,13 +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
-
-TRINITY_SUBMODULE="l10n pics applnk"
-
-DESCRIPTION="Icons, localization data and .desktop files from kdebase."
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdebase-data/kdebase-data-3.5.13.2.ebuild b/trinity-base/kdebase-data/kdebase-data-3.5.13.2.ebuild
deleted file mode 100644
index 55d0c5d5..00000000
--- a/trinity-base/kdebase-data/kdebase-data-3.5.13.2.ebuild
+++ /dev/null
@@ -1,13 +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
-
-TRINITY_SUBMODULE="l10n pics applnk"
-
-DESCRIPTION="Icons, localization data and .desktop files from kdebase."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-base/kdebase-data/metadata.xml b/trinity-base/kdebase-data/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdebase-data/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdebase-kioslaves/Manifest b/trinity-base/kdebase-kioslaves/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdebase-kioslaves/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/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch b/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch
deleted file mode 100644
index ebde62e5..00000000
--- a/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 3834f6d..8dc8a3f 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -233,7 +233,6 @@ find_package( TQt )
- find_package( TDE )
-
-
--# dbus-tqt need Qt flags
- # dbus (kdm, ksmserver)
- if( BUILD_KDM OR BUILD_KSMSERVER )
-
-@@ -242,6 +241,11 @@ if( BUILD_KDM OR BUILD_KSMSERVER )
- tde_message_fatal( "dbus-1 is required, but was not found on your system" )
- endif( )
-
-+endif( )
-+
-+
-+# dbus-tqt (kdm, ksmserver, kioslaves(media))
-+if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
- # check for dbus-tqt
- pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
diff --git a/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch b/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch
deleted file mode 100644
index 4e981bc9..00000000
--- a/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d36ee0e..e91f8e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -220,15 +220,6 @@ if( BUILD_STARTKDE )
- endif()
-
-
--##### Determine whether older manpage support is used ##########
--
--if( EXISTS "/usr/sbin/makewhatis" )
-- set( WITH_MAKEWHATIS "1" )
-- message( STATUS "Selected makewhatis for kio-man on your system" )
--else()
-- message( STATUS "Selected man-db for kio-man on your system" )
--endif()
--
- ##### Checks for a distribution-specific 1st menu item, generally a control center
- if(EXISTS "/usr/share/applications/YaST.desktop")
- set( KICKOFF_DIST_CONFIG_SHORTCUT1 "/usr/share/applications/YaST.desktop" )
-diff --git a/config.h.cmake b/config.h.cmake
-index d41643b..7a86d97 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -182,9 +182,6 @@
- // Defined when wanting ksmserver shutdown debugging timing markers in .xsession-errors
- #cmakedefine BUILD_PROFILE_SHUTDOWN 1
-
--// Use makewhatis manpage support
--#cmakedefine WITH_MAKEWHATIS "@WITH_MAKEWHATIS@"
--
- // Kickoff menu
- #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT1 "@KICKOFF_DIST_CONFIG_SHORTCUT1@"
- #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT2 "@KICKOFF_DIST_CONFIG_SHORTCUT2@"
-diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
-index 63fed2e..4da85ba 100644
---- a/kioslave/man/kio_man.cpp
-+++ b/kioslave/man/kio_man.cpp
-@@ -580,48 +580,64 @@ char *MANProtocol::readManPage(const char *_filename)
- kdDebug(7107) << "resolved to " << filename << endl;
- }
- lastdir = filename.left(filename.findRev('/'));
--
--#ifdef WITH_MAKEWHATIS
-- TQIODevice *fd= KFilterDev::deviceForFile(filename);
-
-- if ( !fd || !fd->open(IO_ReadOnly))
-- {
-- delete fd;
-- return 0;
-- }
-- TQByteArray array(fd->readAll());
-- kdDebug(7107) << "read " << array.size() << endl;
-- fd->close();
-- delete fd;
-+ size_t len;
-
-- if (array.isEmpty())
-- return 0;
-+ if( hasManRecode() ) {
-+ myStdStream = TQString::null;
-+ KProcess proc;
-
-- const int len = array.size();
-- buf = new char[len + 4];
-- tqmemmove(buf + 1, array.data(), len);
--#else
-- myStdStream = TQString::null;
-- KProcess proc;
-- /* TODO: detect availability of 'man --recode' so that this can go
-- * upstream */
-- proc << "man" << "--recode" << "UTF-8" << filename;
-+ proc << "man" << "--recode" << "UTF-8" << filename;
-
-- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
-- this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
-- proc.start(KProcess::Block, KProcess::All);
-+ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
-+ this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
-+ proc.start(KProcess::Block, KProcess::All);
-+
-+ const TQCString cstr=myStdStream.utf8();
-+ len = cstr.size() != 0 ? cstr.size() - 1 : 0;
-+ buf = new char[len + 4];
-+ tqmemmove(buf + 1, cstr.data(), len);
-+ } else {
-+ TQIODevice *fd= KFilterDev::deviceForFile(filename);
-+
-+ if ( !fd || !fd->open(IO_ReadOnly))
-+ {
-+ delete fd;
-+ return 0;
-+ }
-+ TQByteArray array(fd->readAll());
-+ kdDebug(7107) << "read " << array.size() << endl;
-+ fd->close();
-+ delete fd;
-+
-+ if (array.isEmpty())
-+ return 0;
-+
-+ len = array.size();
-+ buf = new char[len + 4];
-+ tqmemmove(buf + 1, array.data(), len);
-+ }
-
-- const TQCString cstr=myStdStream.utf8();
-- const int len = cstr.size()-1;
-- buf = new char[len + 4];
-- tqmemmove(buf + 1, cstr.data(), len);
--#endif
- buf[0]=buf[len]='\n'; // Start and end with a end of line
- buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
- }
- return buf;
- }
-
-+bool MANProtocol::hasManRecode(bool force) {
-+ static bool rv=0, wasChecked=0;
-+ if ( !wasChecked || force ) {
-+ KProcess proc;
-+ // lets' try to recode the man page of man.
-+ // that should be enough to be sure that man-db is installed.
-+ proc << "man" << "--recode" << "UTF-8" << "man";
-+
-+ proc.start(KProcess::Block, KProcess::All);
-+ rv = proc.exitStatus() == 0;
-+ wasChecked = 1;
-+ }
-+ return rv;
-+}
-
- void MANProtocol::outputError(const TQString& errmsg)
- {
-diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h
-index 617245f..1a28dcf 100644
---- a/kioslave/man/kio_man.h
-+++ b/kioslave/man/kio_man.h
-@@ -66,6 +66,7 @@ private slots:
- private:
- void checkManPaths();
- TQStringList manDirectories();
-+ static bool hasManRecode(bool force=0);
- TQMap<TQString, TQString> buildIndexMap(const TQString& section);
- bool addWhatIs(TQMap<TQString, TQString>& i, const TQString& f, const TQString& mark);
- void parseWhatIs( TQMap<TQString, TQString> &i, TQTextStream &t, const TQString &mark );
diff --git a/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild b/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild
deleted file mode 100644
index 56401469..00000000
--- a/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild
+++ /dev/null
@@ -1,40 +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
-
-TSM_EXTRACT="kioslave"
-
-DESCRIPTION="Generic Trinity KIOslaves"
-KEYWORDS="x86 amd64"
-IUSE="hal ldap openexr samba sasl"
-
-DEPEND="
- x11-libs/libXcursor
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- samba? ( net-fs/samba )
- ldap? ( net-nds/openldap )
- sasl? ( dev-libs/cyrus-sasl:2 )
- hal? ( dev-libs/dbus-tqt =sys-apps/hal-0.5* )"
-
-RDEPEND="${DEPEND}
- virtual/ssh
- trinity-base/kdeeject:${SLOT}"
-
-PATCHES=( "${FILESDIR}/${TRINITY_MODULE_NAME}-3.5.13.1-fix-kioslaves-with-hal.patch" )
-
-src_configure() {
- mycmakeargs=(
- -DWITH_XCURSOR=ON
- $(cmake-utils_use_with hal HAL)
- $(cmake-utils_use_with ldap LDAP)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with samba SAMBA)
- $(cmake-utils_use_with sasl SASL)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild b/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild
deleted file mode 100644
index 90dde1ce..00000000
--- a/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild
+++ /dev/null
@@ -1,40 +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
-
-TSM_EXTRACT="kioslave"
-
-DESCRIPTION="Generic Trinity KIOslaves"
-KEYWORDS="~amd64 ~x86"
-IUSE="hal ldap openexr samba sasl"
-
-DEPEND="
- x11-libs/libXcursor
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- samba? ( net-fs/samba )
- ldap? ( net-nds/openldap )
- sasl? ( dev-libs/cyrus-sasl:2 )
- hal? ( dev-libs/dbus-tqt =sys-apps/hal-0.5* )"
-
-RDEPEND="${DEPEND}
- virtual/ssh
- trinity-base/kdeeject:${SLOT}"
-
-PATCHES=( "${FILESDIR}/${TRINITY_MODULE_NAME}-3.5.13.2-fix-mandb-support-in-kio-man.patch" )
-
-src_configure() {
- mycmakeargs=(
- -DWITH_XCURSOR=ON
- $(cmake-utils_use_with hal HAL)
- $(cmake-utils_use_with ldap LDAP)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with samba SAMBA)
- $(cmake-utils_use_with sasl SASL)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kdebase-kioslaves/metadata.xml b/trinity-base/kdebase-kioslaves/metadata.xml
deleted file mode 100644
index a8b41394..00000000
--- a/trinity-base/kdebase-kioslaves/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>
- <longdescription>
- kioslaves is the Trinity VFS framework which plugins present a filesystem-like view of arbitrary data.
- This package provides most generic KIOslaves provided by kdebase.
- </longdescription>
-</pkgmetadata>
diff --git a/trinity-base/kdebase-meta/kdebase-meta-3.5.13.1.ebuild b/trinity-base/kdebase-meta/kdebase-meta-3.5.13.1.ebuild
deleted file mode 100644
index 0b19cbf8..00000000
--- a/trinity-base/kdebase-meta/kdebase-meta-3.5.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit trinity-functions
-
-set-trinityver
-
-DESCRIPTION="kdebase metapackage - merge this to pull in all kdebase-derived packages"
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="$TRINITY_VER"
-IUSE=""
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=trinity-base/kdebase-starttde-${PV}:${SLOT}
- >=trinity-base/drkonqi-${PV}:${SLOT}
- >=trinity-base/kappfinder-${PV}:${SLOT}
- >=trinity-base/kate-${PV}:${SLOT}
- >=trinity-base/kcheckpass-${PV}:${SLOT}
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/kcontrol-${PV}:${SLOT}
- >=trinity-base/kdcop-${PV}:${SLOT}
- >=trinity-base/kdebugdialog-${PV}:${SLOT}
- >=trinity-base/kdepasswd-${PV}:${SLOT}
- >=trinity-base/kdeprint-${PV}:${SLOT}
- >=trinity-base/kdeeject-${PV}:${SLOT}
- >=trinity-base/kdesktop-${PV}:${SLOT}
- >=trinity-base/kdesu-${PV}:${SLOT}
- >=trinity-base/kdialog-${PV}:${SLOT}
- >=trinity-base/kdm-${PV}:${SLOT}
- >=trinity-base/kfind-${PV}:${SLOT}
- >=trinity-base/khelpcenter-${PV}:${SLOT}
- >=trinity-base/khotkeys-${PV}:${SLOT}
- >=trinity-base/kicker-${PV}:${SLOT}
- >=trinity-base/kdebase-kioslaves-${PV}:${SLOT}
- >=trinity-base/klipper-${PV}:${SLOT}
- >=trinity-base/kmenuedit-${PV}:${SLOT}
- >=trinity-base/konqueror-${PV}:${SLOT}
- >=trinity-base/konsole-${PV}:${SLOT}
- >=trinity-base/kpager-${PV}:${SLOT}
- >=trinity-base/kpersonalizer-${PV}:${SLOT}
- >=trinity-base/kreadconfig-${PV}:${SLOT}
- >=trinity-base/kscreensaver-${PV}:${SLOT}
- >=trinity-base/ksmserver-${PV}:${SLOT}
- >=trinity-base/ksplashml-${PV}:${SLOT}
- >=trinity-base/kstart-${PV}:${SLOT}
- >=trinity-base/ksysguard-${PV}:${SLOT}
- >=trinity-base/ksystraycmd-${PV}:${SLOT}
- >=trinity-base/ktip-${PV}:${SLOT}
- >=trinity-base/kwin-${PV}:${SLOT}
- >=trinity-base/kxkb-${PV}:${SLOT}
- >=trinity-base/libkonq-${PV}:${SLOT}
- >=trinity-base/nsplugins-${PV}:${SLOT}
- >=trinity-base/knetattach-${PV}:${SLOT}
- >=trinity-base/kdebase-data-${PV}:${SLOT}
- >=trinity-base/krootbacking-${PV}:${SLOT}
- >=trinity-base/tqt3integration-${PV}:${SLOT}"
diff --git a/trinity-base/kdebase-meta/kdebase-meta-3.5.13.2.ebuild b/trinity-base/kdebase-meta/kdebase-meta-3.5.13.2.ebuild
deleted file mode 100644
index b3d9532e..00000000
--- a/trinity-base/kdebase-meta/kdebase-meta-3.5.13.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit trinity-functions
-
-set-trinityver
-
-DESCRIPTION="kdebase metapackage - merge this to pull in all kdebase-derived packages"
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="$TRINITY_VER"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=trinity-base/kdebase-starttde-${PV}:${SLOT}
- >=trinity-base/drkonqi-${PV}:${SLOT}
- >=trinity-base/kappfinder-${PV}:${SLOT}
- >=trinity-base/kate-${PV}:${SLOT}
- >=trinity-base/kcheckpass-${PV}:${SLOT}
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/kcontrol-${PV}:${SLOT}
- >=trinity-base/kdcop-${PV}:${SLOT}
- >=trinity-base/kdebugdialog-${PV}:${SLOT}
- >=trinity-base/kdepasswd-${PV}:${SLOT}
- >=trinity-base/kdeprint-${PV}:${SLOT}
- >=trinity-base/kdeeject-${PV}:${SLOT}
- >=trinity-base/kdesktop-${PV}:${SLOT}
- >=trinity-base/kdesu-${PV}:${SLOT}
- >=trinity-base/kdialog-${PV}:${SLOT}
- >=trinity-base/kdm-${PV}:${SLOT}
- >=trinity-base/kfind-${PV}:${SLOT}
- >=trinity-base/khelpcenter-${PV}:${SLOT}
- >=trinity-base/khotkeys-${PV}:${SLOT}
- >=trinity-base/kicker-${PV}:${SLOT}
- >=trinity-base/kdebase-kioslaves-${PV}:${SLOT}
- >=trinity-base/klipper-${PV}:${SLOT}
- >=trinity-base/kmenuedit-${PV}:${SLOT}
- >=trinity-base/konqueror-${PV}:${SLOT}
- >=trinity-base/konsole-${PV}:${SLOT}
- >=trinity-base/kpager-${PV}:${SLOT}
- >=trinity-base/kpersonalizer-${PV}:${SLOT}
- >=trinity-base/kreadconfig-${PV}:${SLOT}
- >=trinity-base/kscreensaver-${PV}:${SLOT}
- >=trinity-base/ksmserver-${PV}:${SLOT}
- >=trinity-base/ksplashml-${PV}:${SLOT}
- >=trinity-base/kstart-${PV}:${SLOT}
- >=trinity-base/ksysguard-${PV}:${SLOT}
- >=trinity-base/ksystraycmd-${PV}:${SLOT}
- >=trinity-base/ktip-${PV}:${SLOT}
- >=trinity-base/kwin-${PV}:${SLOT}
- >=trinity-base/kxkb-${PV}:${SLOT}
- >=trinity-base/libkonq-${PV}:${SLOT}
- >=trinity-base/nsplugins-${PV}:${SLOT}
- >=trinity-base/knetattach-${PV}:${SLOT}
- >=trinity-base/kdebase-data-${PV}:${SLOT}
- >=trinity-base/krootbacking-${PV}:${SLOT}
- >=trinity-base/tqt3integration-${PV}:${SLOT}"
diff --git a/trinity-base/kdebase-meta/metadata.xml b/trinity-base/kdebase-meta/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdebase-meta/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdebase-starttde/Manifest b/trinity-base/kdebase-starttde/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdebase-starttde/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/kdebase-starttde/files/agent-shutdown.sh b/trinity-base/kdebase-starttde/files/agent-shutdown.sh
deleted file mode 100644
index 07cf7477..00000000
--- a/trinity-base/kdebase-starttde/files/agent-shutdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This file is executed at kde shutdown.
-# Uncomment the following lines to kill the agents
-# that were started at session startup.
-
-#if [ -n "${GPG_AGENT_INFO}" ]; then
-# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
-#fi
-
-#if [ -n "${SSH_AGENT_PID}" ]; then
-# eval "$(ssh-agent -s -k)"
-#fi
diff --git a/trinity-base/kdebase-starttde/files/agent-startup.sh b/trinity-base/kdebase-starttde/files/agent-startup.sh
deleted file mode 100644
index e97c7b65..00000000
--- a/trinity-base/kdebase-starttde/files/agent-startup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Agents startup file
-#
-# This file is sourced at trinity startup, so that
-# the environment variables set here are available
-# throughout the session.
-
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in TDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
-
-#if [ -x /usr/bin/gpg-agent ]; then
-# eval "$(/usr/bin/gpg-agent --daemon)"
-#fi
-
-#if [ -x /usr/bin/ssh-agent ]; then
-# eval "$(/usr/bin/ssh-agent -s)"
-#fi
-
-# Uncomment the following lines to start rxvt-unicode which has the ability to
-# run multiple terminals in one single process, thus starting up faster and
-# saving resources.
-# The --opendisplay ensures that the daemon quits when the X server terminates,
-# therefore we don't need matching lines in agent-shutdown.sh.
-
-#if [ -x /usr/bin/urxvtd ]; then
-# /usr/bin/urxvtd --opendisplay --fork --quiet
-#fi
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch
deleted file mode 100644
index 9f84aa30..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- startkde 2012-12-08 19:03:57.264176845 +0400
-+++ startkde.gentoo 2012-12-08 19:42:37.448228534 +0400
-@@ -45,6 +45,16 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
-
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/trinity/[^/]*/share/\?:##g;s/:$//g')
-+unset _KDEDIR
-+# Gentoo part ends
-+
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
- echo "[startkde] TDE seems to be already running on this display."
-@@ -52,6 +62,20 @@
- exit 1
- fi
-
-+# Gentoo part:
-+# Scrapped old TDE-x -> TDE-y update code, but keep symlink code
-+pushd ${HOME}
-+if [ -L .trinity -o ! -e .trinity ]; then
-+ # handle ~/.trinity* dirs - separate ones for separate trinity instances
-+ rm -f .trinity
-+ if [ ! -e .trinity-3.5 ]; then
-+ mkdir .trinity-3.5
-+ fi
-+ ln -sf .trinity-3.5 .trinity
-+fi
-+popd
-+# Gentoo part ends
-+
- # Set the background color.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard TDE palette for those with
-@@ -435,6 +459,13 @@
- done
- done
-
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+ for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+ test -x "$file" && . "$file"
-+ done
-+fi
-+
- # Activate the TDE font directories.
- #
- # There are 4 directories that may be used for supplying fonts for TDE.
-@@ -688,7 +719,7 @@
- # Clean up
- $KDEDIR/bin/kdeinit_shutdown
- $KDEDIR/bin/dcopserver_shutdown --wait
--$KDEDIR/bin/artsshell -q terminate
-+[ -x ${KDEDIR}/bin/artsshell ] && $KDEDIR/bin/artsshell -q terminate
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
- /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch
deleted file mode 100644
index 9f84aa30..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- startkde 2012-12-08 19:03:57.264176845 +0400
-+++ startkde.gentoo 2012-12-08 19:42:37.448228534 +0400
-@@ -45,6 +45,16 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
-
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/trinity/[^/]*/share/\?:##g;s/:$//g')
-+unset _KDEDIR
-+# Gentoo part ends
-+
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
- echo "[startkde] TDE seems to be already running on this display."
-@@ -52,6 +62,20 @@
- exit 1
- fi
-
-+# Gentoo part:
-+# Scrapped old TDE-x -> TDE-y update code, but keep symlink code
-+pushd ${HOME}
-+if [ -L .trinity -o ! -e .trinity ]; then
-+ # handle ~/.trinity* dirs - separate ones for separate trinity instances
-+ rm -f .trinity
-+ if [ ! -e .trinity-3.5 ]; then
-+ mkdir .trinity-3.5
-+ fi
-+ ln -sf .trinity-3.5 .trinity
-+fi
-+popd
-+# Gentoo part ends
-+
- # Set the background color.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard TDE palette for those with
-@@ -435,6 +459,13 @@
- done
- done
-
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+ for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+ test -x "$file" && . "$file"
-+ done
-+fi
-+
- # Activate the TDE font directories.
- #
- # There are 4 directories that may be used for supplying fonts for TDE.
-@@ -688,7 +719,7 @@
- # Clean up
- $KDEDIR/bin/kdeinit_shutdown
- $KDEDIR/bin/dcopserver_shutdown --wait
--$KDEDIR/bin/artsshell -q terminate
-+[ -x ${KDEDIR}/bin/artsshell ] && $KDEDIR/bin/artsshell -q terminate
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
- /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch
deleted file mode 100644
index 0d37eab5..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- startkde.orig 2011-09-19 14:54:22.812972431 +0400
-+++ startkde 2011-09-19 15:02:54.050401619 +0400
-@@ -9,6 +9,15 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
-
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+# Gentoo part ends
-+
- # Check if a KDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
- echo "[startkde] KDE seems to be already running on this display."
-@@ -340,6 +349,13 @@
- done
- done
-
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+ for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+ test -x "$file" && . "$file"
-+ done
-+fi
-+
- # Activate the kde font directories.
- #
- # There are 4 directories that may be used for supplying fonts for KDE.
-@@ -593,7 +609,12 @@
- # Clean up
- kdeinit_shutdown
- dcopserver_shutdown --wait
--artsshell -q terminate
-+
-+# Terminate artsshell if it exists
-+if [ -e ${_KDEDIR}/bin/artsshell ] ; then
-+ artsshell -q terminate ;
-+fi
-+
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
- kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild b/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild
deleted file mode 100644
index 2a14b29c..00000000
--- a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild
+++ /dev/null
@@ -1,98 +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
-
-DESCRIPTION="starttde script, which starts a complete Trinity session, and associated scripts"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND="x11-apps/xmessage
- x11-apps/xsetroot
- x11-apps/xset
- x11-apps/xrandr
- x11-apps/mkfontdir
- x11-apps/xprop
- >=trinity-base/kdesktop-${PV}:${SLOT}
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/ksmserver-${PV}:${SLOT}
- >=trinity-base/kwin-${PV}:${SLOT}
- >=trinity-base/kpersonalizer-${PV}:${SLOT}
- >=trinity-base/kreadconfig-${PV}:${SLOT}
- >=trinity-base/ksplashml-${PV}:${SLOT}"
-
-TSM_EXTRACT="startkde README.pam INSTALL AUTHORS COPYING COPYING-DOCS kdm"
-
-src_prepare() {
- epatch "${FILESDIR}/kdebase-startkde-${PV}-gentoo.patch"
-
- trinity-base_src_prepare
-}
-
-src_configure() {
- echo -n "";
-}
-
-src_compile() {
- # Patch the starttde script to setup the environment for KDE 4.0
- # Add our TDEDIR
- sed -e "s#@REPLACE_PREFIX@#${TDEDIR}#" \
- "${S}/startkde" >"${S}/starttde" || die "Sed for PREFIX failed."
-
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-
- # Complete LDPATH
- sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
- "${S}/starttde" || die "Sed for LDPATH failed."
-}
-
-src_install() {
- # starttde script
- exeinto "${TDEDIR}/bin"
- doexe starttde
-
- # startup and shutdown scripts
- exeinto "${TDEDIR}/env"
- doexe "${FILESDIR}/agent-startup.sh"
-
- exeinto "${TDEDIR}/shutdown"
- doexe "${FILESDIR}/agent-shutdown.sh"
-
- # freedesktop environment variables
- cat <<EOF > "${T}/xdg.sh"
-export XDG_CONFIG_DIRS="${TDEDIR}/etc/xdg"
-EOF
- exeinto "${TDEDIR}/env"
- doexe "${T}/xdg.sh"
-
- # x11 session script
- cat <<EOF > "${T}/tde-${SLOT}"
-#!/bin/sh
-exec ${TDEDIR}/bin/starttde
-EOF
- exeinto /etc/X11/Sessions
- doexe "${T}/tde-${SLOT}" # FIXME: change script branding to trinity
-
- # (not really) freedesktop compliant session script
- sed -e "s:@TDE_BINDIR@:${TDEDIR}/bin:g;s:Name=Trinity:Name=Trinity ${SLOT}:" \
- -e "s/startkde/starttde/" \
- "${S}/kdm/kfrontend/sessions/tde.desktop.in" > "${T}/tde-${SLOT}.desktop"
- insinto /usr/share/xsessions
- doins "${T}/tde-${SLOT}.desktop"
-}
-
-pkg_postinst () {
- echo
- elog "To enable gpg-agent and/or ssh-agent in Trinity sessions,"
- elog "edit ${TDEDIR}/env/agent-startup.sh and"
- elog "${TDEDIR}/shutdown/agent-shutdown.sh"
- echo
-}
diff --git a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild b/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild
deleted file mode 100644
index 2a66ee3a..00000000
--- a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild
+++ /dev/null
@@ -1,98 +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
-
-DESCRIPTION="starttde script, which starts a complete Trinity session, and associated scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-apps/xmessage
- x11-apps/xsetroot
- x11-apps/xset
- x11-apps/xrandr
- x11-apps/mkfontdir
- x11-apps/xprop
- >=trinity-base/kdesktop-${PV}:${SLOT}
- >=trinity-base/kcminit-${PV}:${SLOT}
- >=trinity-base/ksmserver-${PV}:${SLOT}
- >=trinity-base/kwin-${PV}:${SLOT}
- >=trinity-base/kpersonalizer-${PV}:${SLOT}
- >=trinity-base/kreadconfig-${PV}:${SLOT}
- >=trinity-base/ksplashml-${PV}:${SLOT}"
-
-TSM_EXTRACT="startkde README.pam INSTALL AUTHORS COPYING COPYING-DOCS kdm"
-
-src_prepare() {
- epatch "${FILESDIR}/kdebase-startkde-${PV}-gentoo.patch"
-
- trinity-base_src_prepare
-}
-
-src_configure() {
- echo -n "";
-}
-
-src_compile() {
- # Patch the starttde script to setup the environment for KDE 4.0
- # Add our TDEDIR
- sed -e "s#@REPLACE_PREFIX@#${TDEDIR}#" \
- "${S}/startkde" >"${S}/starttde" || die "Sed for PREFIX failed."
-
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-
- # Complete LDPATH
- sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
- "${S}/starttde" || die "Sed for LDPATH failed."
-}
-
-src_install() {
- # starttde script
- exeinto "${TDEDIR}/bin"
- doexe starttde
-
- # startup and shutdown scripts
- exeinto "${TDEDIR}/env"
- doexe "${FILESDIR}/agent-startup.sh"
-
- exeinto "${TDEDIR}/shutdown"
- doexe "${FILESDIR}/agent-shutdown.sh"
-
- # freedesktop environment variables
- cat <<EOF > "${T}/xdg.sh"
-export XDG_CONFIG_DIRS="${TDEDIR}/etc/xdg"
-EOF
- exeinto "${TDEDIR}/env"
- doexe "${T}/xdg.sh"
-
- # x11 session script
- cat <<EOF > "${T}/tde-${SLOT}"
-#!/bin/sh
-exec ${TDEDIR}/bin/starttde
-EOF
- exeinto /etc/X11/Sessions
- doexe "${T}/tde-${SLOT}" # FIXME: change script branding to trinity
-
- # (not really) freedesktop compliant session script
- sed -e "s:@TDE_BINDIR@:${TDEDIR}/bin:g;s:Name=Trinity:Name=Trinity ${SLOT}:" \
- -e "s/startkde/starttde/" \
- "${S}/kdm/kfrontend/sessions/tde.desktop.in" > "${T}/tde-${SLOT}.desktop"
- insinto /usr/share/xsessions
- doins "${T}/tde-${SLOT}.desktop"
-}
-
-pkg_postinst () {
- echo
- elog "To enable gpg-agent and/or ssh-agent in Trinity sessions,"
- elog "edit ${TDEDIR}/env/agent-startup.sh and"
- elog "${TDEDIR}/shutdown/agent-shutdown.sh"
- echo
-}
diff --git a/trinity-base/kdebase-starttde/metadata.xml b/trinity-base/kdebase-starttde/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdebase-starttde/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdebugdialog/Manifest b/trinity-base/kdebugdialog/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdebugdialog/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/kdebugdialog/files/shared b/trinity-base/kdebugdialog/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kdebugdialog/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files \ No newline at end of file
diff --git a/trinity-base/kdebugdialog/kdebugdialog-3.5.13.1.ebuild b/trinity-base/kdebugdialog/kdebugdialog-3.5.13.1.ebuild
deleted file mode 100644
index 8da6e9b0..00000000
--- a/trinity-base/kdebugdialog/kdebugdialog-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="A Trinity dialog box for setting preferences for debug output."
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdebugdialog/kdebugdialog-3.5.13.2.ebuild b/trinity-base/kdebugdialog/kdebugdialog-3.5.13.2.ebuild
deleted file mode 100644
index 52f7aeea..00000000
--- a/trinity-base/kdebugdialog/kdebugdialog-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +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
-
-DESCRIPTION="A Trinity dialog box for setting preferences for debug output."
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/trinity-base/kdebugdialog/metadata.xml b/trinity-base/kdebugdialog/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdebugdialog/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeeject/Manifest b/trinity-base/kdeeject/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdeeject/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/kdeeject/kdeeject-3.5.13.1.ebuild b/trinity-base/kdeeject/kdeeject-3.5.13.1.ebuild
deleted file mode 100644
index 5918dcb4..00000000
--- a/trinity-base/kdeeject/kdeeject-3.5.13.1.ebuild
+++ /dev/null
@@ -1,15 +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
-
-DESCRIPTION="Trinity eject frontend"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="trinity-base/kdialog:${SLOT}"
-RDEPEND="${DEPEND}
- virtual/eject"
diff --git a/trinity-base/kdeeject/kdeeject-3.5.13.2.ebuild b/trinity-base/kdeeject/kdeeject-3.5.13.2.ebuild
deleted file mode 100644
index 5918dcb4..00000000
--- a/trinity-base/kdeeject/kdeeject-3.5.13.2.ebuild
+++ /dev/null
@@ -1,15 +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
-
-DESCRIPTION="Trinity eject frontend"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="trinity-base/kdialog:${SLOT}"
-RDEPEND="${DEPEND}
- virtual/eject"
diff --git a/trinity-base/kdeeject/metadata.xml b/trinity-base/kdeeject/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdeeject/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdegraphics-doc/Manifest b/trinity-base/kdegraphics-doc/Manifest
deleted file mode 100644
index f0ba54e9..00000000
--- a/trinity-base/kdegraphics-doc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-3.5.13.1.tar.gz 7526074 SHA256 19bd36e261bb6c5d2c9c1eba5f736c642b48422d917d44e576835f7ebb44906b SHA512 693e5ad70dbb00c587e588acfb81fc9475c3a4dbc86f41d6053c0584c533349a7564e34b870cb7bbc57361ac539da6f7d7f1b002ac3cfe8b0201db3eeb9147dd WHIRLPOOL fd2c46c517b3a0293880eaf35967295485555b936d0f1e80e0f2c261a1164cfcc5c4b2d943a12c073914d33b59974cc2dd92a78414614caa10f46dd048d518b4
diff --git a/trinity-base/kdegraphics-doc/files/shared b/trinity-base/kdegraphics-doc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kdegraphics-doc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/ \ No newline at end of file
diff --git a/trinity-base/kdegraphics-doc/kdegraphics-doc-3.5.13.1.ebuild b/trinity-base/kdegraphics-doc/kdegraphics-doc-3.5.13.1.ebuild
deleted file mode 100644
index aa997ce3..00000000
--- a/trinity-base/kdegraphics-doc/kdegraphics-doc-3.5.13.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdegraphics"
-
-inherit trinity-meta
-
-DESCRIPTION="Documentaion for kdegraphics-derived packages"
-KEYWORDS="x86 amd64"
-IUSE=""
-RDEPEND="
- >=trinity-base/khelpcenter-${PV}:${SLOT}"
-
-pkg_setup() {
- # we should reduce MAKEOPTS -j parametr to no more than 4
- local makeopts_j
- makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')"
- if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then
- export MAKEOPTS="${MAKEOPTS//"${makeopts_j}"/-j4}"
-
- ewarn "This ebuild needs huge amoumt of memmory to compile in highly parallel"
- ewarn "mode so it can chew it all. MAKEOPTS are reduced to \"$MAKEOPTS\"."
- fi
-
- trinity-meta_pkg_setup
-}
diff --git a/trinity-base/kdegraphics-doc/metadata.xml b/trinity-base/kdegraphics-doc/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdegraphics-doc/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdegraphics-kfile-plugins/Manifest b/trinity-base/kdegraphics-kfile-plugins/Manifest
deleted file mode 100644
index f0ba54e9..00000000
--- a/trinity-base/kdegraphics-kfile-plugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-3.5.13.1.tar.gz 7526074 SHA256 19bd36e261bb6c5d2c9c1eba5f736c642b48422d917d44e576835f7ebb44906b SHA512 693e5ad70dbb00c587e588acfb81fc9475c3a4dbc86f41d6053c0584c533349a7564e34b870cb7bbc57361ac539da6f7d7f1b002ac3cfe8b0201db3eeb9147dd WHIRLPOOL fd2c46c517b3a0293880eaf35967295485555b936d0f1e80e0f2c261a1164cfcc5c4b2d943a12c073914d33b59974cc2dd92a78414614caa10f46dd048d518b4
diff --git a/trinity-base/kdegraphics-kfile-plugins/files/tdegraphics-poppler-tqt-remove-unnecessary-check.patch b/trinity-base/kdegraphics-kfile-plugins/files/tdegraphics-poppler-tqt-remove-unnecessary-check.patch
deleted file mode 100644
index 35448ab1..00000000
--- a/trinity-base/kdegraphics-kfile-plugins/files/tdegraphics-poppler-tqt-remove-unnecessary-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake.orig 2012-10-30 15:37:44.306343796 +0400
-+++ kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2012-10-30 15:37:56.031354364 +0400
-@@ -1,11 +1,9 @@
- # Poppler
--if( BUILD_KPDF )
-- pkg_search_module( POPPLER poppler )
-- if( POPPLER_FOUND )
-- set( HAVE_POPPLER 1 )
-- else( )
-- tde_message_fatal( "poppler is required, but was not found on your system" )
-- endif( )
-+pkg_search_module( POPPLER poppler )
-+if( POPPLER_FOUND )
-+ set( HAVE_POPPLER 1 )
-+else( )
-+ tde_message_fatal( "poppler is required, but was not found on your system" )
- endif( )
-
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
diff --git a/trinity-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.13.1.ebuild b/trinity-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.13.1.ebuild
deleted file mode 100644
index 2a7c868f..00000000
--- a/trinity-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdegraphics"
-
-inherit trinity-meta
-
-DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS="x86 amd64"
-IUSE="tiff openexr pdf"
-
-DEPEND="
- tiff? ( media-libs/tiff:= )
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- pdf? ( app-text/poppler )"
-RDEPEND="$DEPEND"
-
-PATCHES=( "$FILESDIR/tdegraphics-poppler-tqt-remove-unnecessary-check.patch" )
-TSM_EXTRACT_ALSO="kghostview/dscparse/"
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with pdf PDF)
- )
-
- trinity-meta_src_configure
-}
diff --git a/trinity-base/kdegraphics-kfile-plugins/metadata.xml b/trinity-base/kdegraphics-kfile-plugins/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdegraphics-kfile-plugins/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdegraphics-meta/kdegraphics-meta-3.5.13.1.ebuild b/trinity-base/kdegraphics-meta/kdegraphics-meta-3.5.13.1.ebuild
deleted file mode 100644
index 5aa7282b..00000000
--- a/trinity-base/kdegraphics-meta/kdegraphics-meta-3.5.13.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit trinity-functions
-
-set-trinityver
-
-DESCRIPTION="kdegraphics metapackage - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="${TRINITY_VER}"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=trinity-base/kamera-${PV}:${SLOT}
- >=trinity-base/kcoloredit-${PV}:${SLOT}
- >=trinity-base/kdvi-${PV}:${SLOT}
- >=trinity-base/kfax-${PV}:${SLOT}
- >=trinity-base/kdegraphics-kfile-plugins-${PV}:${SLOT}
- >=trinity-base/kdegraphics-doc-${PV}:${SLOT}
- >=trinity-base/kgamma-${PV}:${SLOT}
- >=trinity-base/kghostview-${PV}:${SLOT}
- >=trinity-base/kiconedit-${PV}:${SLOT}
- >=trinity-base/kmrml-${PV}:${SLOT}
- >=trinity-base/kolourpaint-${PV}:${SLOT}
- >=trinity-base/kooka-${PV}:${SLOT}
- >=trinity-base/kpdf-${PV}:${SLOT}
- >=trinity-base/kpovmodeler-${PV}:${SLOT}
- >=trinity-base/kruler-${PV}:${SLOT}
- >=trinity-base/ksnapshot-${PV}:${SLOT}
- >=trinity-base/ksvg-${PV}:${SLOT}
- >=trinity-base/kuickshow-${PV}:${SLOT}
- >=trinity-base/kview-${PV}:${SLOT}
- >=trinity-base/kviewshell-${PV}:${SLOT}
- >=trinity-base/libkscan-${PV}:${SLOT}"
diff --git a/trinity-base/kdegraphics-meta/metadata.xml b/trinity-base/kdegraphics-meta/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdegraphics-meta/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdelibs/Manifest b/trinity-base/kdelibs/Manifest
deleted file mode 100644
index bd7b6990..00000000
--- a/trinity-base/kdelibs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdelibs-3.5.13.1.tar.gz 16866773 SHA256 ac9540aa5da0706e257411ab70f05997a67999374e4eded915d93163cc82a84c SHA512 8b6fb1576d6f946b4d32df488f4e7c22e2db6783d075da40b4a35fef967ee222fcf73db7174b8e8d7dd6511cbd1399abf7d39c8f20517e260963734ed95c0156 WHIRLPOOL 6b2c64560af1bd24af6af6bd68e4fcbe83be48637d104028a6633ea90b79159d27afb09ed1e98462f2516fe40078b558f541f6cf3cd0f4cf1dcc7aff762c452a
-DIST kdelibs-trinity-3.5.13.2.tar.xz 13269336 SHA256 3415b04c65c9978d97cb1ca57c3fb391116a774e798c6890328c3da091a5ca9c SHA512 b6c3b9811d9a620030576ac4466fbad73b40034f1158b0278eef10363a2d67b7396ffbd2cf782d9317e95ae0f2492840e9d0cf7d7852c302d6e22ba93b11c611 WHIRLPOOL 8dc7ed209874810da9e44614e90def3f45ff688109e38c5e498bf6d14a761aae08985bc96a761c5f4763e000f7c4e9757f3a4092211c5dc6f5e80d2397af1657
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-OnlyShowIn-TDE.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.1-OnlyShowIn-TDE.patch
deleted file mode 100644
index 9d9187f8..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-OnlyShowIn-TDE.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
-index 48325f2..d4bdb7b 100644
---- a/kinit/autostart.cpp
-+++ b/kinit/autostart.cpp
-@@ -178,7 +178,7 @@ AutoStart::loadAutoStartList()
-
- if (config.hasKey("OnlyShowIn"))
- {
-- if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
-+ if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
- continue;
- }
- if (config.hasKey("NotShowIn"))
-diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
-index 6758ca1..18b402b 100644
---- a/kio/kio/kservicegroup.cpp
-+++ b/kio/kio/kservicegroup.cpp
-@@ -84,7 +84,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
- TQStringList tmpList;
- if (config.hasKey("OnlyShowIn"))
- {
-- if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
-+ if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
- d->m_bNoDisplay = true;
- }
- if (config.hasKey("NotShowIn"))
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-bug-1161.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.1-bug-1161.patch
deleted file mode 100644
index 094708cc..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-bug-1161.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp
-index 29c6702..64c54e1 100644
---- a/kdeui/ksharedpixmap.cpp
-+++ b/kdeui/ksharedpixmap.cpp
-@@ -160,9 +160,8 @@ bool KSharedPixmap::x11Event(XEvent *event)
- void *drawable_id = (void *) pixmap_id;
- Drawable pixmap = *(Drawable*) drawable_id;
-
-- Status status = XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy);
--
-- if (status == BadDrawable)
-+ if (!XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy,
-+ &width, &height, &udummy, &udummy))
- return false;
-
- if (d->rect.isEmpty())
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-insane-kde4-variables.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-insane-kde4-variables.patch
deleted file mode 100644
index 2247b898..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-insane-kde4-variables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
-index 4964103..368fe9a 100644
---- a/kio/kio/kservice.cpp
-+++ b/kio/kio/kservice.cpp
-@@ -198,7 +198,7 @@ KService::init( KDesktopFile *config )
-
- m_strExec = config->readPathEntry( "Exec" );
- if (kde4application && !m_strExec.startsWith("/")) {
-- m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
-+ m_strExec = "KDEHOME=$HOME/.kde4 XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
- } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
- int space = m_strExec.find(" ");
- if (space==-1)
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-no-xcomposite.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-no-xcomposite.patch
deleted file mode 100644
index e359a628..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-fix-no-xcomposite.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- kdecore/kapplication.cpp.orig 2012-10-26 11:49:24.000000000 +0400
-+++ kdecore/kapplication.cpp 2012-10-26 11:49:33.000000000 +0400
-@@ -186,7 +186,7 @@
- static Atom kde_xdnd_drop;
- #endif
-
--#ifdef Q_WS_X11
-+#if defined(Q_WS_X11) && defined(COMPOSITE)
- static int composite_event, composite_error, composite_opcode;
- static bool x11_composite_error_generated;
- static int x11_error(Display *dpy, XErrorEvent *ev) {
-@@ -1981,7 +1981,7 @@
- return false;
- }
-
--bool KApplication::detectCompositionManagerAvailable(bool force_available) {
-+bool KApplication::detectCompositionManagerAvailable(bool force_available, bool /* available */) {
- const char *home;
- struct passwd *p;
- p = getpwuid(getuid());
-@@ -2023,21 +2023,17 @@
- return 0;
- }
-
--Qt::HANDLE KApplication::getX11RGBAVisual(char *display) {
-+Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
- return 0;
- }
-
--Qt::HANDLE KApplication::getX11RGBAColormap(char *display) {
-+Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
- return 0;
- }
-
- bool KApplication::isX11CompositionAvailable() {
- return false;
- }
--
--KApplication KApplication::KARGBApplication( bool allowStyles ) {
-- return KApplication::KApplication(allowStyles, true);
--}
- #endif
-
- static bool kapp_block_user_input = false;
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch
deleted file mode 100644
index 1b7e1c91..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.1-make-xcomposite-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- CMakeLists.txt.orig 2012-10-25 09:20:57.773606598 +0400
-+++ CMakeLists.txt 2012-10-26 07:18:14.793762688 +0400
-@@ -81,5 +81,6 @@
- OPTION( WITH_ASPELL "Enable aspell support" OFF )
- OPTION( WITH_HSPELL "Enable hspell support" OFF )
-+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
-
-
- ##### set PKG_CONFIG_PATH #######################
-@@ -564,10 +565,14 @@
-
- ##### check for xcomposite #########################
-
--pkg_search_module( XCOMPOSITE xcomposite )
--if( XCOMPOSITE_FOUND )
-- set( HAVE_XCOMPOSITE 1 )
--endif( XCOMPOSITE_FOUND )
-+if( WITH_XCOMPOSITE )
-+ pkg_search_module( XCOMPOSITE xcomposite )
-+ if( XCOMPOSITE_FOUND )
-+ set( HAVE_XCOMPOSITE 1 )
-+ else()
-+ message(FATAL_ERROR "\nxcomposite support was requested, but xcomposite was not found on your system" )
-+ endif( XCOMPOSITE_FOUND )
-+endif( WITH_XCOMPOSITE )
-
- ##### check for libxml-2.0 ######################
-
diff --git a/trinity-base/kdelibs/files/kdelibs-3.5.13.2-make-xcomposite-optional.patch b/trinity-base/kdelibs/files/kdelibs-3.5.13.2-make-xcomposite-optional.patch
deleted file mode 100644
index c635b003..00000000
--- a/trinity-base/kdelibs/files/kdelibs-3.5.13.2-make-xcomposite-optional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- CMakeLists.txt.orig 2013-05-09 23:16:28.000000000 +0400
-+++ CMakeLists.txt 2013-06-28 04:17:31.677764189 +0400
-@@ -85,6 +85,7 @@
-
- OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
- OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
-+OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
-
- set( KDE4_DEFAULT_HOME ".kde" CACHE PATH "KDE4 home directory passed as KDEHOME to kde4 applications" )
-
-@@ -588,10 +589,14 @@
-
- ##### check for xcomposite #########################
-
--pkg_search_module( XCOMPOSITE xcomposite )
--if( XCOMPOSITE_FOUND )
-- set( HAVE_XCOMPOSITE 1 )
--endif( XCOMPOSITE_FOUND )
-+if( WITH_XCOMPOSITE )
-+ pkg_search_module( XCOMPOSITE xcomposite )
-+ if( XCOMPOSITE_FOUND )
-+ set( HAVE_XCOMPOSITE 1 )
-+ else()
-+ message(FATAL_ERROR "\nxcomposite support was requested, but xcomposite was not found on your system" )
-+ endif( XCOMPOSITE_FOUND )
-+endif( WITH_XCOMPOSITE )
-
- ##### check for libxml-2.0 ######################
-
diff --git a/trinity-base/kdelibs/kdelibs-3.5.13.1.ebuild b/trinity-base/kdelibs/kdelibs-3.5.13.1.ebuild
deleted file mode 100644
index 5b042be4..00000000
--- a/trinity-base/kdelibs/kdelibs-3.5.13.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="$PN"
-
-inherit trinity-base multilib
-
-set-trinityver
-
-DESCRIPTION="Trinity libraries needed by all TDE programs."
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="$TRINITY_VER"
-KEYWORDS="x86 amd64"
-IUSE="alsa avahi arts cups fam jpeg2k lua openexr spell sudo tiff utempter
- xcomposite"
-
-DEPEND="${DEPEND}
- =dev-qt/tqtinterface-${TRINITY_VER}*
- >=dev-libs/libxslt-1.1.16
- >=dev-libs/libxml2-2.6.6
- >=dev-libs/libpcre-6.6
- media-libs/libart_lgpl
- net-dns/libidn
- app-text/ghostscript-gpl
- >=dev-libs/openssl-0.9.7d:=
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libart_lgpl
- x11-libs/libXcursor
- alsa? ( media-libs/alsa-lib )
- arts? ( trinity-base/arts:= )
- avahi? ( net-dns/avahi )
- cups? ( >=net-print/cups-1.1.19 )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- lua? ( dev-lang/lua:* )
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- spell? ( >=app-dicts/aspell-en-6.0.0 >=app-text/aspell-0.60.5 )
- sudo? ( app-admin/sudo )
- tiff? ( media-libs/tiff:= )
- utempter? ( sys-libs/libutempter )
- xcomposite? ( x11-libs/libXcomposite )"
-# NOTE: upstream lacks avahi support, so the use flag is currenly masked
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "$FILESDIR/${PN}-3.5.13.1-make-xcomposite-optional.patch"
- "$FILESDIR/${PN}-3.5.13.1-fix-no-xcomposite.patch"
- "$FILESDIR/${PN}-3.5.13.1-OnlyShowIn-TDE.patch"
- "$FILESDIR/${PN}-3.5.13.1-bug-1161.patch"
- "$FILESDIR/${PN}-3.5.13.1-fix-insane-kde4-variables.patch")
-
-src_configure() {
- mycmakeargs=(
- -DMALLOC_FULL=ON
- -DWITH_LIBIDN=ON
- -DWITH_SSL=ON
- -DWITH_LIBART=ON
- -DWITH_PCRE=ON
- -DWITH_XCURSOR=ON
- -DWITH_HSPELL=OFF
- $(cmake-utils_use_with alsa ALSA)
- $(cmake-utils_use_with arts ARTS)
- $(cmake-utils_use_with avahi AVAHI)
- $(cmake-utils_use_with cups CUPS)
- $(cmake-utils_use_with kernel_linux INOTIFY)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with lua LUA)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with spell ASPELL)
- $(cmake-utils_use_with fam GAMIN)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with utempter UTEMPTER)
- $(cmake-utils_use_with xcomposite XCOMPOSITE)
- $(cmake-utils_use_with sudo SUDO_KDESU_BACKEND)
- )
-
- trinity-base_src_configure
-}
-
-src_install() {
- trinity-base_src_install
-
- dodir /etc/env.d
- # KDE implies that the install path is listed first in TDEDIRS and the user
- # directory (implicitly added) to be the last entry. Doing otherwise breaks
- # certain functionality. Do not break this (once again *sigh*), but read the code.
- # KDE saves the installed path implicitly and so this is not needed, /usr
- # is set in ${TDEDIR}/share/config/kdeglobals and so TDEDIRS is not needed.
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${TDEDIR}/${libdir}:${libdirs}"
- done
-
- # number goes down with version upgrade
- # NOTE: they should be less than kdepaths for kde-3.5
- cat <<EOF > "${D}/etc/env.d/42trinitypaths-${SLOT}"
-PATH=${TDEDIR}/bin
-ROOTPATH=${TDEDIR}/sbin:${TDEDIR}/bin
-LDPATH=${libdirs#:}
-MANPATH=${TDEDIR}/share/man
-CONFIG_PROTECT="${TDEDIR}/share/config ${TDEDIR}/env ${TDEDIR}/shutdown /usr/share/config"
-#TDE_IS_PRELINKED=1
-# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that.
-#TDE_EXTRA_FSYNC=1
-XDG_DATA_DIRS="${TDEDIR}/share"
-EOF
-
- # Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
- dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}/etc/revdep-rebuild/50-trinity-${SLOT}"
-SEARCH_DIRS="${TDEDIR}/bin ${TDEDIR}/lib*"
-EOF
-
- # make documentation help accessible throught symlink
- dosym ${TDEDIR}/share/doc/kde/HTML ${TDEDIR}/share/doc/HTML
-
- trinity-base_create_tmp_docfiles
- trinity-base_install_docfiles
-}
-
-pkg_postinst () {
- if use sudo; then
- einfo "Remember sudo use flag sets only the defauld value"
- einfo "It can be overriden on a user-level by adding:"
- einfo " [super-user-command]"
- einfo " super-user-command=su"
- einfo "To the kdeglobal config file which is should be usually"
- einfo "located in the ~/.trinity/share/config/ directory."
- fi
-}
diff --git a/trinity-base/kdelibs/kdelibs-3.5.13.2.ebuild b/trinity-base/kdelibs/kdelibs-3.5.13.2.ebuild
deleted file mode 100644
index 9d3933ed..00000000
--- a/trinity-base/kdelibs/kdelibs-3.5.13.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="$PN"
-
-inherit trinity-base multilib
-
-set-trinityver
-
-DESCRIPTION="Trinity libraries needed by all TDE programs."
-HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="${TRINITY_VER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa avahi arts cups fam jpeg2k lua lzma openexr spell sudo tiff utempter
- xcomposite"
-
-DEPEND="${DEPEND}
- =dev-qt/tqtinterface-${TRINITY_VER}*
- >=dev-libs/libxslt-1.1.16
- >=dev-libs/libxml2-2.6.6
- >=dev-libs/libpcre-6.6
- media-libs/libart_lgpl
- net-dns/libidn
- app-text/ghostscript-gpl
- >=dev-libs/openssl-0.9.7d:=
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libart_lgpl
- x11-libs/libXcursor
- alsa? ( media-libs/alsa-lib )
- arts? ( trinity-base/arts:= )
- avahi? ( net-dns/avahi )
- cups? ( >=net-print/cups-1.1.19 )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- lua? ( dev-lang/lua:* )
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- spell? ( >=app-dicts/aspell-en-6.0.0 >=app-text/aspell-0.60.5 )
- sudo? ( app-admin/sudo )
- tiff? ( media-libs/tiff:= )
- utempter? ( sys-libs/libutempter )
- xcomposite? ( x11-libs/libXcomposite )
- lzma? ( app-arch/xz-utils )"
-# NOTE: upstream lacks avahi support, so the use flag is currenly masked
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "$FILESDIR/${PN}-3.5.13.2-make-xcomposite-optional.patch"
- "$FILESDIR/${PN}-3.5.13.1-fix-no-xcomposite.patch"
- "$FILESDIR/${PN}-3.5.13.1-OnlyShowIn-TDE.patch" )
-
-src_configure() {
- mycmakeargs=(
- -DMALLOC_FULL=ON
- -DWITH_LIBIDN=ON
- -DWITH_SSL=ON
- -DWITH_LIBART=ON
- -DWITH_PCRE=ON
- -DWITH_XCURSOR=ON
- -DWITH_HSPELL=OFF
- -DKDE4_DEFAULT_HOME=.kde4
- $(cmake-utils_use_with alsa ALSA)
- $(cmake-utils_use_with arts ARTS)
- $(cmake-utils_use_with avahi AVAHI)
- $(cmake-utils_use_with cups CUPS)
- $(cmake-utils_use_with kernel_linux INOTIFY)
- $(cmake-utils_use_with jpeg2k JASPER)
- $(cmake-utils_use_with lua LUA)
- $(cmake-utils_use_with lzma LZMA)
- $(cmake-utils_use_with openexr OPENEXR)
- $(cmake-utils_use_with spell ASPELL)
- $(cmake-utils_use_with fam GAMIN)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with utempter UTEMPTER)
- $(cmake-utils_use_with xcomposite XCOMPOSITE)
- $(cmake-utils_use_with sudo SUDO_KDESU_BACKEND)
- )
-
- trinity-base_src_configure
-}
-
-src_install() {
- trinity-base_src_install
-
- dodir /etc/env.d
- # KDE implies that the install path is listed first in TDEDIRS and the user
- # directory (implicitly added) to be the last entry. Doing otherwise breaks
- # certain functionality. Do not break this (once again *sigh*), but read the code.
- # KDE saves the installed path implicitly and so this is not needed, /usr
- # is set in ${TDEDIR}/share/config/kdeglobals and so TDEDIRS is not needed.
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${TDEDIR}/${libdir}:${libdirs}"
- done
-
- # number goes down with version upgrade
- # NOTE: they should be less than kdepaths for kde-3.5
- cat <<EOF > "${D}/etc/env.d/42trinitypaths-${SLOT}"
-PATH=${TDEDIR}/bin
-ROOTPATH=${TDEDIR}/sbin:${TDEDIR}/bin
-LDPATH=${libdirs#:}
-MANPATH=${TDEDIR}/share/man
-CONFIG_PROTECT="${TDEDIR}/share/config ${TDEDIR}/env ${TDEDIR}/shutdown /usr/share/config"
-#TDE_IS_PRELINKED=1
-# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that.
-#TDE_EXTRA_FSYNC=1
-XDG_DATA_DIRS="${TDEDIR}/share"
-EOF
-
- # Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
- dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}/etc/revdep-rebuild/50-trinity-${SLOT}"
-SEARCH_DIRS="${TDEDIR}/bin ${TDEDIR}/lib*"
-EOF
-
- # make documentation help accessible throught symlink
- dosym ${TDEDIR}/share/doc/kde/HTML ${TDEDIR}/share/doc/HTML
-
- trinity-base_create_tmp_docfiles
- trinity-base_install_docfiles
-}
-
-pkg_postinst () {
- if use sudo; then
- einfo "Remember sudo use flag sets only the defauld value"
- einfo "It can be overriden on a user-level by adding:"
- einfo " [super-user-command]"
- einfo " super-user-command=su"
- einfo "To the kdeglobal config file which is should be usually"
- einfo "located in the ~/.trinity/share/config/ directory."
- fi
-}
diff --git a/trinity-base/kdelibs/metadata.xml b/trinity-base/kdelibs/metadata.xml
deleted file mode 100644
index ac4ddb96..00000000
--- a/trinity-base/kdelibs/metadata.xml
+++ /dev/null
@@ -1,13 +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="sudo"> Use <pkg>app-admin/sudo</pkg> as a default program to
- obtain root privileges.</flag>
- <flag name="utempter">Records user logins. Useful on multi-user systems</flag>
- </use>
-</pkgmetadata>
diff --git a/trinity-base/kdelirc/Manifest b/trinity-base/kdelirc/Manifest
deleted file mode 100644
index c59ac62b..00000000
--- a/trinity-base/kdelirc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdeutils-3.5.13.1.tar.gz 2829393 SHA256 3e7ab07fe1bb3e7be7ac3a3796366c88d3b79a58af911546e2c65e32363db527 SHA512 48733e472d0f5da85ef8a32ed6db7fa5e61f0682e49842439e6ea38a1e407059bb35efffe41fc6ed1a718511fd5b2b2c8222d816a23500a4dcbca17461f9a3bd WHIRLPOOL 1488e0c44f60b4d5e397dd2cf93de048eae1b915d4b2b7b1cf27768946f5aae3b5bcc3971ee28b5fa6a57a0b94cca6db0866138b69ad74f1f7bb97cdaaebdbe2
-DIST kdeutils-trinity-3.5.13.2.tar.xz 2259232 SHA256 b2999b9ef39bb2f269b84fdf34a814b5a5599aae7d05538d0bf680c18fb334fa SHA512 f501aa4b61bf440e873eec96f09c0c24ad780db2f9f14b884001c04c04aafccb5afb2b492dcf4fc640f3ec35d86aa419d67936122648a986662cd7b7f4f8a2d8 WHIRLPOOL 49296006875250212f0fdeb0c90c4f69cf0aa7cfd38415e2f7b50bdf81754de64562df2400f4932a502adbe84b58be34cae6c029d68cc62d0e91de5158513239
diff --git a/trinity-base/kdelirc/files/shared b/trinity-base/kdelirc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kdelirc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/ \ No newline at end of file
diff --git a/trinity-base/kdelirc/kdelirc-3.5.13.1.ebuild b/trinity-base/kdelirc/kdelirc-3.5.13.1.ebuild
deleted file mode 100644
index b7636506..00000000
--- a/trinity-base/kdelirc/kdelirc-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="KDElirc - Trinity Frontend to lirc"
-KEYWORDS="x86 amd64"
-IUSE=""
diff --git a/trinity-base/kdelirc/kdelirc-3.5.13.2.ebuild b/trinity-base/kdelirc/kdelirc-3.5.13.2.ebuild
deleted file mode 100644
index 01e91a64..00000000
--- a/trinity-base/kdelirc/kdelirc-3.5.13.2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdeutils"
-
-inherit trinity-meta
-
-DESCRIPTION="KDElirc - Trinity Frontend to lirc"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
diff --git a/trinity-base/kdelirc/metadata.xml b/trinity-base/kdelirc/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdelirc/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdenetwork-doc/Manifest b/trinity-base/kdenetwork-doc/Manifest
deleted file mode 100644
index 1d49700d..00000000
--- a/trinity-base/kdenetwork-doc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65
diff --git a/trinity-base/kdenetwork-doc/files/kdenetwork-3.5.13.1-fix-references-to-user-profile-directory-6f85c0c.patch b/trinity-base/kdenetwork-doc/files/kdenetwork-3.5.13.1-fix-references-to-user-profile-directory-6f85c0c.patch
deleted file mode 100644
index be286f17..00000000
--- a/trinity-base/kdenetwork-doc/files/kdenetwork-3.5.13.1-fix-references-to-user-profile-directory-6f85c0c.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/doc/knewsticker/index.docbook b/doc/knewsticker/index.docbook
-index 1532f8b..635acb2 100644
---- a/doc/knewsticker/index.docbook
-+++ b/doc/knewsticker/index.docbook
-@@ -1146,7 +1146,7 @@ necessary.</para>
- to talk to &knewsticker; but you can use it if you modified the
- configuration file by hand.</para>
- <tip><para>The configuration file is saved in
-- <filename>~/.kde/share/config/knewsticker_appletrc</filename></para></tip>
-+ <filename>~/.trinity/share/config/knewsticker_appletrc</filename></para></tip>
- <para>Example:</para>
- <screen width="40">
- <prompt>%</prompt> <userinput><command>dcop</command> <option>knewsticker</option> <option>KNewsTicker</option> <option>reparseConfig</option></userinput>
-diff --git a/doc/kopete/index.docbook b/doc/kopete/index.docbook
-index c6fba95..7c334b3 100644
---- a/doc/kopete/index.docbook
-+++ b/doc/kopete/index.docbook
-@@ -912,11 +912,11 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
-
- <para>The emoticons are easy to install - you just place a directory containing
- the icon files along with an XML file describing the mapping from text to picture in
--$KDEDIR/share/apps/kopete/pics/emoticons (or $KDEHOME, for example, in /home/joeuser/.kde/).</para>
-+$KDEDIR/share/apps/kopete/pics/emoticons (or $KDEHOME, for example, in /home/joeuser/.trinity/).</para>
-
- <orderedlist>
- <listitem><para>Copy the extracted directory to $KDEDIR/share/apps/kopete/pics/emoticons or
-- $HOME/.kde/share/apps/kopete/pics/emoticons (or wherever $KDEHOME is)</para></listitem>
-+ $HOME/.trinity/share/apps/kopete/pics/emoticons (or wherever $KDEHOME is)</para></listitem>
- <listitem><para>Select Configure &kopete; from the Settings menu and click on Appearance in the left panel of the Preferences window and click on the Emoticons tab</para></listitem>
- <listitem><para>Select the emoticons set you just installed from the list</para></listitem>
- <listitem><para>Now you can use the newly installed emoticons in &kopete;</para></listitem>
-diff --git a/doc/kppp/accounting.docbook b/doc/kppp/accounting.docbook
-index ec6db43..22a3064 100644
---- a/doc/kppp/accounting.docbook
-+++ b/doc/kppp/accounting.docbook
-@@ -11,7 +11,7 @@ the <userinput><option>-r</option>
- <replaceable>rule_file</replaceable></userinput> command line option to &kppp;
- and must be installed in <filename
- class="directory">${KDEDIR}/share/apps/kppp/Rules</filename> or in <filename
--class="directory">${HOME}/.kde/share/apps/kppp/Rules</filename> before you will
-+class="directory">${HOME}/.trinity/share/apps/kppp/Rules</filename> before you will
- be able to select it in this dialog.</para>
-
- <programlisting>
-diff --git a/doc/kwifimanager/index.docbook b/doc/kwifimanager/index.docbook
-index 07cc908..8c902d2 100644
---- a/doc/kwifimanager/index.docbook
-+++ b/doc/kwifimanager/index.docbook
-@@ -279,7 +279,7 @@
- This option is most useful when searching for the special network name
- <quote>any</quote>. In this mode, the card will log into any network it finds. The
- logfile's position is <filename class="directory"
-- >$<envar>HOME</envar>/.kde/share/apps/kwifimanager/wireless-log</filename>
-+ >$<envar>HOME</envar>/.trinity/share/apps/kwifimanager/wireless-log</filename>
- </para>
- </sect3>
- <sect3>
-diff --git a/doc/lisa/index.docbook b/doc/lisa/index.docbook
-index d93e31d..8dcccb5 100644
---- a/doc/lisa/index.docbook
-+++ b/doc/lisa/index.docbook
-@@ -584,7 +584,7 @@ MaxPingsAtOnce = 256 #send up to 256 ICMP echo requests at on
- <term><option>-k</option>, <option>--kde1</option></term>
- <listitem>
- <para>Search first for
--<filename>$<envar>HOME</envar>/.kde/share/config/lisarc</filename>, then
-+<filename>$<envar>HOME</envar>/.trinity/share/config/lisarc</filename>, then
- for
- <filename>$<envar>KDEDIR</envar>/share/config/lisarc</filename>.</para>
- </listitem>
diff --git a/trinity-base/kdenetwork-doc/files/shared b/trinity-base/kdenetwork-doc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kdenetwork-doc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/ \ No newline at end of file
diff --git a/trinity-base/kdenetwork-doc/kdenetwork-doc-3.5.13.1.ebuild b/trinity-base/kdenetwork-doc/kdenetwork-doc-3.5.13.1.ebuild
deleted file mode 100644
index 91376944..00000000
--- a/trinity-base/kdenetwork-doc/kdenetwork-doc-3.5.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdenetwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Documentaion for kdegraphics-derived packages"
-KEYWORDS="x86 amd64"
-IUSE=""
-RDEPEND="
- >=trinity-base/khelpcenter-${PV}:${SLOT}"
-
-PATCHES=(
- "${FILESDIR}/kdenetwork-3.5.13.1-fix-references-to-user-profile-directory-6f85c0c.patch" )
-
-pkg_setup() {
- # we should reduce MAKEOPTS -j parametr to no more than 4
- local makeopts_j
- makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')"
- if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then
- export MAKEOPTS="${MAKEOPTS//"${makeopts_j}"/-j4}"
-
- ewarn "This ebuild needs huge amoumt of memmory to compile in highly parallel"
- ewarn "mode so it can chew it all. MAKEOPTS are reduced to \"$MAKEOPTS\"."
- fi
-
- trinity-meta_pkg_setup
-}
diff --git a/trinity-base/kdenetwork-doc/metadata.xml b/trinity-base/kdenetwork-doc/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdenetwork-doc/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdenetwork-filesharing/Manifest b/trinity-base/kdenetwork-filesharing/Manifest
deleted file mode 100644
index 1d49700d..00000000
--- a/trinity-base/kdenetwork-filesharing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65
diff --git a/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch b/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch
deleted file mode 100644
index 956b28f4..00000000
--- a/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt
-index 41723ee..d466124 100644
---- a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt
-+++ b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt
-@@ -37,6 +37,24 @@ tde_add_library( filesharesamba STATIC_PIC AUTOMOC
- filemodedlgimpl.cpp smbpasswdfile.cpp passwd.cpp hiddenfileview.cpp
- dictmanager.cpp qmultichecklistitem.cpp smbconfconfigwidget.cpp
- linuxpermissionchecker.cpp expertuserdlg.ui
-+ DEPENDENCIES filesharesamba_generate_headers
-+)
-+
-+# Those headers are also required by target in another subdirectory.
-+# So we have to add such target for our generated header files to avoid
-+# race conditions.
-+# SEE cmake FAQ: http://www.cmake.org/Wiki/CMake_FAQ
-+#
-+add_custom_target( filesharesamba_generate_headers
-+ DEPENDS
-+ ${CMAKE_CURRENT_BINARY_DIR}/share.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/share.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/socketoptionsdlg.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/userselectdlg.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/groupselectdlg.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/usertab.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/filemodedlg.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/expertuserdlg.h
- )
-
-
-diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
-index 26d94f5..bd96ae6 100644
---- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt
-+++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
-@@ -11,7 +11,8 @@
-
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
-- ${CMAKE_CURRENT_BINARY_DIR}/../kcm_sambaconf
-+ ${CMAKE_BINARY_DIR}/filesharing/advanced/kcm_sambaconf
-+ ${CMAKE_SOURCE_DIR}/filesharing/advanced/kcm_sambaconf
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
- )
-@@ -32,7 +33,7 @@ install( FILES
-
- tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC
- SOURCES propertiespage.cpp propertiespagegui.ui
-- DEPENDENCIES filesharesamba
-+ DEPENDENCIES filesharesamba_generate_headers
- )
-
-
-diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
-index 5ff1af7..6042b9e 100644
---- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
-+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
-@@ -44,9 +44,9 @@
- #include "../nfs/nfsdialog.h"
-
- // Samba related
--#include "../kcm_sambaconf/sambafile.h"
--#include "../kcm_sambaconf/sambashare.h"
--#include "../kcm_sambaconf/sharedlgimpl.h"
-+#include "sambafile.h"
-+#include "sambashare.h"
-+#include "sharedlgimpl.h"
-
- #include "propertiespage.h"
-
diff --git a/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild b/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild
deleted file mode 100644
index a9fa878d..00000000
--- a/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdenetwork"
-
-inherit trinity-meta
-
-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch" )
diff --git a/trinity-base/kdenetwork-filesharing/metadata.xml b/trinity-base/kdenetwork-filesharing/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdenetwork-filesharing/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdenetwork-kfile-plugins/Manifest b/trinity-base/kdenetwork-kfile-plugins/Manifest
deleted file mode 100644
index 1d49700d..00000000
--- a/trinity-base/kdenetwork-kfile-plugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65
diff --git a/trinity-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.13.1.ebuild b/trinity-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.13.1.ebuild
deleted file mode 100644
index 49a9c9b7..00000000
--- a/trinity-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.13.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdenetwork"
-
-inherit trinity-meta
-
-DESCRIPTION="kfile plugins from the kdenetwork provides a torrent file support."
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/trinity-base/kdenetwork-kfile-plugins/metadata.xml b/trinity-base/kdenetwork-kfile-plugins/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdenetwork-kfile-plugins/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdepasswd/Manifest b/trinity-base/kdepasswd/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdepasswd/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/kdepasswd/files/shared b/trinity-base/kdepasswd/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kdepasswd/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files \ No newline at end of file
diff --git a/trinity-base/kdepasswd/kdepasswd-3.5.13.1.ebuild b/trinity-base/kdepasswd/kdepasswd-3.5.13.1.ebuild
deleted file mode 100644
index 44ee9c91..00000000
--- a/trinity-base/kdepasswd/kdepasswd-3.5.13.1.ebuild
+++ /dev/null
@@ -1,14 +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
-
-DESCRIPTION="Trinity GUI for passwd"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND=">=trinity-base/libkonq-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
diff --git a/trinity-base/kdepasswd/kdepasswd-3.5.13.2.ebuild b/trinity-base/kdepasswd/kdepasswd-3.5.13.2.ebuild
deleted file mode 100644
index 5cee2ede..00000000
--- a/trinity-base/kdepasswd/kdepasswd-3.5.13.2.ebuild
+++ /dev/null
@@ -1,14 +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
-
-DESCRIPTION="Trinity GUI for passwd"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=trinity-base/libkonq-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
diff --git a/trinity-base/kdepasswd/metadata.xml b/trinity-base/kdepasswd/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdepasswd/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/trinity-base/kdeprint/Manifest b/trinity-base/kdeprint/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdeprint/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-D