From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4F1F1395E2 for ; Sun, 6 Nov 2016 11:39:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B257E09C5; Sun, 6 Nov 2016 11:39:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E52EAE09C5 for ; Sun, 6 Nov 2016 11:39:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DD763416EA for ; Sun, 6 Nov 2016 11:39:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83944306 for ; Sun, 6 Nov 2016 11:39:24 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1478432358.cbdae3b8d57ca13850bf943e3ff253684c6c3d27.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jna/files/3.4.0-build.xml.patch dev-java/jna/files/3.4.0-makefile-flags.patch dev-java/jna/files/4.2.2-build.xml.patch dev-java/jna/files/4.2.2-makefile-flags.patch dev-java/jna/jna-4.2.2-r1.ebuild dev-java/jna/jna-4.2.2.ebuild X-VCS-Directories: dev-java/jna/files/ dev-java/jna/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: cbdae3b8d57ca13850bf943e3ff253684c6c3d27 X-VCS-Branch: master Date: Sun, 6 Nov 2016 11:39:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9162d387-443d-4eea-a8fc-321dcf5d1522 X-Archives-Hash: 4cd03df2de099f9d998454545fa9152b commit: cbdae3b8d57ca13850bf943e3ff253684c6c3d27 Author: James Le Cuirot gentoo org> AuthorDate: Sun Nov 6 11:38:55 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Nov 6 11:39:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdae3b8 dev-java/jna: Use newer guava SLOT, EAPI bump to 6 Package-Manager: portage-2.3.2 dev-java/jna/files/3.4.0-build.xml.patch | 31 ------------- dev-java/jna/files/3.4.0-makefile-flags.patch | 53 ---------------------- dev-java/jna/files/4.2.2-build.xml.patch | 4 +- dev-java/jna/files/4.2.2-makefile-flags.patch | 4 +- .../jna/{jna-4.2.2.ebuild => jna-4.2.2-r1.ebuild} | 26 +++++++---- 5 files changed, 21 insertions(+), 97 deletions(-) diff --git a/dev-java/jna/files/3.4.0-build.xml.patch b/dev-java/jna/files/3.4.0-build.xml.patch deleted file mode 100644 index c907b59..00000000 --- a/dev-java/jna/files/3.4.0-build.xml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- build.xml.orig 2011-01-25 17:33:24.750473340 +0100 -+++ build.xml 2011-01-25 17:07:14.657410373 +0100 -@@ -176,7 +176,9 @@ - - - -+ - - - -@@ -433,13 +435,17 @@ - - - -+ - - - -+ - - - diff --git a/dev-java/jna/files/3.4.0-makefile-flags.patch b/dev-java/jna/files/3.4.0-makefile-flags.patch deleted file mode 100644 index 90d96e0..00000000 --- a/dev-java/jna/files/3.4.0-makefile-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/native/Makefile b/native/Makefile -index 75246a8..7bdcf04 100644 ---- a/native/Makefile -+++ b/native/Makefile -@@ -83,10 +83,10 @@ CFLAGS_EXTRA= - COUT=-o $@ - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include - CDEFINES=-D_REENTRANT --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses --CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses -+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ - -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' --LDFLAGS=-o $@ -shared -+LDFLAGS+=-o $@ -shared - ifeq ($(DYNAMIC_LIBFFI),true) - CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) - LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) -@@ -149,7 +149,7 @@ ifneq ($(MINGW),) - CDEFINES=-DPSAPI_VERSION=1 - CC = $(MINGW) -m64 -mno-cygwin - LD = $(CC) --LDFLAGS=-o $@ -shared -+LDFLAGS+=-o $@ -shared - LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt - FFI_CONFIG += --host=x86_64-pc-mingw32 - else -@@ -169,14 +169,14 @@ ifeq ($(OS),linux) - ARCH=$(shell uname -m | sed 's/i.86/i386/g') - PCFLAGS+=-fPIC - CDEFINES+=-DHAVE_PROTECTION --LDFLAGS+=-Wl,-soname,$@ -+LDFLAGS+= -Wl,-soname,$(shell basename $@) - endif - - ifneq (,$(findstring bsd,$(OS))) - ARCH=$(shell uname -m | sed 's/i.86/i386/g') - PCFLAGS+=-fPIC - CINCLUDES+=-I/usr/X11R6/include --LDFLAGS=-o $@ -shared -+LDFLAGS+= -o $@ -shared - CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT - endif - -@@ -239,7 +239,7 @@ endif - - PCFLAGS+=$(ISYSROOT) -x objective-c - CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT --LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ -+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ - -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ - -current_version $(JNA_JNI_VERSION) \ - -mmacosx-version-min=10.3 \ diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch index 3647646..de49c24 100644 --- a/dev-java/jna/files/4.2.2-build.xml.patch +++ b/dev-java/jna/files/4.2.2-build.xml.patch @@ -1,5 +1,5 @@ ---- build.xml.orig 2016-03-16 14:37:28.000000000 +0000 -+++ build.xml 2016-04-16 22:22:27.692967205 +0100 +--- a/build.xml 2016-03-16 14:37:28.000000000 +0000 ++++ b/build.xml 2016-04-16 22:22:27.692967205 +0100 @@ -320,7 +320,9 @@ diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch index 10cf4b2..3e290ec 100644 --- a/dev-java/jna/files/4.2.2-makefile-flags.patch +++ b/dev-java/jna/files/4.2.2-makefile-flags.patch @@ -1,5 +1,5 @@ ---- native/Makefile.orig 2016-03-16 14:37:28.000000000 +0000 -+++ native/Makefile 2016-04-16 22:27:06.426345376 +0100 +--- a/native/Makefile 2016-03-16 14:37:28.000000000 +0000 ++++ b/native/Makefile 2016-04-16 22:27:06.426345376 +0100 @@ -81,7 +81,7 @@ LIBSFX=.so ARSFX=.a diff --git a/dev-java/jna/jna-4.2.2.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild similarity index 87% rename from dev-java/jna/jna-4.2.2.ebuild rename to dev-java/jna/jna-4.2.2-r1.ebuild index 87bb741..50e3636 100644 --- a/dev-java/jna/jna-4.2.2.ebuild +++ b/dev-java/jna/jna-4.2.2-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 JAVA_PKG_IUSE="doc source" @@ -34,28 +34,30 @@ DEPEND="${CDEPEND} virtual/pkgconfig test? ( dev-java/ant-junit:0 - dev-java/guava:18 + dev-java/guava:20 dev-java/javassist:3 dev-java/reflections:0 )" +PATCHES=( + "${FILESDIR}"/${PV}-build.xml.patch + "${FILESDIR}"/${PV}-makefile-flags.patch +) + JAVA_ANT_REWRITE_CLASSPATH="true" EANT_BUILD_TARGET="native jar contrib-jars" EANT_EXTRA_ARGS="-Ddynlink.native=true" EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}" -EANT_TEST_GENTOO_CLASSPATH="guava-18,javassist-3,reflections" +EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections" + +src_prepare() { + default -java_prepare() { # delete bundled jars and copy of libffi # except native jars because build.xml needs them all find ! -path "./lib/native/*" -name "*.jar" -delete || die rm -r native/libffi || die - epatch "${FILESDIR}"/${PV}-build.xml.patch - # respect CFLAGS, don't inhibit warnings, honour CC - epatch "${FILESDIR}"/${PV}-makefile-flags.patch - tc-export CC - if ! use awt ; then sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die fi @@ -63,6 +65,12 @@ java_prepare() { if ! use nio-buffers ; then sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die fi + + java-pkg-2_src_prepare +} + +src_configure() { + tc-export CC } src_install() {