Dropped jffi-1.2.7-r1

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 13 insertions, 165 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 76781e6f39c1..adbcd5863ae8 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.36 2014/11/17 09:09:28 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.37 2014/11/17 09:12:23 ercpe Exp $
+
+  17 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+  -files/jffi-1.2.7_no-werror.patch, -jffi-1.2.7-r1.ebuild:
+  Dropped jffi-1.2.7-r1
 
 *jffi-1.2.7-r2 (17 Nov 2014)
 
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 01b514baaaa5..12f86170ce11 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -8,7 +8,6 @@ AUX jffi-1.2.5_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00
 AUX jffi-1.2.6_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
 AUX jffi-1.2.7-junit-4.11.patch 700 SHA256 db896154d8f55aae69f564a908ca1ea79c96af44f561bd2a1cc47a99226fef4a SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 WHIRLPOOL 910bfba3cc1164bc2f7197195dfb9d739e32eb406185e8027f9d47a3e3cf6759fadac01b8cdfb0127d74ffd0f487280d5dacc360a81595f3aa5e93414197081b
 AUX jffi-1.2.7-makefile.patch 2097 SHA256 09174463a2fbebfa8db08bd8baa3fd049d77e241de3a950a311d67ca2629d68e SHA512 289181a6f0200caf8aff7a923039df7a6da7044e3b0f73aaa306cac5f74543f4992a016acf2a087a9460eaebc8642ebab6cec1608619e965796f7aa2e8db89b6 WHIRLPOOL 55485ca33936f8d2e7fd79226fb6c25b49a346ebd8283e6d4880a383bc5221cd39addf47a33a8705ea04e64c2e167d827f5ddc966a08f651050bbcca62574cbe
-AUX jffi-1.2.7_no-werror.patch 1137 SHA256 3b35971546edf9a9d389ebe3a677690285c0f440af7c09b9f5124f9dd2c101c8 SHA512 c69db1badf77a3b0d3621655d45b41c6f5bfae2f396e51f1adf9516934fb8fb57b1a065550409f6448964c246fc4b9b59afaae985a1fef3d10a1d01e4b6eab71 WHIRLPOOL 7de52a8da4240f3e0a6e5fd2329a01a9bd3376cdd67e4401cfe867e02f8ea2562216fb46399eec9c012f858ce6e8835eb193e08085be3b1642d42e8e9bbefd7f
 AUX jffi_maven-build.xml 11287 SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 WHIRLPOOL 42f50c85cad6673cff32b41593c3b30c5193b1ce204a1df6a97d68d70ee6a6cd61f2b6d887bc36002e516849d91139fa1254a76b8951e839a483865e875964a5
 DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e SHA512 cb37052d0a2dc719d1f2ab2620c1a1908cf51c5d1e04d13caaecb3659916a59e8e46fa90c2b6ddb9a63f7b78f224233b9316908456aaf9ebbc1432e7592006c7 WHIRLPOOL fba9c40a55cef900ccb5207f5d93345869693fd7ba027388797499cf65bc584260c37fd0962c0037a83c2d05eb7958c193482a8967501bedbaa2f1465644494f
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
@@ -21,19 +20,18 @@ EBUILD jffi-1.0.11-r1.ebuild 2634 SHA256 f7d5d3069012f7839f3b5ae2a6f20cff965c3e9
 EBUILD jffi-1.0.11.ebuild 2562 SHA256 e925f71ef49b9fb710f5f6ab0493a0099c57fc218aa939addf06868f51032092 SHA512 a99c55469211698e24257216249550d6f3d83d37a3a61c6887f3bc0e87ec1b5d88badb75af1eeb7955ab58da5f58621ea7e460b0b6355f4473e05c643e5ce0ab WHIRLPOOL 43eea302b639890b69014f1c3e97866a5afa5a80f84c5db0c15f872276846304c27ed966743426ba783f030060f0c85101148bb4e2275525a69ca10033fbf6cb
 EBUILD jffi-1.2.5.ebuild 2358 SHA256 89636672db08de6b69c64d1da78cad1e05679323d812900be1325202e9540707 SHA512 6df150b5bb15f94f937676b93a720c407a07dcaa646a6f72fd9bb706b61729da2332deec464f7cff0ef99c6d5716ca26dfc8ce4e821f9733db37e6387ab12a98 WHIRLPOOL 6c82cdc180b1cf9fce413facb9b4bdfcbc649f25fb5ae573b840d4deed72d0f3c66f5d459eedb1afb5b3dbf8cd873d8e6fc680c4eb944989605ec23e3914f737
 EBUILD jffi-1.2.6.ebuild 3069 SHA256 52af5d368eff758bc0a6bbd7be7ac7188d13a473f0905744df1c37eb25dd7bdc SHA512 7329dd7ed5f7b9ae10a38684a9dcd3c5f725432aee173cfbe82602198292c91a084c02e90bcb413bd307c5e17abfabf710830189a4a8d09c214ac8543bd4836f WHIRLPOOL 7b770a7c295d3c5caa5fcf8ede7d3254090049a4d11b7c8cf5c01537cbcfeec5b7f9a11d1baed8af1a8eef3fa8ad968838e515e74d8dd66b711eb04514f9132b
