summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2012-03-25 20:34:42 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2012-03-25 20:34:42 +0000
commit60ea1a26e149218cc7e3a0df44befed7032c84ac (patch)
tree2006dcf9b7d48aa313539ba781d3e7d244fba70b
parentVersion bump. (diff)
downloadhistorical-60ea1a26e149218cc7e3a0df44befed7032c84ac.tar.gz
historical-60ea1a26e149218cc7e3a0df44befed7032c84ac.tar.bz2
historical-60ea1a26e149218cc7e3a0df44befed7032c84ac.zip
dev-java/jna: removed obsolete versions
Package-Manager: portage-2.1.10.51/cvs/Linux x86_64
-rw-r--r--dev-java/jna/ChangeLog8
-rw-r--r--dev-java/jna/Manifest30
-rw-r--r--dev-java/jna/files/3.2.7-build.xml.patch31
-rw-r--r--dev-java/jna/files/3.2.7-makefile-flags.patch60
-rw-r--r--dev-java/jna/files/3.3.0-build.xml.patch31
-rw-r--r--dev-java/jna/files/3.3.0-makefile-flags.patch60
-rw-r--r--dev-java/jna/jna-3.2.7.ebuild80
-rw-r--r--dev-java/jna/jna-3.3.0.ebuild80
8 files changed, 8 insertions, 372 deletions
diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog
index 4c3de93152a4..588555bac6bc 100644
--- a/dev-java/jna/ChangeLog
+++ b/dev-java/jna/ChangeLog
@@ -1,6 +1,12 @@
# 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.13 2012/03/23 16:33:05 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.14 2012/03/25 20:34:42 fordfrog Exp $
+
+ 25 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
+ -files/3.2.7-build.xml.patch, -files/3.2.7-makefile-flags.patch,
+ -files/3.3.0-build.xml.patch, -jna-3.2.7.ebuild,
+ -files/3.3.0-makefile-flags.patch, -jna-3.3.0.ebuild:
+ Removed obsolete versions
23 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.4.0.ebuild:
Fix running tests. #294289
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index fec200aaf422..58ad83d34a57 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,40 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 3.2.4-makefile-flags.patch 2151 RMD160 430a2e47e7a67283ac7c06c5b9496007d5c5d180 SHA1 278adedeec60b4a78f80f61e1f419eb086211534 SHA256 ba5701ddb20474dec27d39b0d0509f36edda4f6edcc3899e6426726b8d4e2377
-AUX 3.2.7-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
-AUX 3.2.7-makefile-flags.patch 2046 RMD160 1699d60b8ab5848d298c49035cfbfcb88fb7ada0 SHA1 cb820a4cf865d254c6e4fedb7df4d5679a29b620 SHA256 87486291112b6cf4c344b1d7701f6990a2e7cfd76eb1120bfcbe429a9edb634c
-AUX 3.3.0-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
-AUX 3.3.0-makefile-flags.patch 2046 RMD160 1699d60b8ab5848d298c49035cfbfcb88fb7ada0 SHA1 cb820a4cf865d254c6e4fedb7df4d5679a29b620 SHA256 87486291112b6cf4c344b1d7701f6990a2e7cfd76eb1120bfcbe429a9edb634c
AUX 3.4.0-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
AUX 3.4.0-makefile-flags.patch 1900 RMD160 d85e956afe76d99cd9c34fdf347580298a2076e6 SHA1 f3f81407590ec160014f29ac98e48145534f57c9 SHA256 b54b196749ae9589e315ce12a8c93fd9bbf42581211ff6b5f5cea2a089dbf124
AUX makefile-flags.patch 790 RMD160 cb0f285a09fd0f1feebde3ded9086880dd200656 SHA1 61ab8ec9270cf6af212222ef8bb47872dd32f986 SHA256 060c7d8475c879d94d2d173a4e9a033cbdd26a2db5bc8d724446f8bbab53055c
DIST jna-3.0.3.tar.bz2 647451 RMD160 3122e06fe47ca053828c4e5a4c02f3d61bab8800 SHA1 a144936d0f5e29279d2091d4d2ad0a8e38e20334 SHA256 c214d0ced142972e64421bdd22a2bb4f841df27cf38519602845f7410d11bc7f
DIST jna-3.2.4.tar.bz2 191082 RMD160 235304a6c65a6963fcdc9707d8aca4870898309c SHA1 38ee77025c35e0fe0901821a88227fb1acb43c22 SHA256 b6f842e6dcc13b64d26f3ad9e4989aa51276b964fe211a51a2408c3c33c2beb0
-DIST jna-3.2.7-platform-build-impl.xml 27075 RMD160 a034e6cf81bf0911042ce7b625df7e60542616d5 SHA1 ee36a0fa4ced5e893b78e6687bd39833ab9aee40 SHA256 5d87cfab24ed464cb56f95e2761b66c10df9e33d16f4c94f0bb3f80f4bdfff94
-DIST jna-3.2.7-platform-build.xml 3537 RMD160 1b8a25ff10224f549c27312ab57ef0776b75cab9 SHA1 c4822c6ed5e58cf28c42a80fadae874ad9d6567c SHA256 a85d1740901e4b396fc6ea48c8c3c08585fb454c1da6596f4fe3fc00ba33af9e
-DIST jna-3.2.7-platform-project.properties 1827 RMD160 ebe94fc4d3da81b56b5a4eefa971ede649176b0b SHA1 26c0333be130f69e1ae3757fe18ee9cdfa8613fa SHA256 3bd336986d201e403449fcf45edb40ce0fcca24935bd941e9784f6e88ca884c7
-DIST jna-3.2.7-src.zip 621124 RMD160 4bec8639ebce5b9dc14ad71d1fc0af55dd0ee5b5 SHA1 73fb5db51dbb5e0b01ca9df30232a522ff3da26d SHA256 2b32ed48744ffa1d0887c66af74ae9b6c3bfe9023933543a0e2e2ae052dff376
-DIST jna-3.3.0-platform-build-impl.xml 27075 RMD160 a034e6cf81bf0911042ce7b625df7e60542616d5 SHA1 ee36a0fa4ced5e893b78e6687bd39833ab9aee40 SHA256 5d87cfab24ed464cb56f95e2761b66c10df9e33d16f4c94f0bb3f80f4bdfff94
-DIST jna-3.3.0-platform-build.xml 3902 RMD160 445121b9ad42be2f6372199f600478a0abc09dba SHA1 92930acc9d44b21f3e4bdfaabd19b009b3f07e69 SHA256 01e7c5a8cd13886728934e373c81057dcbd8ab4bc1f7c871cc26a3885638c24c
-DIST jna-3.3.0-platform-project.properties 1827 RMD160 ebe94fc4d3da81b56b5a4eefa971ede649176b0b SHA1 26c0333be130f69e1ae3757fe18ee9cdfa8613fa SHA256 3bd336986d201e403449fcf45edb40ce0fcca24935bd941e9784f6e88ca884c7
-DIST jna-3.3.0-src.zip 3601757 RMD160 d74011365c66a845225e32c1aa036e24e2e5537a SHA1 6c7ea3ed093670a70fe3523a5dd3f9c6d26c1c0e SHA256 636fe580521ecd812eadfca68311e5563551486ddac8db2d98deebcd57a1e7db
DIST jna-3.4.0-src.tar.gz 34547165 RMD160 789f7198fb70fae6aaea87bedec087017cc6e296 SHA1 60ae10b3831e7ea628c0eda111f9165cbce5a805 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14
EBUILD jna-3.0.3-r1.ebuild 1654 RMD160 aa389e088321b3ca1a0c5da061b89ab3d23cbe66 SHA1 770955b222fe3faf331648d4eaf85c6845aaa571 SHA256 b9394d71045280e8e72465f316f708b2653bc3bc4d400ca33404d2eb09463802
EBUILD jna-3.2.4.ebuild 1932 RMD160 dd4e3a811c157a3dd1ae2715b56002d76c2c3ef3 SHA1 ec04bf19956e98202b400088927c4f74c23cedb5 SHA256 1272efe3fc3c15fee490f062de173737cef7dc5858e66d93880bc86358a6e07d
-EBUILD jna-3.2.7.ebuild 2573 RMD160 4977dcd8112181b0e9b16b6df3a7de65bf09490f SHA1 44c5470dc925230cbac8b1c7a6ee3dae641b8408 SHA256 7217da3c285406209e6fb719f6139aa00ccb1bcab748a2fce82ef42c0eb89104
-EBUILD jna-3.3.0.ebuild 2580 RMD160 e745286209047192bec77b8ac8890d59327ade5a SHA1 11a6181ef3a256ffa96f7ad86d56be889a54c77b SHA256 7f3eb87b6ee0356f8c2c59f3f5585482da8ec5135d17e17e168de366bb4762ef
EBUILD jna-3.4.0.ebuild 2447 RMD160 3ec429a09f60bae11e794a589222d024ebc08b18 SHA1 56f0a50d67c9df9bf7c8482497eb3f5885abee36 SHA256 3b491a3af78ca79d6b216b94bf9d37925ac8982f73b59e2931700f64dbd85412
-MISC ChangeLog 2497 RMD160 08fbf61ea62e2dc1a8d5ad9042aa5c81f4f1c5e7 SHA1 fcadfa4e33d18146a1875f985aefe511ead18e15 SHA256 f8bee3b803320a07abec3ac2eaabcf9575720284ffd6de2355ccb4e7b9725387
+MISC ChangeLog 2756 RMD160 570bf394d34c8a81dd1aab7a336902033c512f57 SHA1 8cffcef34f9db08a722e0023939b3972197aac3f SHA256 aa925bd289e64a18b3046930fd9f60670c6de5d7df365140f3e1c4fcc3459537
MISC metadata.xml 295 RMD160 d7fc5e14f5b91d3271a001c1219c101b385253e0 SHA1 1882aa6897108b0bcb4ef1810ee6bf0c7ca42054 SHA256 7aeccd89219646978f39ce1d46b40051eb950e1452bd225e7dd8e2fe5267c8a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPbKXRAAoJEIUJ+svaV163k54H/imjNEvsSbofzb8gsTs+nenQ
-bUICuNfH8mLL1Iq33C4fEvKFHoOMnt/V2vHumMCZgC31P4QMJDBH2oqj4WSaOrPG
-Mgy0/7wZde3bYq9Q6EOXlHeBAyb3dIkLz67Ga0fbUWh6O++JB9DshvZ0LPBeSf6x
-502QrMnCNzIDwUAd1PT5+olseIISaHRczKHIC8iWVRsKxCEToWG/yUC7r8VF85sp
-MZl/XUtOef/1w/lPdSqhPBgRfPcHLwKJfDzvr4IH8AGpK1o03iBOX7avN0Kjhgnb
-E7bSjk8336CQ7e9GRSn6k0WN63/sJgO2b8sVW2knU6reiRDF3i/isZXr7PUyNe4=
-=Y06O
------END PGP SIGNATURE-----
diff --git a/dev-java/jna/files/3.2.7-build.xml.patch b/dev-java/jna/files/3.2.7-build.xml.patch
deleted file mode 100644
index c907b592b040..000000000000
--- a/dev-java/jna/files/3.2.7-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 @@
- <path id="test.runpath">
- <pathelement path="${build}/${jar}"/>
- <pathelement path="${test.classes}"/>
-+ <!--
- <pathelement path="lib/clover.jar"/>
-+ -->
- <path refid="test.libs"/>
- </path>
- </target>
-@@ -433,13 +435,17 @@
- <copy todir="${build}/jws" file="${build}/${jar}"/>
- <copy todir="${build}/jws" file="${build}/${testjar}"/>
- <copy todir="${build}/jws" file="lib/junit.jar"/>
-+ <!--
- <copy todir="${build}/jws" file="lib/clover.jar"/>
-+ -->
- <jar jarfile="${build}/jws/jnidispatch.jar">
- <fileset dir="${build.native}" includes="*jnidispatch.*"/>
- </jar>
-+ <!--
- <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
-- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
- </signjar>
-+ -->
- </target>
-
- <!-- When running tests from an IDE, be sure to set jna.library.path -->
diff --git a/dev-java/jna/files/3.2.7-makefile-flags.patch b/dev-java/jna/files/3.2.7-makefile-flags.patch
deleted file mode 100644
index 80048828498a..000000000000
--- a/dev-java/jna/files/3.2.7-makefile-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- native/Makefile.orig 2011-01-25 16:42:02.341745978 +0100
-+++ native/Makefile 2011-01-25 16:45:57.500174283 +0100
-@@ -67,10 +66,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) \
- -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)
-@@ -109,7 +108,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 +128,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 +143,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 +190,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/3.3.0-build.xml.patch b/dev-java/jna/files/3.3.0-build.xml.patch
deleted file mode 100644
index c907b592b040..000000000000
--- a/dev-java/jna/files/3.3.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 @@
- <path id="test.runpath">
- <pathelement path="${build}/${jar}"/>
- <pathelement path="${test.classes}"/>
-+ <!--
- <pathelement path="lib/clover.jar"/>
-+ -->
- <path refid="test.libs"/>
- </path>
- </target>
-@@ -433,13 +435,17 @@
- <copy todir="${build}/jws" file="${build}/${jar}"/>
- <copy todir="${build}/jws" file="${build}/${testjar}"/>
- <copy todir="${build}/jws" file="lib/junit.jar"/>
-+ <!--
- <copy todir="${build}/jws" file="lib/clover.jar"/>
-+ -->
- <jar jarfile="${build}/jws/jnidispatch.jar">
- <fileset dir="${build.native}" includes="*jnidispatch.*"/>
- </jar>
-+ <!--
- <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
-- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
- </signjar>
-+ -->
- </target>
-
- <!-- When running tests from an IDE, be sure to set jna.library.path -->
diff --git a/dev-java/jna/files/3.3.0-makefile-flags.patch b/dev-java/jna/files/3.3.0-makefile-flags.patch
deleted file mode 100644
index 80048828498a..000000000000
--- a/dev-java/jna/files/3.3.0-makefile-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- native/Makefile.orig 2011-01-25 16:42:02.341745978 +0100
-+++ native/Makefile 2011-01-25 16:45:57.500174283 +0100
-@@ -67,10 +66,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) \
- -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)
-@@ -109,7 +108,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 +128,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 +143,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 +190,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/jna-3.2.7.ebuild b/dev-java/jna/jna-3.2.7.ebuild
deleted file mode 100644
index 8533c75bd78a..000000000000
--- a/dev-java/jna/jna-3.2.7.ebuild
+++ /dev/null
@@ -1,80 +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.7.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $
-
-EAPI="4"
-
-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/"
-SRC_URI="https://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip -> ${P}-src.zip
- https://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/contrib/platform/build.xml -> ${P}-platform-build.xml
- https://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/contrib/platform/nbproject/build-impl.xml -> ${P}-platform-build-impl.xml
- https://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/contrib/platform/nbproject/project.properties?rev=1138 -> ${P}-platform-project.properties"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-RDEPEND="virtual/libffi
- >=virtual/jre-1.6"
-
-DEPEND="virtual/libffi
- >=virtual/jdk-1.6
- dev-util/pkgconfig
- test? (
- dev-java/junit:0
- dev-java/ant-junit:0
- dev-java/ant-trax:0
- )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-src_unpack() {
- unpack ${P}-src.zip
- mkdir -p contrib/platform/nbproject || die
- cp "${DISTDIR}"/${P}-platform-build.xml contrib/platform/build.xml || die
- cp "${DISTDIR}"/${P}-platform-build-impl.xml contrib/platform/nbproject/build-impl.xml || die
- cp "${DISTDIR}"/${P}-platform-project.properties contrib/platform/nbproject/project.properties || die
-}
-
-java_prepare() {
- # respect CFLAGS, don't inhibit warnings, honour CC
- # fix build.xml file
- epatch "${FILESDIR}/${PV}-makefile-flags.patch" "${FILESDIR}/${PV}-build.xml.patch"
-
- # 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_dojar contrib/platform/dist/platform.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
-}
diff --git a/dev-java/jna/jna-3.3.0.ebuild b/dev-java/jna/jna-3.3.0.ebuild
deleted file mode 100644
index 51411216b77c..000000000000
--- a/dev-java/jna/jna-3.3.0.ebuild
+++ /dev/null
@@ -1,80 +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.3.0.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $
-
-EAPI="4"
-
-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/"
-SRC_URI="http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/dist/src.zip?rev=1212 -> ${P}-src.zip
- http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/build.xml?raw=true -> ${P}-platform-build.xml
- http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/nbproject/build-impl.xml?raw=true -> ${P}-platform-build-impl.xml
- http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/nbproject/project.properties?rev=1212 -> ${P}-platform-project.properties"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-RDEPEND="virtual/libffi
- >=virtual/jre-1.6"
-
-DEPEND="virtual/libffi
- >=virtual/jdk-1.6
- dev-util/pkgconfig
- test? (
- dev-java/junit:0
- dev-java/ant-junit:0
- dev-java/ant-trax:0
- )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-src_unpack() {
- unpack ${P}-src.zip
- mkdir -p contrib/platform/nbproject || die
- cp "${DISTDIR}"/${P}-platform-build.xml contrib/platform/build.xml || die
- cp "${DISTDIR}"/${P}-platform-build-impl.xml contrib/platform/nbproject/build-impl.xml || die
- cp "${DISTDIR}"/${P}-platform-project.properties contrib/platform/nbproject/project.properties || die
-}
-
-java_prepare() {
- # respect CFLAGS, don't inhibit warnings, honour CC
- # fix build.xml file
- epatch "${FILESDIR}/${PV}-makefile-flags.patch" "${FILESDIR}/${PV}-build.xml.patch"
-
- # 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_dojar contrib/platform/dist/platform.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
-}