Revbump to respect LDFLAGS. Reported by Diego E. Pettenò <flameeyes@gentoo.org> in bug #336302.

Package-Manager: portage-2.2_rc80/cvs/Linux x86_64

4 files changed, 89 insertions, 3 deletions

diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog
index ec6c6e687755..ab60e8bcd7ba 100644
--- a/dev-java/libreadline-java/ChangeLog
+++ b/dev-java/libreadline-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/libreadline-java
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.30 2007/05/17 21:45:09 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.31 2010/09/13 17:48:55 serkan Exp $
+
+*libreadline-java-0.8.0-r3 (13 Sep 2010)
+
+  13 Sep 2010; Serkan Kaba <serkan@gentoo.org>
+  +libreadline-java-0.8.0-r3.ebuild,
+  +files/libreadline-java-0.8.0-ldflags.patch:
+  Revbump to respect LDFLAGS. Reported by Diego E. Pettenò
+  <flameeyes@gentoo.org> in bug #336302.
 
   17 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   -libreadline-java-0.8.0-r1.ebuild, libreadline-java-0.8.0-r2.ebuild:
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index 5cd29bc877ab..db78f1e3c1fc 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libreadline-java-0.8.0-gmake.patch 532 RMD160 52332ec31aa362aa4ab590373f92a84b77eabcab SHA1 1c280b78f519bca63d12c202182ab2fcc02e64bd SHA256 2d8575b101f5856bf7ced9eb8d606eaa6be2386db9bec871aadb5033442f182e
+AUX libreadline-java-0.8.0-ldflags.patch 528 RMD160 7a88cb5300a04385880abb8d34eeed2f9ac6f083 SHA1 1d43475d1b6b9d5ca6f02aac5ff7c9eef722b8a6 SHA256 b25694f4c2ea4dd9052f81ae37ba64b7279c80d20a13ed28fece97c1d8f1fd33
 AUX termcap-to-ncurses.patch 498 RMD160 fc25fda35386128dbf61dc73bb2ee347e73be296 SHA1 c92c7080618b00d5e27c88f4755ea441bf21cbc7 SHA256 de636c7cc3e812a276ac530b571d7c9a0fd63cd7011868ceb46a59fc55f2e337
 DIST libreadline-java-0.8.0-src.tar.gz 77122 RMD160 1e1d6f6e3bd37867d8222421857cbc73d072a3c1 SHA1 1f5574f9345afc039e9c7a09ae4979129891d52a SHA256 cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890
 EBUILD libreadline-java-0.8.0-r2.ebuild 1364 RMD160 e57b789ea4e79b4866ae10a6bb80873a7a96868e SHA1 c2dcfa989ed422f42d3e01f55697a4d5da33c185 SHA256 57567a1a916af3b46bfb00154f7949f78dbf28388437014fb81f4b60767ab091
-MISC ChangeLog 4159 RMD160 286e70e6f8feb2b591054b2aa2d06f880e2f09e9 SHA1 a71bb7228b2ac29b3ba0509959410a7275aa9b1f SHA256 41f86deb703907b589747ccd4edd5b0fb7453535351578a399d18d01e1ca052a
+EBUILD libreadline-java-0.8.0-r3.ebuild 1420 RMD160 ba83a2786a33aa149c802746ab7caa92c6e9c158 SHA1 ce9cb1bcac73b744e580cf689113583ab064829b SHA256 d7605a9d17050272a834d7314bb4eaa683009a89e57e7bf7a5277615300aab91
+MISC ChangeLog 4430 RMD160 eeedd1232a7cbf4f057d7d6b0a83f557b3f3650e SHA1 a24cc54df5cedae57443f511279e19ecc74c490e SHA256 26bb31d6f16c3419eaaaed1145e8ae21614e6734460a2535f15909b07f63c264
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyOZBEACgkQRh6X64ivZaLhxgCdE76ZjbzwxPkqZF182y7I/ykm
+tPgAnRMyMpGfcdrdSIGHnD2dkZCgEWmJ
+=d7af
+-----END PGP SIGNATURE-----
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
new file mode 100644
index 000000000000..e0783bdab5a1
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nur libreadline-java-0.8.0/src/native/Makefile libreadline-java-0.8.0_patched/src/native/Makefile
+--- libreadline-java-0.8.0/src/native/Makefile	2003-01-07 12:14:35.000000000 +0200
++++ libreadline-java-0.8.0_patched/src/native/Makefile	2010-09-13 20:31:56.000000000 +0300
+@@ -97,7 +97,7 @@
+ 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
+ 		$(OBJECTS) -W1,-e,_readline_init@12
+ else
+-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
++	$(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+ endif
+ endif
+ 
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..27b79c35fd65
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild,v 1.1 2010/09/13 17:48:55 serkan Exp $
+
+JAVA_PKG_IUSE="doc source"
+EAPI=2
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="A JNI-wrapper to GNU Readline."
+HOMEPAGE="http://java-readline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD"
+
+COMMON_DEP="sys-libs/ncurses"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/termcap-to-ncurses.patch"
+	# bug #157387, reported upstream
+	epatch "${FILESDIR}/${P}-gmake.patch"
+
+	# bug #157390
+	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
+	fi
+
+	#Respect LDFLAGS bug #336302
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	emake -j1 || die "failed to compile"
+	if use doc; then
+		emake -j1 apidoc || die "failed to generate docs"
+	fi
+}
+
+src_install() {
+	java-pkg_doso *.so
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc api
+	dodoc ChangeLog NEWS README README.1st TODO || die
+}