Bump EAPI.

Restrict tests. #314131
Respect C/LDFLAGS, don't call gcc directly. #337313
Add missing DEPEND on app-arch/unzip #371479

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 91 insertions, 2 deletions

diff --git a/dev-java/charva/ChangeLog b/dev-java/charva/ChangeLog
index f2c25ba3fe58..dc52312587c9 100644
--- a/dev-java/charva/ChangeLog
+++ b/dev-java/charva/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/charva
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.16 2010/03/20 16:46:52 betelgeuse Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/ChangeLog,v 1.17 2011/12/17 16:09:41 sera Exp $
+
+*charva-1.1.4-r1 (17 Dec 2011)
+
+  17 Dec 2011; Ralph Sennhauser <sera@gentoo.org> +charva-1.1.4-r1.ebuild,
+  +files/charva-respect-flags.patch:
+  Bump EAPI.
+  Restrict tests. #314131
+  Respect C/LDFLAGS, don't call gcc directly. #337313
+  Add missing DEPEND on app-arch/unzip #371479
 
 *charva-1.1.4 (20 Mar 2010)
 
diff --git a/dev-java/charva/charva-1.1.4-r1.ebuild b/dev-java/charva/charva-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..75aca3593edf
--- /dev/null
+++ b/dev-java/charva/charva-1.1.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/charva/charva-1.1.4-r1.ebuild,v 1.1 2011/12/17 16:09:41 sera Exp $
+
+EAPI="4"
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="A Java Windowing Toolkit for Text Terminals"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}/charva.zip -> ${P}.zip"
+HOMEPAGE="http://www.pitman.co.za/projects/charva/"
+RDEPEND=">=virtual/jre-1.5
+		sys-libs/ncurses
+		dev-java/commons-logging:0"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip
+		${RDEPEND}"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-respect-flags.patch
+
+	rm -v ./c/lib/*.so || die
+	rm -v java/lib/* || die
+	rm -v java/dist/lib/* || die
+	find . -name "*.class" -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging"
+EANT_BUILD_TARGET="dist"
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd c/src
+	emake CC="$(tc-getCC)" INCLUDES="$(java-pkg_get-jni-cflags)" -f Makefile.linux.txt
+}
+
+src_install() {
+	java-pkg_dojar ./java/dist/lib/charva.jar
+	use doc && java-pkg_dojavadoc docs/api
+	use examples && java-pkg_doexamples test/src/example
+	use source && java-pkg_dosrc java/src/{charva,charvax}
+
+	java-pkg_doso c/lib/*.so
+}
diff --git a/dev-java/charva/files/charva-respect-flags.patch b/dev-java/charva/files/charva-respect-flags.patch
new file mode 100644
index 000000000000..73d09e9a265e
--- /dev/null
+++ b/dev-java/charva/files/charva-respect-flags.patch
@@ -0,0 +1,27 @@
+--- c/src/Makefile.linux.txt
++++ c/src/Makefile.linux.txt
+@@ -5,14 +5,14 @@
+ SHARED_OBJECT_EXT = so

+ TARGET = libTerminal.${SHARED_OBJECT_EXT}

+ 

+-CC = gcc

++CC ?= gcc

+ # "-D_USE_NCURSESW" was added for handling UTF-8 characters (contributed by Leos Urban)

+-CFLAGS = -fpic -shared -D_USE_NCURSESW_

++CFLAGS += -fpic -shared -D_USE_NCURSESW_

+ 

+ # The file "jni.h" is in ${JAVA_HOME}/include

+ # The file "jni_md.h" (included from jni.h) contains machine-dependent 

+ # type definitions and is in ${JAVA_HOME}/include/${OS}

+-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include

++INCLUDES ?= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include

+ 

+ # Changed "-lncurses" to "-lncursesw" (Leos Urban)

+ LIBS = -lncursesw

+@@ -21,5 +21,5 @@
+ all : ${TARGET}

+ 

+ ${TARGET} : Toolkit.c ../include/charva_awt_Toolkit.h Makefile.${OS}.txt

+-	${CC} ${CFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}

++	${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}

+