Defaulting to java support for axxo; Minor other changes for bug #80862

Package-Manager: portage-2.1_pre2

4 files changed, 129 insertions, 2 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index f6308254a283..8d61aa129ee8 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.31 2005/12/13 19:03:06 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.32 2005/12/29 23:22:01 compnerd Exp $
+
+*antlr-2.7.5-r2 (29 Dec 2005)
+
+  29 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +antlr-2.7.5-r2.ebuild:
+  Adding nojava useflag as per axxo's request.  Fixing script issue (bug #80862)
+  with script useflag.
 
   13 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   antlr-2.7.5-r1.ebuild:
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index c02c60effeaf..76e855dc0d25 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,9 +1,11 @@
-MD5 bc2b835e64954a07c5ddab16a01518c4 ChangeLog 4663
+MD5 fae61004e0ad2874a3cc94610364be07 ChangeLog 4881
 MD5 d34defbac0b825bb89496e1c71b9f38d antlr-2.7.3.ebuild 835
 MD5 ee19998d8ed1a41fb4402d1d4aeecd9e antlr-2.7.4.ebuild 1019
 MD5 52677b4468992891f837a8f60770eb34 antlr-2.7.5-r1.ebuild 2618
+MD5 699f3ecc7c3577ea62cee28b60baa9d6 antlr-2.7.5-r2.ebuild 2768
 MD5 f48a40b0b28f1cb3e973c726c883f501 files/antlr.pc.in 155
 MD5 021b7855447990ffc37500ffb64fb834 files/digest-antlr-2.7.3 64
 MD5 a2da49e52406fae792c6d38bdf980d0f files/digest-antlr-2.7.4 64
 MD5 f40028cdafa23c0b364b0ef1287460ce files/digest-antlr-2.7.5-r1 64
+MD5 f40028cdafa23c0b364b0ef1287460ce files/digest-antlr-2.7.5-r2 64
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/antlr/antlr-2.7.5-r2.ebuild b/dev-java/antlr/antlr-2.7.5-r2.ebuild
new file mode 100644
index 000000000000..6bf503dafe4f
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.5-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r2.ebuild,v 1.1 2005/12/29 23:22:01 compnerd Exp $
+
+inherit gnuconfig java-pkg mono distutils multilib
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="http://www.antlr.org/download/${P}.tar.gz"
+
+LICENSE="ANTLR"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc debug examples mono nocxx nojava python script source"
+
+RDEPEND="java? ( >=virtual/jdk-1.2 dev-java/java-config )
+		 mono? ( dev-lang/mono dev-util/pkgconfig )
+		 python? ( dev-lang/python )
+		 source? ( app-arch/zip )"
+DEPEND="${RDEPEND}
+		script? ( !dev-util/pccts )
+		>=virtual/jdk-1.2
+		>=sys-apps/sed-4
+		  sys-apps/findutils"
+
+src_compile() {
+	gnuconfig_update
+
+	local myconf=
+
+	if use nocxx ; then
+		myconf="--disable-cxx"
+	else
+		myconf="--enable-cxx"
+	fi
+
+	if use nojava ; then
+		myconf="${myconf} --disable-java"
+	else
+		myconf="${myconf} --enable-java"
+	fi
+
+	econf $(use_enable python) \
+		  $(use_enable mono csharp) \
+		  $(use_enable debug) \
+		  $(use_enable examples) \
+		  ${myconf} \
+		  --enable-verbose || die "configure failed"
+
+	emake || die "compile failed"
+
+	sed -e "s|@prefix@|/usr/|" \
+		-e 's|@exec_prefix@|${prefix}|' \
+		-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
+		-e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \
+		-e "s|@VERSION@|${PV}|" \
+		${FILESDIR}/antlr.pc.in > ${S}/antlr.pc
+
+	if use script ; then
+		cat > antlr.sh <<-EOF
+		#!/bin/sh
+		ANTLR_JAR=\$(java-config -p antlr)
+		\$(java-config -J) -cp \$ANTLR_JAR antlr.Tool \$*
+		EOF
+	fi
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe ${S}/scripts/antlr-config
+	use script && newexe ${S}/antlr.sh antlr
+
+	if ! use nocxx ; then
+		cd ${S}/lib/cpp
+		einstall || die "failed to install C++ files"
+	fi
+
+	# The jar is needed at all times
+	java-pkg_dojar ${S}/antlr/antlr.jar
+
+	if ! use nojava ; then
+		use source && java-pkg_dosrc ${S}/antlr
+		use doc && java-pkg_dohtml -r doc/*
+	fi
+
+	if use mono ; then
+		cd ${S}/lib
+
+		dodir /usr/$(get_libdir)/antlr/
+		insinto /usr/$(get_libdir)/antlr/
+
+		doins antlr.astframe.dll
+		doins antlr.runtime.dll
+
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins ${S}/antlr.pc
+	fi
+
+	if use python ; then
+		cd ${S}/lib/python
+		distutils_src_install
+	fi
+
+	if use examples ; then
+		find ${S}/examples -iname Makefile\* -exec rm \{\} \;
+
+		dodir /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+
+		! 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
+}
diff --git a/dev-java/antlr/files/digest-antlr-2.7.5-r2 b/dev-java/antlr/files/digest-antlr-2.7.5-r2
new file mode 100644
index 000000000000..933fddaf1fc2
--- /dev/null
+++ b/dev-java/antlr/files/digest-antlr-2.7.5-r2
@@ -0,0 +1 @@
+MD5 1ef201f29283179c8e5ab618529cac78 antlr-2.7.5.tar.gz 1636304