virtualx.eclass now has support for manually setting the flags under which the dependancy applies; use it

Package-Manager: portage--svn/cvs/Linux i686

8 files changed, 44 insertions, 36 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 61799a8c1567..1894babf788f 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.141 2009/10/14 00:56:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.142 2009/10/19 21:25:16 abcd Exp $
+
+  19 Oct 2009; Jonathan Callen <abcd@gentoo.org> heimdal-0.7.2-r3.ebuild,
+  heimdal-1.2.1.ebuild, heimdal-1.2.1-r1.ebuild, heimdal-1.2.1-r2.ebuild,
+  heimdal-1.2.1-r3.ebuild, heimdal-1.2.1-r4.ebuild:
+  virtualx.eclass now has support for manually setting the flags under which
+  the dependancy applies; use it
 
   14 Oct 2009; Mark Loeser <halcy0n@gentoo.org> heimdal-0.7.2-r3.ebuild,
   heimdal-1.2.1.ebuild, heimdal-1.2.1-r1.ebuild, heimdal-1.2.1-r2.ebuild:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 2533da03b7a3..d25d738adbcb 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX heimdal-0.7.2-as_needed.patch 853 RMD160 5c03f5008e395e87c48f89fe91828e0d034de7db SHA1 0b4dda9830d36185055b66976436545e3daa926b SHA256 640969f1ebe65bae204d45b076dbd488f62a4fd5cf6d96bdc5373423e71f39e3
 AUX heimdal-autoconf-2.64.patch 364 RMD160 1b362be75f32eaf79502aa406db7ded25a2878d7 SHA1 1727677c8e5de5c12469a44a28c61f04b15d6a37 SHA256 2dc9dfb773b58b54d1aef76362db734066828893dd1e2ffcee9e20b3484abbf3
 AUX heimdal-autoconf-ipv6-backport.patch 4521 RMD160 0ee4317834939d23bd34cce02034bd3de7eb1022 SHA1 768461c3a40d55ecae3872c8957249fef0e71201 SHA256 6a1f8d23072e5b5a2253e3eb0fc931a4dc7f0be8076466b0f8993e644de5248f
@@ -14,18 +11,11 @@ DIST heimdal-0.7.2-gentoo-patches-0.2.tar.bz2 7500 RMD160 87240de8914b05c552ceb7
 DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 SHA1 a902e6ad7c31d940b588dc0235b348936f0d719d SHA256 28661862ac8cbbd62ddddbda7db760b622b903c88c06f2fbdbf7b97be47eac60
 DIST heimdal-1.2.1.tar.gz 5234882 RMD160 055e858200e53108ac24760516ff9d58e4fee0d2 SHA1 68b013a68bca7d544d29af0f890b9c668ec16936 SHA256 4e32be8d42824f2c58dffa435300e2dd0f0c3bbc6931afcbd450122067f76493
 DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a
-EBUILD heimdal-0.7.2-r3.ebuild 3571 RMD160 9e165ba510191fdda0e115950360dedd39fb3247 SHA1 e7ec1422ef7162b86e43bd9441a5d88a171e1925 SHA256 a42b6cfbfa5976f168153412725aca24125decc9f095e61d14077d9318e69a6e
-EBUILD heimdal-1.2.1-r1.ebuild 4170 RMD160 8390faecc49a1bbc21a36c54ff7e2f2ba3ff7a7b SHA1 2e2c148bdd61787cc4209ea8eb9c865ef5805cf1 SHA256 c9cf7449cd8362a1ac0ec41a9dc9eed938bd65d0da0b00906a2b5d6ee3deaeaf
-EBUILD heimdal-1.2.1-r2.ebuild 3890 RMD160 572cc1cb31ad31efe05f47ad07a314b1ef38c1bc SHA1 250a580c1b178c4380c4ae772c717293b70185ec SHA256 deed1c2fb726c99c1b0b0adcdd564727624749f73da87f0f5fc6a4dcda774ec0
-EBUILD heimdal-1.2.1-r3.ebuild 3956 RMD160 6bfb58e2a8c93fa27f93230103fc309598da3eb1 SHA1 9dfee25f264bf55365f1a2ef4f13fad22f3a6a73 SHA256 27305a2b6d2a6a6527d02de08cb82741e092019deefb422797b75394162c55b1
-EBUILD heimdal-1.2.1-r4.ebuild 4004 RMD160 f49fcaa46207e590438513e71541798a640c11c3 SHA1 70c46898459b678f0879d1fd3cf8e0150beefecd SHA256 051b10d8a1b7fe08237dbf023a5e1a1f05df8f429721e57e6479b7183d7215b9
-EBUILD heimdal-1.2.1.ebuild 4082 RMD160 9159ae61ebcb52fe3cc1ae706e6d625f032e1721 SHA1 b04c3ee5f490580f5a25b390f98ca08890d09408 SHA256 0287521147296832ce05cca051ab35e37e9e27620aa18269295e72aa37659346
-MISC ChangeLog 23188 RMD160 622ccfbae68bc755d211bfbaa90a61e1fc0e2fe6 SHA1 d44df32d2f49f444114f3f3ddad5ad3a500eda82 SHA256 bdf58439e6cdcb3b8d2e015d21117ec224440bab4ef28a4fd1d7bf5ed62bfd69
+EBUILD heimdal-0.7.2-r3.ebuild 3637 RMD160 91cf47444b0f743bf459cd127c0779b3fa41affc SHA1 28755e70e2f2986baef7c0b34ff6f785efe35821 SHA256 733c57b0a69b47948aabdbeac000838db4f390bed1227dce332945a8fc96ab7b
+EBUILD heimdal-1.2.1-r1.ebuild 4236 RMD160 eff130219fd445e93ac6e238929d737d76a42a3b SHA1 56dc7338978375bf0af68ca090ca95a8549acea6 SHA256 c05428a7f14f6525fe30654d3caf97791c3d28c96482b19858b8956821267ba7
+EBUILD heimdal-1.2.1-r2.ebuild 3956 RMD160 af37e2d9af0d4d35bc39844f98ccea03d3e7a971 SHA1 242765ac9974011d6d029cfafe5e556bbb3fb9f0 SHA256 2b9cc07dfe76cea7e50bc81cbc5ab669c808c29143395b1617db2ca71bab58a5
+EBUILD heimdal-1.2.1-r3.ebuild 4024 RMD160 5bf6818386d2ede00242afda4c153c572d629b5c SHA1 5261dbefaf190364b5bd0a4ed2ff31e4f1558ab6 SHA256 82af9a399e88d972d72410b2bb47672837cd4dde106479800dbc3cb22ad1a53e
+EBUILD heimdal-1.2.1-r4.ebuild 4072 RMD160 d2f880487e9bfb18eb3c1cb8ad7047de830429a7 SHA1 0e7de9f27888623a1d261b4aad80c31c090e520f SHA256 f261b94f817e35a5ad451ea778e5f66b925692262343b06e3290702f687808df
+EBUILD heimdal-1.2.1.ebuild 4148 RMD160 30ec52621fe71d5348b6b1197f0cbdddb85fa50c SHA1 9050946a6cfdbb4711ec2263863f3db563aaf92c SHA256 ef0bbaa88a199875ddd58b0ad8782aedcb21310316b15f655a67bc311ed407d7
+MISC ChangeLog 23496 RMD160 8ec47b6ab33a4adcdbb390c0abbc21b1b0758d4c SHA1 7272d4baff345593f576aafbe7eaca439c133a46 SHA256 18318f514f58636bac83c343857d1ef4911e95c759c69861279dc9be04a3e52b
 MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEUEARECAAYFAkrVIawACgkQCRZPokWLroRPOACgmpSinNtoiMBJyl6/rlXyK3Zd
