diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2009-09-11 17:14:35 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-09-11 23:52:47 -0400 |
| commit | 6658447f57b455e0534415f667137c57691a48ea (patch) | |
| tree | 52a477bfc7f165ee6379b7731085da538e8842cf /kde-base/kdeaccessibility-meta | |
| parent | ed65ebc4f4cd1bb5c19ec56f3db9ac01c5e61ab8 (diff) | |
| download | kde-6658447f57b455e0534415f667137c57691a48ea.tar.gz kde-6658447f57b455e0534415f667137c57691a48ea.tar.bz2 kde-6658447f57b455e0534415f667137c57691a48ea.zip | |
Add a new add_kdebase_dep() function, and inject it everywhere
The add_kdebase_dep function takes 1-2 arguments, the first being the
name of the package to depend upon, and the second being (optionally)
extra USE deps.
When given 1 argument, this function will output
!kdeprefix? ( >=kde-base/$1-${PV}[-kdeprefix] )
kdeprefix? ( >=kde-base/$1-${PV}:${SLOT}[kdeprefix] )
And 2 arguments outputs
!kdeprefix? ( >=kde-base/$1-${PV}[-kdeprefix,$2] )
kdeprefix? ( >=kde-base/$1-${PV}:${SLOT}[kdeprefix,$2] )
These are the proper deps to replace
>=kde-base/PKG-${PV}:${SLOT}[kdeprefix=,USEDEPS]
as it does not force an all-at-once upgrade of everything.
Some of the deps (the ones from kde4-base.eclass) were already in
this form, so there was an odd combination of packages that could be
installed in separate slots with -kdeprefix, and packages that couldn't.
Diffstat (limited to 'kde-base/kdeaccessibility-meta')
5 files changed, 28 insertions, 28 deletions
diff --git a/kde-base/kdeaccessibility-meta/Manifest b/kde-base/kdeaccessibility-meta/Manifest index c10d034dd88..1b52d2c7e54 100644 --- a/kde-base/kdeaccessibility-meta/Manifest +++ b/kde-base/kdeaccessibility-meta/Manifest @@ -1,5 +1,5 @@ -EBUILD kdeaccessibility-meta-4.3.0.ebuild 1008 RMD160 b8cc32a549d60305e57e27cc091ac73e1a90694b SHA1 e1f503287a1985f5254a9a6cc2d0e3bbfdb25fef SHA256 4ff8cafa749dbb7f66056a0c563f287c6ec964d9ac9b29053e63aa735816a4a4 -EBUILD kdeaccessibility-meta-4.3.67.ebuild 1010 RMD160 65249a5709bbc127bc5d654fd0e5ffe584daf107 SHA1 4e46c35de1a18ec8e628634a7f2345651c33ed84 SHA256 a817371221535753a2d8511487902c9b55a57f5db6da980ff433a17e4f30910e -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 +EBUILD kdeaccessibility-meta-4.3.0.ebuild 900 RMD160 d9e425739eb97f5daacc2291c52a326f029eeb65 SHA1 21efec63b3552f052b5293ef083fdd6a565e0153 SHA256 6920e24d723dfd0f0584dcc5df0637251b1e0b652b0bc0f7056f8c3278d5241d +EBUILD kdeaccessibility-meta-4.3.67.ebuild 902 RMD160 da0d8e2a419c8a1e7b38957fc384ed067eb15339 SHA1 c8d9d945bbd088df42267b7bf3dcddef51a27e0a SHA256 411ac88efc823f858810cb334bf1ef1313f4a755841b77ab0707135a855be5a3 +EBUILD kdeaccessibility-meta-4.3.9999.ebuild 859 RMD160 9c3a64e00dc754f9704ca2ef5d2f67052ebb956a SHA1 6e21d4120525f23e7270e0ac3f85bd7d0a803a8b SHA256 271e3de50e21999c204ed04033414cad2f7f7a60c516d3bbd0f6b0071c5bd258 +EBUILD kdeaccessibility-meta-9999.ebuild 860 RMD160 7689c4a76ed636f838093ddf0d0b9d10d8324c2e SHA1 00114daff1b01f04d06d26c296802b67dff82cc0 SHA256 6f50e79939eddf7758165f4ad39f877c23fb5e90f8527c0f81e35f8a8c47da1f MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0.ebuild index 6b98ff98ac4..e296b7c056f 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.0.ebuild @@ -14,12 +14,12 @@ 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=] + $(add_kdebase_dep kdeaccessibility-colorschemes) + $(add_kdebase_dep kdeaccessibility-iconthemes) + $(add_kdebase_dep kmag) + $(add_kdebase_dep kmousetool) + $(add_kdebase_dep kmouth) + $(add_kdebase_dep kttsd) $(block_other_slots) " # The following are disabled in CMakeLists.txt diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.67.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.67.ebuild index 05b783374bd..99d7a766106 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.67.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.67.ebuild @@ -14,12 +14,12 @@ 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=] + $(add_kdebase_dep kdeaccessibility-colorschemes) + $(add_kdebase_dep kdeaccessibility-iconthemes) + $(add_kdebase_dep kmag) + $(add_kdebase_dep kmousetool) + $(add_kdebase_dep kmouth) + $(add_kdebase_dep kttsd) $(block_other_slots) " # The following are disabled in CMakeLists.txt 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 0538f821f74..1b297a49f83 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.3.9999.ebuild @@ -14,12 +14,12 @@ KEYWORDS="" 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=] + $(add_kdebase_dep kdeaccessibility-colorschemes) + $(add_kdebase_dep kdeaccessibility-iconthemes) + $(add_kdebase_dep kmag) + $(add_kdebase_dep kmousetool) + $(add_kdebase_dep kmouth) + $(add_kdebase_dep kttsd) $(block_other_slots) " # The following are disabled in CMakeLists.txt diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild index de5daa35bef..cafc755356e 100644 --- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild +++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild @@ -14,12 +14,12 @@ KEYWORDS="" 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=] + $(add_kdebase_dep kdeaccessibility-colorschemes) + $(add_kdebase_dep kdeaccessibility-iconthemes) + $(add_kdebase_dep kmag) + $(add_kdebase_dep kmousetool) + $(add_kdebase_dep kmouth) + $(add_kdebase_dep kttsd) $(block_other_slots) " # The following are disabled in CMakeLists.txt |