-EBUILD jffi-1.2.7-r1.ebuild 3173 SHA256 3ebb7943348f249f5f3c49b620f9f1e3a72c6672e644c19205120536c7b0d2ea SHA512 8a2adcbd6a1364f0bc63c57bdcd7f043a5589ea95f6a55a64901154cdb4daa23b7dd90c7b5e9cdaa420764e7ca23cb0d5ffa1cef9a8ba223b62c5fd36c8c7d0c WHIRLPOOL 969c41399e4985c8ce9dcf77c987dfbaf5c7dfe1d075af6ca846d6583b9756071529e26f50e6f7565fd7dca783c1aebcec19e363bb9a5dc64b7fea05f162b328
 EBUILD jffi-1.2.7-r2.ebuild 3184 SHA256 4229daa0a3ce3ccfd095550093c85369063e32cfc1b5d9aef17f4d41949f79fb SHA512 8ec1eb9c114f22ca309cc90fa5f111892ff0a6f003f1d35b580f930fe907eb188cc5b4131658e4ff7e0b0660125ca718eaecd8c0e594578c3416012d6ce1ef80 WHIRLPOOL a87c049d18d20e5cc9d16a59e72d0683f3ee0c99015fee29938570816b14df4f9561c0f85c381335383e42d28f20c836ed693abeaaa84a48051d8ce45e800920
 EBUILD jffi-1.2.7.ebuild 3115 SHA256 2627fbcedfa190b18fff8d122c7e401ce4293b042ab9724f3493ace323ba2bbd SHA512 9cd1a8b99943de798b527ef6b4e9be420aa7c4d258217e7504a2680675778c79e0e3ba4584cb74cfdb5ff5a4d5f88bc776c72778d0e63511dca696b3084e6caf WHIRLPOOL e4ee6cd5c6d5011c55c605031049e419697ad34a81d420a1f22814bdc7839eea1cf3a6e9633f79961ebdfc85579efd214aaa2964bd0205d93a51aaa98640fd64
