Now builds a shared library, older static non-PIC library is built with use flag static-libs

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

3 files changed, 166 insertions, 2 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 9ef8e6e87622..a570cb566bdf 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.81 2011/01/16 18:22:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.82 2011/04/08 21:33:45 bicatali Exp $
+
+*antlr-2.7.7-r2 (08 Apr 2011)
+
+  08 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> +antlr-2.7.7-r2.ebuild:
+  Now builds a shared library, older static non-PIC library is built with use
+  flag static-libs
 
   16 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   antlr-2.7.7.ebuild, antlr-2.7.7-r1.ebuild:
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 870c2046f5e1..59444871cfb6 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.7.7-gcc-4.3.patch 383 RMD160 b07b999bd1fe9ed4e90c2c4240c6b8dcececa460 SHA1 9561c692ccfad5f320739897da0ce985d8c804d7 SHA256 de68d3a12a03d7bcdbd3e1cf5ab7d773123a55b4d9e8bb9f3a873fa2c2be84e2
 AUX 2.7.7-gcc-4.4.patch 257 RMD160 b1b2058707e6132e4db8d4f7dbd7648c8d3799eb SHA1 b618b5a3f603a3cb07acda07e85ab022cfb3cdef SHA256 4d1c713424893be36f5b29f73a9e7f491274abe6535af31c26bf0aa8dbf00256
 AUX 2.7.7-makefixes.patch 3151 RMD160 260811a8fd616fa2acd8ee92b57e004bef1af2d7 SHA1 81eedd78cb7f71e783ee4450c9eda72411ffbdc8 SHA256 04c15e4c6054c3504e21ed5ef00bfb011f5345146e5c044f607e14a30fda1360
@@ -6,7 +9,15 @@ DIST antlr-2.7.7.tar.gz 1816180 RMD160 0b7951a28b748e912721fe0f6de4095d9f8da57d
 DIST antlr-3.1.3-generated.tar.bz2 47167 RMD160 9ea64a67aba65bf27e8abbdfbd1a28a0ea2b7698 SHA1 21addec96267b43742e2b2bbd6c7e245db644c38 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4
 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 3727 RMD160 712d8501790bb177ef2cfbe789ee7911ff3fcbf0 SHA1 96267bbff994783b04990ec7aa24439d7e5f79fe SHA256 24c143647bf25c038e30c002914add97a3ab6636ed44476ea198fe96b8ab7ca4
 EBUILD antlr-2.7.7.ebuild 2934 RMD160 b11efc4a4e8d5e68b423a4c8e16cb4a8d2f8c374 SHA1 1612e05a6715cba4ae1da0a2fd0ca91d4356b53b SHA256 3db0e8b0f1de5a77d714e10784fa550ad84a24e636e6503d2f9ad99a27376385
 EBUILD antlr-3.1.3-r2.ebuild 3340 RMD160 348d425c2e59c665478aae9b0dce947649339f19 SHA1 e493a6fb58cd7a0defd89d3672d5cfe9f524c361 SHA256 feeacf9208b42ffa777fbde2a11b7e7fbdb3277ac9fe146d0aa814746a16d9ea
-MISC ChangeLog 11275 RMD160 14f0cfd6e5eeafbd40c9b3dbde14516217fc0ece SHA1 ccf276d5deb583685f86bfae5c2db9e9e9597ed0 SHA256 187c672bb0a6e8d126124a4c3b5089052ed61abf71b37761f64fd90c972a76ee
+MISC ChangeLog 11483 RMD160 a770e0fa9a6903ba1bc5c0198c31d33ebb2d72ed SHA1 37622b8d7d6986f1398a3c0ba6f3d87d7f20638b SHA256 ae083016e89b86f9de6c1a2fcbcbdb46b57d5d1546514905ad8ff29620b6bf57
 MISC metadata.xml 363 RMD160 72102b036fe76e530f4519a0aa081778aae7262a SHA1 b8f61d984af7ca03255f57bf4126799e58863f2d SHA256 6aa7ec680dc08ab936d6f59f1444bba56902fec42eaf16d5c9919350a5c355cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ff0QACgkQ1ycZbhPLE2DtMQCgn7fZy1OZTPtwaIcg/SdEJxo6
+HXwAni2QiG1vvto/hW8b8RyAWjRzo52T
+=oprU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/antlr/antlr-2.7.7-r2.ebuild b/dev-java/antlr/antlr-2.7.7-r2.ebuild
new file mode 100644
index 000000000000..947feb37a3b6
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r2.ebuild
@@ -0,0 +1,147 @@
+# 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-r2.ebuild,v 1.1 2011/04/08 21:33:45 bicatali 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"
+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}").so.$(get_major_version)
+	einfo "Making ${soname}"
+	${2:-$(tc-getCC)} ${LDFLAGS}  \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
+		-o $(dirname "${1}")/"${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@|/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.so* || die
+		dosym libantlr.so.$(get_major_version) /usr/$(get_libdir)/libantlr.so
+		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
+}