From 38b3766629af46125daa4d108fce7be6a5056ce7 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 7 Mar 2015 15:31:07 +0000 Subject: [PATCH] Remove old versions. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4 --- dev-java/jna/ChangeLog | 10 ++- dev-java/jna/Manifest | 8 +- dev-java/jna/files/3.2.4-makefile-flags.patch | 68 ----------------- dev-java/jna/files/makefile-flags.patch | 21 ----- dev-java/jna/jna-3.0.3-r1.ebuild | 65 ---------------- dev-java/jna/jna-3.2.4.ebuild | 76 ------------------- 6 files changed, 8 insertions(+), 240 deletions(-) delete mode 100644 dev-java/jna/files/3.2.4-makefile-flags.patch delete mode 100644 dev-java/jna/files/makefile-flags.patch delete mode 100644 dev-java/jna/jna-3.0.3-r1.ebuild delete mode 100644 dev-java/jna/jna-3.2.4.ebuild diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog index 5ed07d9611e8..71e10bc67858 100644 --- a/dev-java/jna/ChangeLog +++ b/dev-java/jna/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/jna -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.20 2012/06/11 14:05:33 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.21 2015/03/07 15:30:44 chewi Exp $ + + 07 Mar 2015; James Le Cuirot + -files/3.2.4-makefile-flags.patch, -files/makefile-flags.patch, + -jna-3.0.3-r1.ebuild, -jna-3.2.4.ebuild: + Remove old versions. 11 Jun 2012; Michał Górny jna-3.4.0-r1.ebuild, jna-3.4.0.ebuild: @@ -102,4 +107,3 @@ +metadata.xml: New package, jruby dependency, bug #244785. Ebuild provided by serkan and chewi in java-overlay. - diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index a2909716af7d..053dcac842f1 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,14 +1,8 @@ -AUX 3.2.4-makefile-flags.patch 2151 SHA256 ba5701ddb20474dec27d39b0d0509f36edda4f6edcc3899e6426726b8d4e2377 SHA512 e5bc7c5da80175d26dd7c6bdc5406c37dcf9e61b22aa257452d4d2c57d605d7fff93c444d6822f925fd5f869d3af732e0f8064d207cc9f715dd80be0e2548ae9 WHIRLPOOL 393c41fe36e5285881bf57c8762cfd5323ae6d6e2a92ae998f83c901ee5752ea6d4470184b9b67a4146c91dbd1b372fed00dd9c0516ad63aecbee3bf0fa261fb AUX 3.4.0-build.xml.patch 1180 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd SHA512 c286dd84ef6868463aed22fb52e09e7ec68e9a0fb1c4276b0ab79dc4ce39897961c3710fd501ad8a376c4f644c3c3fb5a076c31e9772a2f8eadf2414610095aa WHIRLPOOL 8500dd0bc722b23149ce51044bbd5032cbcfe4c0b2da33b95de3566742f3bdb109d42a954c82388ff24947ddeb6b848aae5d73ff3f74a450648e0a32e0e2925c AUX 3.4.0-makefile-flags.patch 1900 SHA256 b54b196749ae9589e315ce12a8c93fd9bbf42581211ff6b5f5cea2a089dbf124 SHA512 57c861637cfb9d825567cbc07025496da833e2b7c1bd63749bc70d96811c11e82ed28721074ea205017f145cb14db2ae1da3430d77d63c76c9689d2a10aca10f WHIRLPOOL 2b216292de4c7f2273d89c2768fef70a0ec823cf56b43878359710fc4079f4acd86e0e4a8884061a12e8366312018f650f4a238a0890833135d9dc6cbc86b12c AUX jna-3.4.0-makefile-flags.patch 2057 SHA256 7b6d0c5f2eecfab07c223050349d246740d234c38831c87744c0fd68139ebc33 SHA512 9dc427644ae75faaad6ee67fa3b71f22e449692c9b924c793aebb7cdf2b448cca95e53350968c11e20645c0ead974e4f4a17f3268612067b0fce0f7382d4014e WHIRLPOOL 6888a87ae8605e9c0415c608844f8e097b1fe6fe0c9462a21ce2f8897d9b0a4b1f0d43fca24f2e05cfa3382f568c9c6cd97eb4884176ba3a9c1b924aef62993d -AUX makefile-flags.patch 790 SHA256 060c7d8475c879d94d2d173a4e9a033cbdd26a2db5bc8d724446f8bbab53055c SHA512 c1c472f486fc08042c97be6b512ce8a29a2cae04262751b48bdf26d7341de2e35c6ce18125924c73fcb7c36cdbc9297ba8c193b377481c47c5b72fcfb961ef90 WHIRLPOOL 5aeab67d733a02bfa8977ab64bf50dcea859ddb5bdc8e086eec9b36ecb1d0d496869656714537e1f024b2343f51235b648fa5ee86ef680e7aaa840eaf7ce0863 -DIST jna-3.0.3.tar.bz2 647451 SHA256 c214d0ced142972e64421bdd22a2bb4f841df27cf38519602845f7410d11bc7f SHA512 d3ab5c36bb8b5abb39134bbba05f6ab28fa4b2a81732f28d2738148920d6878352f5afabf57931cc5342c2a131c6be138ffc3feae8c27944f7401e863115bf8a WHIRLPOOL 9bea33d3358aae837871401ef4c4ee91b4e037fb2111fe6e0b838f2974970a005222e44684b3adc259ba1fdc186fc2a254fd68352ed2254c148c5e8e61cc7b92 -DIST jna-3.2.4.tar.bz2 191082 SHA256 b6f842e6dcc13b64d26f3ad9e4989aa51276b964fe211a51a2408c3c33c2beb0 SHA512 25efbe90887f8871b94c297e647822a0b12d6b97c5aede080e0cf2708a94292c8358ca796261488a452672cfb7b459cfe041321aff92606e0b52db12fd00db80 WHIRLPOOL fbad9ee3d691e01c77c1317ac368941eb92daef9e95a1c432beeab78988eb9b4711504231adcd3e51ebecaf742b8f62a10f0bbe7769018fe23202447f48132ec DIST jna-3.4.0.tar.gz 34547165 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35 WHIRLPOOL 0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08 -EBUILD jna-3.0.3-r1.ebuild 1655 SHA256 b256ef440b5b54cc1ccf5dffc8584a8d1c4100a1998cdf0971b5d8fc939bae6e SHA512 f98aae9d1b3387eabeb102eb97de01de9c261f7b306cc4ce75f5c2707cfa1e38e0fc8c521de5f34ae4101db2a2f4a80954f510603d8b154e5404bf26477df96f WHIRLPOOL d4a245935f57f3d82df15ede336afdebf90bfd38c4301f6f5dd12931e16416fea1be2ddd382fa4ae01c41154ae418ece6c59f7ab2c743c33245af5d094562395 -EBUILD jna-3.2.4.ebuild 1933 SHA256 c14f28c56e8deb593823898ab2732a8cb22a7a8bdd873e0a1edaf9d65a6841e0 SHA512 a544c9e72eb186d4462b9532232ed902a48b4e07baea541d927a19101a15d587f6c3ee3fce3b337f1ef88f91779bfa2adc4650e1aef3ef2a797d5dc51919315e WHIRLPOOL 5eb2a54b6f81d0b0a807137106697acb55e2dbf60ecb26656ca94d58b563388c8bde461fba07d61938e23b32bf34e9a6f54c61b26f9e13e42048afc9cab40dc9 EBUILD jna-3.4.0-r1.ebuild 2479 SHA256 049b9e335aa3c94427ec3586125ce085f40fc3de4c6e6c346b4473ee6098b24a SHA512 e1238f735a24f4e633aadd75d82a93698e7d0a279f419e34452fb5d511cba935e6cb7d469e9aedf1069cb5cb8e1f62ea3e8297f0530e58934b1b7a2c258d2648 WHIRLPOOL b79782e7664cf10fd1bb72c9c6c172a9c82814c1cd956062264b75d7691c707656bd1890ebd40a3657a5ac68e43f781ad630be3d5d346e0b1b33bc1f2caf5d11 EBUILD jna-3.4.0.ebuild 2441 SHA256 81cc18f1acb234a04f2e4494b7ff44d7806aac631a44628e73b3a71784dda328 SHA512 5daa932a8929de39499b033c948a04abe4907ad665684498c16d1579a88bd27052435d6f17e8004ea5d6b00bed6757b4da12db276e194434917488758a29881d WHIRLPOOL 57dc7975ba6dea950a2f767ecbdcda7c7faabfbf5853a4f039f1505ffbdce7a009bc03a975836dfe9ca75722fff582c104fc1ed8158fccec78aee87e7af6635b -MISC ChangeLog 3664 SHA256 41b1003af9e7504b17329ca27940f79896da3e4ca50f36b8238ac3d6e9171afd SHA512 8c2f4db7c1c01037ce075cf0754f556cad05030e7cc57bd668b677971043b0885efb3c647dcd5d5481c2e02b9df38654d494e06c853fded41701a5c01892e5a4 WHIRLPOOL 3e78a053bb5baf7323fb0dcc628b667f5061c2a32e9d17a8ea031bb51aa6e1bb917ec89d7add68c0114a60eb9d30296639fe9c05766a636a1b348e364d536d47 +MISC ChangeLog 3845 SHA256 ce6cbcd97ac32fd695c5809c2507f2d7f26521e0debcdf5a19d72ace9f86e5ff SHA512 e86792b041d1472fb4dbf014969a09db02a9a09e9f39ec6d5340745c4241c8a2a153a76be5f453f71b874133ad292075124eacf2929a1df8dd106410d0b2a656 WHIRLPOOL c3a58fa569ab3b3521eb6c7282ee6d4cabca842389cb53e593d0cc46e9e59453ec752f6a6c5da8602313c1c58210dcde5ff049b5d920fee4e6a963dbae71cc3b MISC metadata.xml 295 SHA256 7aeccd89219646978f39ce1d46b40051eb950e1452bd225e7dd8e2fe5267c8a2 SHA512 06282ec9de4b3cdc98ba09622461638e409db87d6057cece577abd0169618f17d0174a1a3f52785de0121019a050aa35b522057bf0313a958a7a1496c738c8b4 WHIRLPOOL e0722112734f828808c06e10b1c9a430a7821824cd04aecb3c0db7d565cffbd7d48cdbf25edbca06942375fcccc51eb4761eb38e9fa6b1e3c3c92ac8fb778699 diff --git a/dev-java/jna/files/3.2.4-makefile-flags.patch b/dev-java/jna/files/3.2.4-makefile-flags.patch deleted file mode 100644 index 7690ebe55138..000000000000 --- a/dev-java/jna/files/3.2.4-makefile-flags.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- native/Makefile.orig 2009-12-30 20:13:34.000000000 +1300 -+++ native/Makefile 2009-12-30 20:21:39.000000000 +1300 -@@ -54,7 +54,6 @@ - LIBSFX=.so - ARSFX=.a - JNISFX=$(LIBSFX) --CC=gcc - LD=gcc - LIBS= - # Default to Sun recommendations for JNI compilation -@@ -67,10 +65,10 @@ - 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) \ - -DVERSION='"$(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) -@@ -109,7 +107,7 @@ - ifneq ($(MINGW),) - 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 -@@ -129,14 +127,14 @@ - ARCH=$(shell uname -m | sed 's/i.86/i386/g') - PCFLAGS+=-fPIC - CDEFINES+=-DHAVE_PROTECTION --LDFLAGS+=-Wl,-soname,$@ -+LDFLAGS+= -Wl,-soname,$(shell basename $@) - endif - - ifeq ($(OS),freebsd) - 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 - -@@ -144,7 +142,7 @@ - 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 - -@@ -191,7 +189,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 ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ - -current_version $(VERSION) \ - -mmacosx-version-min=10.3 \ diff --git a/dev-java/jna/files/makefile-flags.patch b/dev-java/jna/files/makefile-flags.patch deleted file mode 100644 index 8ac141d57054..000000000000 --- a/dev-java/jna/files/makefile-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- native/Makefile.orig 2009-06-03 22:09:02.000000000 +0200 -+++ native/Makefile 2009-06-03 22:14:56.000000000 +0200 -@@ -49,7 +49,6 @@ - LIBPFX=lib - LIBSFX=.so - JNISFX=$(LIBSFX) --CC=gcc - LD=gcc - # Default to Sun recommendations for JNI compilation - #COPT=-O2 -fomit-frame-pointer -@@ -61,8 +60,8 @@ - COUT=-o $@ - CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include - CDEFINES=-D_REENTRANT --PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses --CFLAGS=$(PCFLAGS) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ -+PCFLAGS=-Wall -Wno-unused -Wno-parentheses -+CFLAGS+=$(PCFLAGS) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ - -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' - # -static-libgcc avoids gcc library incompatibilities across linux systems - LDFLAGS=-o $@ -shared -static-libgcc diff --git a/dev-java/jna/jna-3.0.3-r1.ebuild b/dev-java/jna/jna-3.0.3-r1.ebuild deleted file mode 100644 index f6874f702731..000000000000 --- a/dev-java/jna/jna-3.0.3-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.0.3-r1.ebuild,v 1.4 2012/05/03 07:42:50 jdhore Exp $ - -EAPI=2 - -JAVA_PKG_IUSE="test doc source" -WANT_ANT_TASKS="ant-nodeps" - -inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic - -DESCRIPTION="Java Native Access (JNA)" -HOMEPAGE="https://jna.dev.java.net/" -# repack and mirror -#SRC_URI="http://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="virtual/libffi - >=virtual/jre-1.4" - -DEPEND="virtual/libffi - virtual/pkgconfig - !test? ( >=virtual/jdk-1.4 ) - test? ( - dev-java/ant-junit - dev-java/ant-trax - >=virtual/jdk-1.5 - )" - -JAVA_ANT_REWRITE_CLASSPATH="true" - -java_prepare() { - # remove bundled libffi - rm -rf native/libffi || die - - # respect CFLAGS, don't inhibit warnings, honour CC - epatch "${FILESDIR}/makefile-flags.patch" - - # bug #272054 - append-cflags $(pkg-config --cflags-only-I libffi) - - # Fetch our own prebuilt libffi. - mkdir -p build/native/libffi/.libs || die - ln -snf "/usr/$(get_libdir)/libffi.so" \ - build/native/libffi/.libs/libffi_convenience.a || die - - # Build to same directory on 64-bit archs. - ln -snf build build-d64 || die -} - -src_install() { - java-pkg_dojar build/${PN}.jar - java-pkg_doso build/native/libjnidispatch.so - use source && java-pkg_dosrc src/com - use doc && java-pkg_dojavadoc doc/javadoc -} - -src_test() { - unset DISPLAY - ANT_TASKS="ant-junit ant-nodeps ant-trax" ANT_OPTS="-Djava.awt.headless=true" eant test -} diff --git a/dev-java/jna/jna-3.2.4.ebuild b/dev-java/jna/jna-3.2.4.ebuild deleted file mode 100644 index 52a5e96b205f..000000000000 --- a/dev-java/jna/jna-3.2.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.4.ebuild,v 1.6 2012/05/03 07:42:50 jdhore Exp $ - -EAPI=2 - -JAVA_PKG_IUSE="test doc source" -WANT_ANT_TASKS="ant-nodeps" - -inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic - -DESCRIPTION="Java Native Access (JNA)" -HOMEPAGE="https://jna.dev.java.net/" -# repack and mirror -#SRC_URI="http://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="virtual/libffi - >=virtual/jre-1.4" - -DEPEND="virtual/libffi - virtual/pkgconfig - !test? ( >=virtual/jdk-1.4 ) - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - dev-java/ant-trax:0 - >=virtual/jdk-1.5 - )" - -JAVA_ANT_REWRITE_CLASSPATH="true" - -java_prepare() { - # remove bundled libffi - rm -rf native/libffi || die - - # respect CFLAGS, don't inhibit warnings, honour CC - epatch "${FILESDIR}/${PV}-makefile-flags.patch" - - sed -i -e '/profiler-build-impl.xml/d' build.xml || die - sed -i -e '/clover.jar"/d' build.xml || die - sed -i -e 's:,clover.jar::' build.xml || die - sed -i -e '/signjar/d' build.xml || die - - # Fetch our own prebuilt libffi. - mkdir -p build/native/libffi/.libs || die - ln -snf "/usr/$(get_libdir)/libffi.so" \ - build/native/libffi/.libs/libffi_convenience.a || die - - # Build to same directory on 64-bit archs. - ln -snf build build-d64 || die -} - -EANT_EXTRA_ARGS="-Ddynlink.native=true" - -src_install() { - java-pkg_dojar build/${PN}.jar - java-pkg_doso build/native/libjnidispatch.so - use source && java-pkg_dosrc src/com - use doc && java-pkg_dojavadoc doc/javadoc -} - -src_test() { - unset DISPLAY - - mkdir -p lib - java-pkg_jar-from --into lib --build-only junit - - ANT_TASKS="ant-junit ant-nodeps ant-trax" \ - ANT_OPTS="-Djava.awt.headless=true" eant \ - ${EANT_EXTRA_ARGS} test -} -- 2.26.2