Revbump for Darwin USE=cxx support, added Prefix keywords

Package-Manager: portage-2.2.01.19011-prefix/cvs/Darwin i386

4 files changed, 180 insertions, 11 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index b07afd9b7a90..162ac1db3065 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/antlr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.88 2011/07/17 11:44:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.89 2011/08/18 19:21:40 grobian Exp $
+
+*antlr-2.7.7-r3 (18 Aug 2011)
+
+  18 Aug 2011; Fabian Groffen <grobian@gentoo.org> +antlr-2.7.7-r3.ebuild,
+  antlr-3.1.3-r2.ebuild:
+  Revbump for Darwin USE=cxx support, added Prefix keywords
 
   17 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> antlr-2.7.7-r2.ebuild:
   ppc64 stable wrt #366423
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 27dee8999020..c67c48a12cfc 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,16 +10,15 @@ DIST antlr-3.1.3-generated.tar.bz2 47167 RMD160 9ea64a67aba65bf27e8abbdfbd1a28a0
 DIST antlr-3.1.3.tar.gz 10743515 RMD160 e772197a8a89783ec7cb3e0005913e0396a0ca4c SHA1 2558d373c1d94d8fdd9d26a5be390316aa6b5350 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039
 EBUILD antlr-2.7.7-r1.ebuild 2947 RMD160 c839f55ba5c00ffbb01fc39bf82415055b51ff47 SHA1 cc3a51c392e6fb9c45b5920b11a4a1b4b41b470b SHA256 05b8bc38cfa262ebbd2b124f6e736f858ca75520440fb7f916bd7cba020bab8f
 EBUILD antlr-2.7.7-r2.ebuild 3725 RMD160 ec7bc481551f808cdf084a9a0ca483159bdfae1a SHA1 ea207169f9b6dedd3222a946d6b8e526cff73376 SHA256 cc324f6fe80924888dd80f1311a85ece9c1ce624d777fca44c4cc5efefd02aab
+EBUILD antlr-2.7.7-r3.ebuild 4385 RMD160 b60db83fd32e16d0a6896806ab0ed8c078cd0a51 SHA1 90ecb8c8b4009cd80e1adcdecb11bf054934b67c SHA256 e5af9b15dacb3eae2022260de1725bf4b632c52cb37fc081bf070921b08fa324
 EBUILD antlr-2.7.7.ebuild 2934 RMD160 b11efc4a4e8d5e68b423a4c8e16cb4a8d2f8c374 SHA1 1612e05a6715cba4ae1da0a2fd0ca91d4356b53b SHA256 3db0e8b0f1de5a77d714e10784fa550ad84a24e636e6503d2f9ad99a27376385
-EBUILD antlr-3.1.3-r2.ebuild 3341 RMD160 529b1c4468e2eddf2545094dac0858b49f3fd216 SHA1 159aaafa147e050a035742b818493e9520fe3c69 SHA256 ee273067958c14b20df2061ed26743c7046c5713fbfe6d3b61614f4c6a8c6234
-MISC ChangeLog 11923 RMD160 61226b74e6086c330af2ec4dac22c4e92df9a372 SHA1 eacc9f219f4ab222c0df23121194c5dd8dd2abbc SHA256 b7e988304cd52008ccb472c19b2e967741cdec8067ae64b324f4f1c244990633
+EBUILD antlr-3.1.3-r2.ebuild 3482 RMD160 0c589316a1d2f154d0add9cc0423be2ac0ee7a40 SHA1 6f71e90bdc12ef28d4f66b3d19c9cda515933c9e SHA256 4bee733cf85ddac23b038534a6decc5c5aa96cb649f059ef6cf285605c5c2247
+MISC ChangeLog 12112 RMD160 f9163efb2ae9ce6dbae0fe2ca3e3eed9aa4128d0 SHA1 0d6f0fb0ecc36c425e0b44809e6ebf8fddc79d87 SHA256 f47a6f789f5acc5bfeb9c80542ccf017deb9c4707bab572974c499fd0e018901
 MISC metadata.xml 363 RMD160 72102b036fe76e530f4519a0aa081778aae7262a SHA1 b8f61d984af7ca03255f57bf4126799e58863f2d SHA256 6aa7ec680dc08ab936d6f59f1444bba56902fec42eaf16d5c9919350a5c355cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iJwEAQECAAYFAk4iyzUACgkQIiMqcbOVdxQYrgP/YaRZZELDQ87+Zs88Scg9W4j6