-MISC ChangeLog 6262 SHA256 d02c2605d1c1eaf4371821358d3d8ebb70d9572922289b05be8de86fdf21285a SHA512 f6becd81188de2087641c0c6af46d0768a8f4ba8ec4d519d918559606e6bbc3103aa0a57d2018be6fff26320e3ad33507165b384c2e9a91212809356acd7b980 WHIRLPOOL d593a46dc7e2ad64d854a2b1736ac6b06eac88079dae0443f39d56a7e9754f3096ae907e96b5e347691412ea7a9fc34657d8afc9e6c22fe7a83e2d99cedaef1b
+MISC ChangeLog 6396 SHA256 2bfc1f61291428c1fde2dd959d5f76a53dc91d54ef18e906f078c35c9fa7bf98 SHA512 8fdaf4794a95b8a41d0faca8b41194576f5040de7ea97476fa9adc115efba09e20dd480140f6f04255b95b18beb14ca3d46a2a6956d872704bfeecac859fa599 WHIRLPOOL ced7da3873171d294b79839f709947fb7d44f6ad0fa3b0920e093c5e69161e7563b95ede7026305bd23850bb680d549ad5a09999908b1c53bc7660e38f3fd20e
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUabtNAAoJEKCEBkJ3xQHtukgH/2fet/tBgVLpx5QVUNKrA8gE
-h8NW/UiCTmn5m+tTnpd7WEYzJmt/oN2E/BScLWstSiM2/bUY1aJIWeOD+zsxDQiA
-k+BoZdqhSZ14YPJ35sn/JG4/nn/58XVAEBp5W3W+nryNFPsnr0lQ/3HXuPPE7jQ0
-T2EYgL/sPRWOyyFv3uku4vYSyUGSct01cTH4HwFRV+pR30WtOYBbI3LSdo5Dj9q0
-92Dc+7XqH1fKYm/C7ZlrY7KZIHPfLsB5bpBo0eCOw2tqBcuv0TTmSYXufZdMSD7S
-rn9uMYHdJH9aBLewBcQQ0cSC5dP9udc2Q5RKu+btn9ZuknUdesq5WcVykX8xgdI=
-=HrH1
+iQEcBAEBCAAGBQJUabv4AAoJEKCEBkJ3xQHti6kH/1eS96DLwQVv88WC+iuQ/zbR
+eRWFTMluzk9bfqc3vn4abuUEL/nWRal5tXNL2lunDlxEtZZRETQA4N7M6C3ZHb99
+vTKlkpxMTCwqJJfqDoaLKUk/6w+ge3849K1vlIZ0D/GSJZY4I1daPX17OYoEKVPF
+PaWv/TwuTP8GfUkG0fgYI4l8xdT/HZaiP7O74fq3x9psbt8HiZWn9UJH82RT42RB
+XnPBQW/c5jLdUqwkLXCSrnVmCu0zHJHyaGN/LOW6wGGfokOlikDsuIFjxoJptYx7
+1iDdF/vvtQd6CNSd+03GHpnLvIdPR60XO691JymeWbh/B+FjPVmDWET3v/Pf+Fs=
+=bovt
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
deleted file mode 100644
index 517a1e546d8b..000000000000
--- a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
-index 27737be..98f147e 100755
---- a/jffi-1.2.7/jni/GNUmakefile
-+++ b/jffi-1.2.7/jni/GNUmakefile
-@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
-   WFLAGS += -Wundef $(WERROR)
- endif
-diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
-index 9e70664..72e4cc9 100644
---- a/jffi-1.2.7/libtest/GNUmakefile
-+++ b/jffi-1.2.7/libtest/GNUmakefile
-@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
- # Compiler/linker flags from:
- #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
--OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
- PICFLAGS = -fPIC
--SOFLAGS = -shared -Wl,-O1
-+SOFLAGS = -shared
- LDFLAGS += $(SOFLAGS)
- 
- IFLAGS = -I"$(BUILD_DIR)"
diff --git a/dev-java/jffi/jffi-1.2.7-r1.ebuild b/dev-java/jffi/jffi-1.2.7-r1.ebuild
deleted file mode 100644
index 0d5ca4cc7d59..000000000000
--- a/dev-java/jffi/jffi-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7-r1.ebuild,v 1.1 2014/11/13 15:08:27 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-
-COMMON_DEP="virtual/libffi:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	virtual/pkgconfig
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-	epatch "${FILESDIR}"/${P}_no-werror.patch
-	epatch "${FILESDIR}"/${P}-junit-4.11.patch
-
-	# misc fixes for Darwin
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local uarch
-		# don't do multiarch
-		# avoid using Xcode stuff
-		# use Prefix' headers
-		# don't mess with deployment target
-		# set install_name
-		use x64-macos && uarch=x86_64
-		use x86-macos && uarch=i386
-		use ppc-macos && uarch=ppc
-		sed -i \
-			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
-			-e "/XCODE=/s:=.*$:=${EPREFIX}:" \
-			-e "/MACSDK/s/^/#/" \
-			-e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
-			-e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
-			jni/GNUmakefile || die
-	fi
-
-	find "${WORKDIR}" -iname '*.jar' -delete
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-src_compile() {
-	# generate Version.java
-	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
-		package com.kenai.jffi;
-		public final class Version {
-			private Version() {}
-			public static final int MAJOR = $(get_version_component_range 1);
-			public static final int MINOR = $(get_version_component_range 2);
-			public static final int MICRO = $(get_version_component_range 3);
-		}
-	EOF
-
-	java-pkg-2_src_compile
-
-	# generate headers
-	mkdir -p build/jni
-	javah -d build/jni -classpath target/classes \
-		com.kenai.jffi.Foreign \
-		com.kenai.jffi.ObjectBuffer \
-		com.kenai.jffi.Version \
-		|| die
-
-	#build native library.
-	local args=(
-		SRC_DIR=jni
-		JNI_DIR=jni
-		BUILD_DIR=build/jni
-		VERSION=$(get_version_component_range 1-2)
-		USE_SYSTEM_LIBFFI=1
-		-f jni/GNUmakefile
-	)
-	emake "${args[@]}"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	local libname=".so"
-
-	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
-
-	# must by after _doso to have JAVA_PKG_LIBDEST set
-	cat > boot.properties <<-EOF
-		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-	EOF
-	jar -uf target/${PN}.jar boot.properties || die
-
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}