-VJwAmOUorxhOf0l3BKKCLZrdZBTxuyw=
-=4QpR
------END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
index c253a7da4295..b3f813bc4e36 100644
--- a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.18 2009/10/14 00:56:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.19 2009/10/19 21:25:16 abcd Exp $
 
 WANT_AUTOMAKE=1.8
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -18,7 +19,7 @@ SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl berkdb ipv6 ldap X"
+IUSE="ssl berkdb ipv6 ldap test X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -26,7 +27,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 	|| ( ( >sys-libs/e2fsprogs-libs-1.40.11 ) ( sys-libs/com_err sys-libs/ss ) )
 	sys-libs/cracklib
 	!virtual/krb5"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 PROVIDE="virtual/krb5"
 
 GENTOODIR=${WORKDIR}/gentoo
diff --git a/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild
index 621d8255d7f7..fa6f1a7a75a0 100644
--- a/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild,v 1.12 2009/10/14 00:56:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r1.ebuild,v 1.13 2009/10/19 21:25:16 abcd Exp $
 
 EAPI=1
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -18,7 +19,7 @@ SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl test threads X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -31,7 +32,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 #	>=sys-devel/libtool-2.2"
 
 PROVIDE="virtual/krb5"
diff --git a/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild
index 0860bde5a509..f08cb7db2186 100644
--- a/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild,v 1.3 2009/10/14 00:56:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild,v 1.4 2009/10/19 21:25:16 abcd Exp $
 
 EAPI=1
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -18,7 +19,7 @@ SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl test threads X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -31,7 +32,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 #	>=sys-devel/libtool-2.2"
 
 PROVIDE="virtual/krb5"
diff --git a/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild
index 69368be12a8e..45dc2d4870f6 100644
--- a/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild,v 1.3 2009/08/06 08:58:45 mueli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r3.ebuild,v 1.4 2009/10/19 21:25:16 abcd Exp $
 
 EAPI=1
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -18,7 +19,7 @@ SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl test threads X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -32,7 +33,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 #	>=sys-devel/libtool-2.2"
 
 PROVIDE="virtual/krb5"
diff --git a/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild
index 4d4bc5b365db..3c228e90dc4a 100644
--- a/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild
+++ b/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild,v 1.1 2009/08/27 07:54:57 mueli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild,v 1.2 2009/10/19 21:25:16 abcd Exp $
 
 EAPI=1
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -18,7 +19,7 @@ SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl test threads X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -32,7 +33,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 #	>=sys-devel/libtool-2.2"
 
 PROVIDE="virtual/krb5"
diff --git a/app-crypt/heimdal/heimdal-1.2.1.ebuild b/app-crypt/heimdal/heimdal-1.2.1.ebuild
index 2d97f864d7de..c45965430c5e 100644
--- a/app-crypt/heimdal/heimdal-1.2.1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.2.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1.ebuild,v 1.3 2009/10/14 00:56:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1.ebuild,v 1.4 2009/10/19 21:25:16 abcd Exp $
 
 EAPI=1
+VIRTUALX_REQUIRED="manual"
 
 inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
 
@@ -17,7 +18,7 @@ SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl test threads X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
@@ -31,7 +32,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 #	>=sys-devel/libtool-2.2"
 
 PROVIDE="virtual/krb5"