-jS6sMhBqTxHb6DAvTnF9E0hSmrVzYfosyVxlXxlw806FdVc/lVg0xDpMsL819DS3
-Jy9cXm3q9XAmvILRA5jotMI9yTbUP4puo7Q8eTUCCROtpj0fYWAhbZZ2L188Z3Qz
-CpyK8bEIhVOGM5ZyL3U=
-=QCCq
+iEYEARECAAYFAk5NZk4ACgkQX3X2B8XHTomLBQCfbw1zAvH+G0eM5OgRqu+lr9Bl
+zTkAnj7uSQAd5KBNGb8TYRJMNjckF7NA
+=0VN3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-2.7.7-r3.ebuild b/dev-java/antlr/antlr-2.7.7-r3.ebuild
new file mode 100644
index 000000000000..b9e4a11e26c2
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 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.1 2011/08/18 19:21:40 grobian Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+
+inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+
+LICENSE="ANTLR"
+SLOT="0"
+KEYWORDS="~amd64 ~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"
+
+# TODO do we actually need jdk at runtime?
+RDEPEND=">=virtual/jdk-1.3
+	mono? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	script? ( !dev-util/pccts )
+	source? ( app-arch/zip )"
+
+PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "${FILESDIR}/2.7.7-makefixes.patch" )
+
+make_shared_lib() {
+	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
+	einfo "Making ${soname}"
+	[[ ${CHOST} == *-darwin* ]] \
+		&& make_shared_lib_macho "${soname}" "$1" "$2"\
+		|| make_shared_lib_elf "${soname}" "$1" "$2"
+}
+
+make_shared_lib_elf() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCC)} ${LDFLAGS} \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+make_shared_lib_macho() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCXX)} ${LDFLAGS} \
+		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
+		-force_load "${archive}" \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i \
+		-e 's/install:.*this-install/install:/' \
+		lib/cpp/src/Makefile.in || die
+}
+
+src_configure() {
+	# don't ask why, but this is needed for stuff to get built properly
+	# across the various JDKs
+	JAVACFLAGS="+ ${JAVACFLAGS}"
+
+	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
+	CSHARPC="mcs" econf $(use_enable java) \
+		$(use_enable python) \
+		$(use_enable mono csharp) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable cxx) \
+		--enable-verbose
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS} -fPIC" || die "compile failed"
+	if use cxx; then
+		pushd lib/cpp/src > /dev/null
+		make_shared_lib libantlr.a || die
+		if use static-libs; then
+			make clean
+			emake || die "compile static failed"
+		fi
+		popd > /dev/null
+	fi
+	sed -e "s|@prefix@|${EPREFIX}/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
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}"/scripts/antlr-config
+
+	if use cxx ; then
+		cd "${S}"/lib/cpp
+		einstall || die "failed to install C++ files"
+		dolib.so src/libantlr$(get_libname $(get_major_version)) || die
+		dosym libantlr$(get_libname $(get_major_version)) \
+			/usr/$(get_libdir)/libantlr$(get_libname)
+		use static-libs && dolib.a src/libantlr.a
+	fi
+
+	if use java ; then
+		java-pkg_dojar "${S}"/antlr/antlr.jar
+
+		use script && java-pkg_dolauncher antlr --main antlr.Tool
+
+		use source && java-pkg_dosrc "${S}"/antlr
+		use doc && java-pkg_dohtml -r "${S}"/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 || die
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/dev-java/antlr/antlr-3.1.3-r2.ebuild b/dev-java/antlr/antlr-3.1.3-r2.ebuild
index eb99d8fdbf94..9820ae8b9bb9 100644
--- a/dev-java/antlr/antlr-3.1.3-r2.ebuild
+++ b/dev-java/antlr/antlr-3.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r2.ebuild,v 1.6 2011/05/03 18:30:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r2.ebuild,v 1.7 2011/08/18 19:21:40 grobian Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="source"
@@ -14,7 +14,7 @@ SRC_URI="http://www.antlr.org/download/${P}.tar.gz
 	mirror://gentoo/${P}-generated.tar.bz2"
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gunit"
 
 COMMON_DEPEND=">=dev-java/stringtemplate-3.2