Bump EAPI.

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

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

4 files changed, 94 insertions, 13 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/Manifest b/dev-java/charva/Manifest
index 56251948aba1..1d316b313f3f 100644
--- a/dev-java/charva/Manifest
+++ b/dev-java/charva/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX charva-respect-flags.patch 1028 RMD160 e867f531a7015285e933667be9d3cd3f06eaa98b SHA1 cc7e0a722def7e4e100ae085ed6c66749ad21487 SHA256 e603854849eb0350e7b4b8ec8a977bf2b870a6db9a5af7a9a9d934d2e4b6181d
 DIST charva-1.0.1.tar.gz 660398 RMD160 93f4b582ff024f8eb472c8f0b0836dc16a3c19f2 SHA1 2e6383f7a82375af25088545b09b187f726ab663 SHA256 3367419ada99708758a6ffdd20b1576d6749f9b5a37e55d30eb9d003a13165ce
 DIST charva-1.1.4.zip 2100886 RMD160 0ed5c8f617cebb5582a6ed2510d56d7fab05f977 SHA1 afea50683080d2bcf716e48e1fbfa01bc3e7cb48 SHA256 cc62e83e80efb7ddfab7fa91a09ef61ff8ecc5815def9631ab5ee83a4309f737
 EBUILD charva-1.0.1-r1.ebuild 1095 RMD160 45934b397756318c21057d0e6ea3d6a38adf4d63 SHA1 b8905e24da218080481d0d144f359d61294b069f SHA256 7a5d1304efdd0eadcf6d3acfc5ddef74d41c4d91cb7826993d82deed60b48f9c
+EBUILD charva-1.1.4-r1.ebuild 1428 RMD160 305614d6744438542e44dd97d3ccdbf258673f00 SHA1 3407a7c970dad189eee94af3eeea02410f4fd10a SHA256 41b0f1fbcceed5efcc1c99574ba0c0b093689393675d57e2b3fd3670a6765a30
 EBUILD charva-1.1.4.ebuild 1307 RMD160 ef9ce206559884775fad99216944b289db70ae4a SHA1 7c6ea0c5d5add301408db1298132f620fc54c25b SHA256 871144e7efd2330881a29eaa2297e334d200a56262025ba327db7f2e2b087c39
-MISC ChangeLog 1862 RMD160 672c1b150fb1e3f026cd6dd547d0200718b98015 SHA1 508ea6c1bff7df3901ad3b13d2467acaf041231a SHA256 6f733448f9798d0d0bb402bc771da8cebadba454b86c930142d45070943fc8b2
+MISC ChangeLog 2141 RMD160 f0c818294934ab404e4948c01fcf3202a23ac590 SHA1 4cf6d356aa81efa3d9c3722182cda5112431e955 SHA256 8d6c17976e03e48b72092e8a6bc8757a9f19bf8783cb0144c5b853f12a131703
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuk/AgACgkQcxLzpIGCsLRu6gCeIFqd+9A5BGKRwaLebJ9bgPrG
-7IEAn1bh006XLwxr13OAAGiFz8XwJGDp
-=Cl5+
------END PGP SIGNATURE-----
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}

+