Fix LDFLAGS bug #335445.

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

4 files changed, 96 insertions, 13 deletions

diff --git a/dev-java/nailgun/ChangeLog b/dev-java/nailgun/ChangeLog
index 30d9fd100e06..71475a25be7c 100644
--- a/dev-java/nailgun/ChangeLog
+++ b/dev-java/nailgun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/nailgun
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.8 2011/08/05 16:08:14 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.9 2012/04/18 19:31:12 ali_bush Exp $
+
+*nailgun-0.7.1-r1 (18 Apr 2012)
+
+  18 Apr 2012; Alistair Bush <ali_bush@gentoo.org>
+  +files/0.7.1-r1-Makefile.patch, +nailgun-0.7.1-r1.ebuild:
+  Fix LDFLAGS bug #335445.
 
   05 Aug 2011; Ulrich Mueller <ulm@gentoo.org> nailgun-0.7.1.ebuild:
   Fix typo in blocker against app-editors/ng.
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
index c627c5c41598..19482142dcd3 100644
--- a/dev-java/nailgun/Manifest
+++ b/dev-java/nailgun/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.7.1-Makefile.patch 332 RMD160 3b7c9771cb5603ed5908abaf3ab98dd8cb5b16ad SHA1 99b89c4456a43c3a3eff25558ed1894fa82dccb6 SHA256 c52dfea4b4ed38d0e11879c395ef6ed32741f9def6e33448739bc809b194c985
+AUX 0.7.1-r1-Makefile.patch 584 RMD160 37810b3cdf1e09773d0adf18187e2a30020087e5 SHA1 4678b8be4d4270df564e0e3eb6b3c1f5f6a45c27 SHA256 5c32be621e0e70568a87b18fec8d0d289b27dcd4386cda7e9e9ba98e9323cda4
 DIST nailgun-src-0.7.1.zip 1489813 RMD160 3fe7d7058b22c14e59c86de1a69146ae0159251e SHA1 70f2ae1faafe9cf060f2a44968960703475705e4 SHA256 2942760e68fabab1afc3bc447545cb532ae7bd6e779ca4af8b3163d629076e72
+EBUILD nailgun-0.7.1-r1.ebuild 1752 RMD160 c87fdc416edbe42b546b69eefb182c03eb16a343 SHA1 5e9aeb60fdcdf213091f1ffdb2039aca446a4c98 SHA256 dae6e1d3b0ea936b2cdbd959959bca85c2dc4bfa0b98dbca112a52c1860467e7
 EBUILD nailgun-0.7.1.ebuild 1740 RMD160 991aa3840dd8339c611b3a15c3f6ea5e8cac574c SHA1 fbba0f06279ec7dd544d4d5bd6690fb9f140e8c2 SHA256 dd6d813519e1fd178162a1f1c5fc4f97c7500f7143120dc23685692e6dc341dd
-MISC ChangeLog 1169 RMD160 44fb65ef89f2bc857cd15617bdce269218d74a26 SHA1 539c548be0393a4ae48e0b5f25430af4fcea0c3a SHA256 aabd4755f838ac362556f53ef129040018dbeacc3fc1873ede7017ae2c86edf1
+MISC ChangeLog 1346 RMD160 7574c67f6d286f9cc352b055a8107ad511736fb0 SHA1 26c766c699c9928551c9fb886d060962593b113a SHA256 5136e740f889eccee113ba1a7f43eba7177076b6dc293bf9da1b34c8287455ef
 MISC metadata.xml 569 RMD160 241467a6930e9364c1229d6ec27d8a9f7d5e1330 SHA1 d62ff0c86a5bcd18e330112ff1442a5771155edd SHA256 96474508807583b54fdc35408e14437f269a32c4574cf5de5be51fd6183ce75c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk48Fq0ACgkQOeoy/oIi7uyMnwCgo5FrfEr/f4xr8k3U7bJpkghZ
-O1cAn12oGl/moyyFpH2qCvfwTeDntdg+
-=pF5c
------END PGP SIGNATURE-----
diff --git a/dev-java/nailgun/files/0.7.1-r1-Makefile.patch b/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
new file mode 100644
index 000000000000..a38185485578
--- /dev/null
+++ b/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
@@ -0,0 +1,18 @@
+diff -Naur nailgun-0.7.1/Makefile nailgun-0.7.1_patches/Makefile
+--- nailgun-0.7.1/Makefile	2004-11-25 11:00:22.000000000 +1300
++++ nailgun-0.7.1_patches/Makefile	2012-04-19 07:22:16.000000000 +1200
+@@ -5,13 +5,11 @@
+ #
+ # Marty Lamb
+ 
+-CC=gcc
+ WIN32_CC=/usr/local/mingw32/bin/mingw32-gcc
+-CFLAGS=-Wall -pedantic -s -O3
+ 
+ ng: src/c/ng.c
+ 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
+-	${CC} ${CFLAGS} -o ng src/c/ng.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ng src/c/ng.c
+ 
+ ng.exe: src/c/ng.c
+ 	# any idea why the command line is so sensitive to the order of
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..1b58f0ef871b
--- /dev/null
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1-r1.ebuild,v 1.1 2012/04/18 19:31:12 ali_bush Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a client, protocol, and server for running Java apps without incurring the JVM startup overhead"
+HOMEPAGE="http://martiansoftware.com/nailgun/index.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.4
+	!app-editors/ng"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/java-getopt:1
+	dev-java/bcel:0
+	dev-java/jakarta-oro:2.0
+	dev-java/log4j:0
+	app-arch/unzip
+	dev-java/junit:0
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+#need jcoverage
+RESTRICT="test"
+
+java_prepare() {
+	rm -vf ng* beansh
+	find . -iname '*.jar' -delete
+
+	epatch "${FILESDIR}/${PV}-r1-Makefile.patch"
+
+	sed -i '/<arg line="ng.exe/d' build.xml || die
+	sed -i 's/depends="test"/depends="compile"/' build.xml || die
+
+	java-pkg_jar-from --into tools/lib --build-only java-getopt-1 \
+		gnu.getopt.jar java-getopt-1.0.10.jar
+	java-pkg_jar-from --into tools/lib --build-only junit junit.jar
+	java-pkg_jar-from --into tools/lib --build-only bcel bcel.jar \
+		bcel-5.1.jar
+	java-pkg_jar-from --into tools/lib --build-only jakarta-oro-2.0 \
+		jakarta-oro.jar jakarta-oro-2.0.8.jar
+	java-pkg_jar-from --into tools/lib --build-only log4j log4j.jar \
+		log4j-1.2.8.jar
+}
+
+src_test() {
+	WANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dobin ng
+	# Should we have a dolauncher?
+
+	java-pkg_newjar "dist/${P}.jar"
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/java/prod/*
+}