summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2010-09-13 17:48:55 +0000
committerSerkan Kaba <serkan@gentoo.org>2010-09-13 17:48:55 +0000
commitefd971ad8502d57bfd45b4dbe4aa45b73f2bcb5e (patch)
tree81dbcc866726a8b81a30b068d7b6bf7f9b2f5bfb /dev-java
parentVersion bump (diff)
downloadgentoo-2-efd971ad8502d57bfd45b4dbe4aa45b73f2bcb5e.tar.gz
gentoo-2-efd971ad8502d57bfd45b4dbe4aa45b73f2bcb5e.tar.bz2
gentoo-2-efd971ad8502d57bfd45b4dbe4aa45b73f2bcb5e.zip
Revbump to respect LDFLAGS. Reported by Diego E. Pettenò <flameeyes@gentoo.org> in bug #336302.
(Portage version: 2.2_rc80/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/libreadline-java/ChangeLog12
-rw-r--r--dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch12
-rw-r--r--dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild54
3 files changed, 76 insertions, 2 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/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
+}