Rename nocxx and nojava to cxx and java and turn them on by default using EAPI 1.

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index b607612418acf647d838963ccb861b874e5b4471..c28885fb38f54088ba286d33a29e2049f61a5cee 100644 (file)
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.61 2008/03/08 13:26:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.62 2008/03/08 13:31:43 betelgeuse Exp $
+
+  08 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
+  Rename nocxx and nojava to cxx and java and turn them on by default using
+  EAPI 1.
 
   08 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
   Fix quoting and nocxx use under the examples use flag. Fixes bug #212703.

diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index a44de49b43ecf737fed2133a42f97fac0d4347d3..873e3b67991e2698904abfcd06bf576415728e80 100644 (file)
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 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.ebuild,v 1.9 2008/03/08 13:26:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.10 2008/03/08 13:31:43 betelgeuse Exp $
+
+EAPI=1
 
 inherit java-pkg-2 mono distutils multilib
 
@@ -11,7 +13,7 @@ SRC_URI="http://www.antlr.org/download/${P}.tar.gz"
 LICENSE="ANTLR"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc debug examples mono nocxx nojava python script source"
+IUSE="doc debug examples mono +cxx +java python script source"
 
 # TODO do we actually need jdk at runtime?
 RDEPEND=">=virtual/jdk-1.3
@@ -27,12 +29,12 @@ src_compile() {
        JAVACFLAGS="+ ${JAVACFLAGS}"
 
        # mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-       CSHARPC="mcs" econf $(use_enable !nojava java) \
+       CSHARPC="mcs" econf $(use_enable java) \
                $(use_enable python) \
                $(use_enable mono csharp) \
                $(use_enable debug) \
                $(use_enable examples) \
-               $(use_enable !nocxx cxx) \
+               $(use_enable cxx) \
                --enable-verbose || die "configure failed"
 
        emake || die "compile failed"
@@ -49,12 +51,12 @@ src_install() {
        exeinto /usr/bin
        doexe "${S}"/scripts/antlr-config
 
-       if ! use nocxx ; then
+       if use cxx ; then
                cd "${S}"/lib/cpp
                einstall || die "failed to install C++ files"
        fi
 
-       if ! use nojava ; then
+       if use java ; then
                java-pkg_dojar "${S}"/antlr/antlr.jar
 
                use script && java-pkg_dolauncher antlr --main antlr.Tool
@@ -87,11 +89,11 @@ src_install() {
                dodir /usr/share/doc/${PF}/examples
                insinto /usr/share/doc/${PF}/examples
 
-               use nocxx || doins -r "${S}"/examples/cpp
-               use nojava || doins -r "${S}"/examples/java
+               use cxx && doins -r "${S}"/examples/cpp
+               use java && doins -r "${S}"/examples/java
                use mono && doins -r "${S}"/examples/csharp
                use python && doins -r "${S}"/examples/python
        fi
 
-       newdoc "${S}"/README.txt README
+       newdoc "${S}"/README.txt README || die
 }