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

(Portage version: -svn/cvs/Linux i686)

7 files changed, 37 insertions, 19 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/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"