diff options
77 files changed, 727 insertions, 52 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 1129161ae24..9338d1dc1b7 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -173,13 +173,7 @@ case ${KDEBASE} in _pvn="-${PV}" # Block installation of other SLOTS unless kdeprefix - for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do - # Block non kdeprefix ${PN} on other slots - if [[ ${SLOT} != ${slot} ]]; then - RDEPEND+=" !kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" - fi - done - unset slot + RDEPEND+=" $(block_other_slots)" ;; koffice) SLOT="2" diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 2814b28a213..6495d7320a9 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -352,3 +352,17 @@ load_library_dependencies() { done eend $? } + +# @FUNCTION: block_other_slots +# @DESCRIPTION: +# Create blocks for the current package in other slots when +# installed with USE=-kdeprefix +block_other_slots() { + local slot + for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do + # Block non kdeprefix ${PN} on other slots + if [[ ${SLOT} != ${slot} ]]; then + echo "!kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" + fi + done +} diff --git a/kde-base/kde-meta/Manifest b/kde-base/kde-meta/Manifest index 709337a66ab..5521a81472b 100644 --- a/kde-base/kde-meta/Manifest +++ b/kde-base/kde-meta/Manifest @@ -1,4 +1,5 @@ -EBUILD kde-meta-4.3.61.ebuild 1578 RMD160 bec50c814dacfa4af3e481a8b8063dda8fbcfc15 SHA1 59e91104bf4b3872dd05f3c52dfe6b2ab209caca SHA256 0376adc118fa32d4cd98c10dae80b56bf3513e0f4e34d780becd042932def3e0 -EBUILD kde-meta-4.3.9999.ebuild 1536 RMD160 8d626fabf91e3012ba938d983eb47686bd4759da SHA1 46c7f7da5abea292f4f8c423e1a1ec02f7d65883 SHA256 6d23b2bfb2e07a53d6c77a6e484aaafc12f610eb9a20aca5a8258d6c230b6e53 -EBUILD kde-meta-9999.ebuild 1537 RMD160 8b14e8c69b63a99fc2bc1ab43d32763da0c440ff SHA1 c0e4a036916a910eb48c8a0d1aab4403c40757bc SHA256 5aaa617690f1f28d637af97a2ef02f3d125d4305d3b0cc577bcbd9c1709cb37c +EBUILD kde-meta-4.3.0-r1.ebuild 1622 RMD160 f86ba5721aa3085ac6326ea069af3df27f0fb6e9 SHA1 1907d9f8ea2fde4690432ae28849e9958d855602 SHA256 30b36aaf5b1f5d80f3c7a9f5649299f1871f5abfcae37ace4ca328af4e50b8ac +EBUILD kde-meta-4.3.61-r1.ebuild 1623 RMD160 a8335f762f0454052c520c6cddb2659066bcaac5 SHA1 2e351bb3aee3dd60c9255179f63af0bf48e644d5 SHA256 c8545a53830bca6b52cbfffe4f926d99952d4f29811cfd0084576829c072d2a7 +EBUILD kde-meta-4.3.9999.ebuild 1581 RMD160 fb6aa899f67cedb5473ac1085cd284bb9c33a39a SHA1 42b40acf31c45a8b62933fa67cc0fed0d77bebcc SHA256 270f731b994986e6f519502c2b704d093e7a3b463c81a2afda792d0c8c2b1c86 +EBUILD kde-meta-9999.ebuild 1582 RMD160 8b9eeb3df25a08406a3c8a621f8a0a9f225719e0 SHA1 93f0421b3e376af639ddd3c7b57f07fee1697df5 SHA256 6bfa3a7c807b55faac5f03b0a21d2329038aa88e9243020aa38da38abfbf2900 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kde-meta/kde-meta-4.3.0-r1.ebuild b/kde-base/kde-meta/kde-meta-4.3.0-r1.ebuild new file mode 100644 index 00000000000..a7d291b8bbf --- /dev/null +++ b/kde-base/kde-meta/kde-meta-4.3.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.3.0.ebuild,v 1.1 2009/08/04 00:17:53 wired Exp $ + +EAPI="2" +inherit kde4-functions + +DESCRIPTION="KDE - merge this to pull in all non-developer, split kde-base/* packages" +HOMEPAGE="http://www.kde.org/" +LICENSE="GPL-2" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +SLOT="4.3" +IUSE="accessibility kdeprefix +mysql nls" + +# excluded: kdebindings, kdesdk, kdevelop, since these are developer-only +RDEPEND=" + >=kde-base/kate-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeadmin-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeartwork-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdebase-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeedu-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdegames-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdegraphics-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdemultimedia-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdenetwork-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeplasma-addons-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdetoys-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeutils-meta-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdewebdev-meta-${PV}:${SLOT}[kdeprefix=] + accessibility? ( >=kde-base/kdeaccessibility-meta-${PV}:${SLOT}[kdeprefix=] ) + mysql? ( >=kde-base/kdepim-meta-${PV}:${SLOT}[kdeprefix=] ) + nls? ( >=kde-base/kde-l10n-${PV}:${SLOT}[kdeprefix=] ) + $(block_other_slots) +" +# make kdepim-meta optional since it requires long hated mysql which people tend +# not to want in their system. But also enable it by default diff --git a/kde-base/kde-meta/kde-meta-4.3.61.ebuild b/kde-base/kde-meta/kde-meta-4.3.61-r1.ebuild index 8f6bc8d3d23..643d981089e 100644 --- a/kde-base/kde-meta/kde-meta-4.3.61.ebuild +++ b/kde-base/kde-meta/kde-meta-4.3.61-r1.ebuild @@ -3,6 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.2.4.ebuild,v 1.2 2009/06/04 23:40:43 alexxy Exp $ EAPI="2" +inherit kde4-functions DESCRIPTION="KDE - merge this to pull in all non-developer, split kde-base/* packages" HOMEPAGE="http://www.kde.org/" @@ -30,6 +31,7 @@ RDEPEND=" accessibility? ( >=kde-base/kdeaccessibility-meta-${PV}:${SLOT}[kdeprefix=] ) mysql? ( >=kde-base/kdepim-meta-${PV}:${SLOT}[kdeprefix=] ) nls? ( >=kde-base/kde-l10n-${PV}:${SLOT}[kdeprefix=] ) + $(block_other_slots) " # make kdepim-meta optional since it requires long hated mysql which people tend # not to want in their system. But also enable it by default diff --git a/kde-base/kde-meta/kde-meta-4.3.9999.ebuild b/kde-base/kde-meta/kde-meta-4.3.9999.ebuild index 23f6fefb645..3c3f87c5ad2 100644 --- a/kde-base/kde-meta/kde-meta-4.3.9999.ebuild +++ b/kde-base/kde-meta/kde-meta-4.3.9999.ebuild @@ -3,6 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.2.4.ebuild,v 1.2 2009/06/04 23:40:43 alexxy Exp $ EAPI="2" +inherit kde4-functions DESCRIPTION="KDE - merge this to pull in all non-developer, split kde-base/* packages" HOMEPAGE="http://www.kde.org/" @@ -30,6 +31,7 @@ RDEPEND=" accessibility? ( >=kde-base/kdeaccessibility-meta-${PV}:${SLOT}[kdeprefix=] ) mysql? ( >=kde-base/kdepim-meta-${PV}:${SLOT}[kdeprefix=] ) nls? ( >=kde-base/kde-l10n-${PV}:${SLOT}[kdeprefix=] ) + $(block_other_slots) " # make kdepim-meta optional since it requires long hated mysql which people tend # not to want in their system. But also enable it by default diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild index 4ee089e71b2..1c2aed659fb 100644 --- a/kde-base/kde-meta/kde-meta-9999.ebuild +++ b/kde-base/kde-meta/kde-meta-9999.ebuild @@ -3,6 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.2.4.ebuild,v 1.2 2009/06/04 23:40:43 alexxy Exp $ EAPI="2" +inherit kde4-functions DESCRIPTION="KDE - merge this to pull in all non-developer, split kde-base/* packages" HOMEPAGE="http://www.kde.org/" @@ -30,6 +31,7 @@ RDEPEND=" accessibility? ( >=kde-base/kdeaccessibility-meta-${PV}:${SLOT}[kdeprefix=] ) mysql? ( >=kde-base/kdepim-meta-${PV}:${SLOT}[kdeprefix=] ) nls? ( >=kde-base/kde-l10n-${PV}:${SLOT}[kdeprefix=] ) + $(block_other_slots) " # make kdepim-meta optional since it requires long hated mysql which people tend # not to want in their system. But also enable it by default diff --git a/kde-base/kdeaccessibility-meta/Manifest b/kde-base/kdeaccessibility-meta/Manifest index cc36b456124..15b4e7d8c4e 100644 --- a/kde-base/kdeaccessibility-meta/Manifest +++ b/kde-base/kdeaccessibility-meta/Manifest @@ -1,4 +1,5 @@ -EBUILD kdeaccessibility-meta-4.3.61.ebuild 964 RMD160 8bc34708c3d7e2bbd302009cf0107e6667075ad5 SHA1 9dabf59b74c0ce1cd3c124b3dd3196d9a66b6960 SHA256 fc4004a4e6dce42bdf38a688509e10d3b90ff6475112ef8aca09655f116cd358 -EBUILD kdeaccessibility-meta-4.3.9999.ebuild 922 RMD160 ad51a21e0774234f3dcf03a16d0cbb6399e8dc85 SHA1 0f46f4853232b122c28566bcf61f2fb4dc3bbfc0 SHA256 16dd9c196635ed767c51dd14c99195c9bc707e9b971eea9a2e27613b00e0e130 -EBUILD kdeaccessibility-meta-9999.ebuild 923 RMD160 edc3fa383d6469fc69a0873fc494bf6fd6d627af SHA1 6441381598add36b10436a487aac94a921c4d8b8 SHA256 15f33fa2fd6a6af45b8841c91aa2bb9cc2693fbc7af3484e3a4ff8edc37d1018 +EBUILD kdeaccessibility-meta-4.3.0-r1.ebuild 1008 RMD160 b8cc32a549d60305e57e27cc091ac73e1a90694b SHA1 e1f503287a1985f5254a9a6cc2d0e3bbfdb25fef SHA256 4ff8cafa749dbb7f66056a0c563f287c6ec964d9ac9b29053e63aa735816a4a4 +EBUILD kdeaccessibility-meta-4.3.61-r1.ebuild 1009 RMD160 8d40f518d6fd84c936ebf72ac476a55ad1ef9d47 SHA1 d34f482a14cb3c2e2f0c89997988f69362c4b8b8 SHA256 38aaa0eff8d4cfa28e268b52470df4a973488e3fdeef1dd4883530c78445c9a3 +EBUILD kdeaccessibility-meta-4.3.9999.ebuild 967 RMD160 c83eab1e04566790379354b9daf39d579be0f190 SHA1 042ea2b44a39a41af880f3fe503cc5209ad4253f SHA256 09f046f4bce830b57397246698df2adc9a8d7cfbe70a19b0b999dc02e2ef5db8 +EBUILD kdeaccessibility-meta-9999.ebuild 968 RMD160 b5b5140e879c174d8711c3b12ee67be25c262d3b SHA1 2d81c534b2e619573bad7efd05fce6612c802d80 SHA256 33ecb9846d532267bd6bdc1b343691ca3514b25d97a6c1efd53596fbdd34b409 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0-r1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0-r1.ebuild new file mode 100644 index 00000000000..6b98ff98ac4 --- /dev/null +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0.ebuild,v 1.1 2009/08/04 00:03:18 wired Exp $ + +EAPI="2" +inherit kde4-functions + +DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages" +HOMEPAGE="http://www.kde.org/" + +LICENSE="GPL-2" +SLOT="4.3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="kdeprefix" + +RDEPEND=" + >=kde-base/kdeaccessibility-colorschemes-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kdeaccessibility-iconthemes-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kmag-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kmousetool-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kmouth-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kttsd-${PV}:${SLOT}[kdeprefix=] + $(block_other_slots) +" +# The following are disabled in CMakeLists.txt +# >=kde-base/kbstateapplet-${PV}:${SLOT} - kicker applet +# >=kde-base/ksayit-${PV}:${SLOT} - doesn't compile diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.61.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.61-r1.ebuild index ca1396f76d8..3013e8d4785 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.61.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.61-r1.ebuild @@ -3,6 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.2.4.ebuild,v 1.2 2009/06/04 23:21:23 alexxy Exp $ EAPI="2" +inherit kde4-functions DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages" HOMEPAGE="http://www.kde.org/" @@ -19,6 +20,7 @@ RDEPEND=" >=kde-base/kmousetool-${PV}:${SLOT}[kdeprefix=] >=kde-base/kmouth-${PV}:${SLOT}[kdeprefix=] >=kde-base/kttsd-${PV}:${SLOT}[kdeprefix=] + $(block_other_slots) " # The following are disabled in CMakeLists.txt # >=kde-base/kbstateapplet-${PV}:${SLOT} - kicker applet diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild index e176732c0b9..0538f821f74 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild @@ -3,6 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.2.4.ebuild,v 1.2 2009/06/04 23:21:23 alexxy Exp $ EAPI="2" +inherit kde4-functions DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages" HOMEPAGE="http://www.kde.org/" @@ -19,6 +20,7 @@ RDEPEND=" >=kde-base/kmousetool-${PV}:${SLOT}[kdeprefix=] >=kde-base/kmouth-${PV}:${SLOT}[kdeprefix=] >=kde-base/kttsd-${PV}:${SLOT}[kdeprefix=] + $(block_other_slots) " # The following are disabled in CMakeLists.txt # >=kde-base/kbstateapplet-${PV}:${SLOT} - kicker applet diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild index 855d562e899..de5daa35bef 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild +++ b/ |