dev-java/antlr: Fix usage of python-r1.eclass

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

6 files changed, 20 insertions, 7 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index ed8b2aed063b..8fc1de51752d 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/antlr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.97 2013/05/09 12:19:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.98 2013/06/30 15:22:51 jlec Exp $
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> antlr-2.7.7-r1.ebuild,
+  antlr-2.7.7-r3.ebuild, antlr-2.7.7-r4.ebuild, antlr-2.7.7-r5.ebuild,
+  metadata.xml:
+  Fix usage of python-r1.eclass
 
   09 May 2013; Tom Wijsman <TomWij@gentoo.org> antlr-2.7.7-r2.ebuild,
   antlr-2.7.7.ebuild:
diff --git a/dev-java/antlr/antlr-2.7.7-r1.ebuild b/dev-java/antlr/antlr-2.7.7-r1.ebuild
index a1039e6e6951..b16e86a73c55 100644
--- a/dev-java/antlr/antlr-2.7.7-r1.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.4 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.5 2013/06/30 15:22:51 jlec Exp $
 
 EAPI="5"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc debug examples mono +cxx +java python script source"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 # TODO do we actually need jdk at runtime?
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=virtual/jdk-1.3
diff --git a/dev-java/antlr/antlr-2.7.7-r3.ebuild b/dev-java/antlr/antlr-2.7.7-r3.ebuild
index b5c63fa4f8e3..52dc1db4e9d7 100644
--- a/dev-java/antlr/antlr-2.7.7-r3.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.4 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.5 2013/06/30 15:22:51 jlec Exp $
 
 EAPI="5"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 # TODO do we actually need jdk at runtime?
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=virtual/jdk-1.3
diff --git a/dev-java/antlr/antlr-2.7.7-r4.ebuild b/dev-java/antlr/antlr-2.7.7-r4.ebuild
index d560faf6ff10..e54106f7aa7a 100644
--- a/dev-java/antlr/antlr-2.7.7-r4.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.3 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.4 2013/06/30 15:22:51 jlec Exp $
 
 EAPI="5"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 # TODO do we actually need jdk at runtime?
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=virtual/jdk-1.3
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index 7628e6d2b7f4..c758d063617d 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.5 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.6 2013/06/30 15:22:51 jlec Exp $
 
 EAPI="5"
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc debug examples mono +cxx +java python script source static-libs"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 # TODO do we actually need jdk at runtime?
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=virtual/jdk-1.3
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index a741ce4939d6..4dc254b63a74 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>java</herd>
   <use>
-	  <flag name="script">Install a script to run antlr</flag>
-	  <flag name="gunit" restrict=">=dev-java/antlr-3.1.3-r1">
+    <flag name="script">Install a script to run antlr</flag>
+    <flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
 		  gUnit is a "Unit Test" framework for ANTLR grammars
 	  </flag>
   </use>