Dropped jffi-1.2.7-r1

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

3 files changed, 5 insertions, 155 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/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/*
-}