Version bump. #452168

Remove obsolete.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

11 files changed, 19 insertions, 534 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 5a5880fd2ec6..7033db9068ef 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/jffi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.25 2012/09/25 10:41:34 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.26 2013/02/07 13:15:36 sera Exp $
+
+*jffi-1.2.6 (07 Feb 2013)
+
+  07 Feb 2013; Ralph Sennhauser <sera@gentoo.org>
+  -files/0.3-makefile-flags.patch, -jffi-0.6.0.2.ebuild,
+  -jffi-0.6.0.2-r1.ebuild, -jffi-0.7_pre20100131.ebuild,
+  -files/jffi-0.7-makefile-flags.patch, -jffi-1.2.2.ebuild,
+  -files/0.4.1-makefile-flags.patch, -files/jffi-1.2.2_no-werror.patch,
+  +jffi-1.2.6.ebuild, +files/jffi-1.2.6_no-werror.patch,
+  -files/0.5-makefile-flags.patch, -files/0.6.0.2-makefile-flags.patch:
+  Version bump. #452168
+  Remove obsolete.
 
 *jffi-1.2.5 (25 Sep 2012)
 
diff --git a/dev-java/jffi/files/0.3-makefile-flags.patch b/dev-java/jffi/files/0.3-makefile-flags.patch
deleted file mode 100644
index 780e4c5e62cf..000000000000
--- a/dev-java/jffi/files/0.3-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-06-03 21:32:31.000000000 +0200
-+++ jni/GNUmakefile	2009-06-03 21:34:56.000000000 +0200
-@@ -43,7 +43,7 @@
- #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
-+WFLAGS = -Wall -Wno-unused -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
- LDFLAGS += $(SOFLAGS)
-@@ -55,7 +55,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -65,9 +65,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.4.1-makefile-flags.patch b/dev-java/jffi/files/0.4.1-makefile-flags.patch
deleted file mode 100644
index 11694b26eccc..000000000000
--- a/dev-java/jffi/files/0.4.1-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-06-03 21:52:34.000000000 +0200
-+++ jni/GNUmakefile	2009-06-03 21:51:50.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq (($OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,7 +54,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -64,9 +64,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.5-makefile-flags.patch b/dev-java/jffi/files/0.5-makefile-flags.patch
deleted file mode 100644
index 712ec3d0c33e..000000000000
--- a/dev-java/jffi/files/0.5-makefile-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- jni/GNUmakefile.orig	2009-08-07 07:44:41.000000000 +1200
-+++ jni/GNUmakefile	2009-08-07 07:47:59.000000000 +1200
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,7 +54,7 @@
- 
- JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),mingw32)
-@@ -64,9 +64,6 @@
-   ifneq ($(OS),$(BUILD_OS))
-     CC ?= i386-mingw32-gcc
-     LD ?= i386-mingw32-ld
--  else
--    CC = gcc
--    LD = ld
-   endif
- endif
- ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.6.0.2-makefile-flags.patch b/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
deleted file mode 100644
index 08f51acb4280..000000000000
--- a/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- jni/GNUmakefile.orig	2009-12-30 18:59:22.000000000 +1300
-+++ jni/GNUmakefile	2009-12-30 19:02:10.000000000 +1300
-@@ -42,7 +42,7 @@
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -54,8 +54,8 @@
- STRIP = strip -S
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
--IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)"
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS),cross-mingw32)
-@@ -147,11 +147,11 @@
- endif
- 
- LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
--FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
--	--with-pic=yes --disable-dependency-tracking
--ifdef CONFIGURE_HOST
--	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
--endif
-+#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
-+#	--with-pic=yes --disable-dependency-tracking
-+#ifdef CONFIGURE_HOST
-+#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
-+#endif
- all:	$(LIBJFFI)
- 
- debug:
-@@ -211,12 +211,6 @@
- else
- $(LIBFFI):		
- 	@mkdir -p $(LIBFFI_BUILD_DIR)
--	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
--	    echo "Configuring libffi for $(PLATFORM)"; \
--	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
--		$(FFI_CONFIGURE) > /dev/null; \
--	fi
--	$(MAKE) -C $(LIBFFI_BUILD_DIR)
- endif
- clean::
- 	# nothing to do - ant will delete the build dir
diff --git a/dev-java/jffi/files/jffi-0.7-makefile-flags.patch b/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
deleted file mode 100644
index 394d65b44b5b..000000000000
--- a/dev-java/jffi/files/jffi-0.7-makefile-flags.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: wmeissner-jffi-6c5fb4a/jni/GNUmakefile
-===================================================================
---- wmeissner-jffi-6c5fb4a.orig/jni/GNUmakefile
-+++ wmeissner-jffi-6c5fb4a/jni/GNUmakefile
-@@ -58,7 +58,7 @@ OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
- ifneq ($(OS),darwin)
--  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+  WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef
- endif
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -70,8 +70,8 @@ FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
- STRIP = strip -S
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
--IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include
--CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
-+IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
- 
-@@ -204,15 +204,15 @@ ifneq ($(strip $(findstring $(OS), linux
- endif
- 
- LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
--FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
--	--with-pic=yes --disable-dependency-tracking
--ifdef CONFIGURE_HOST
--	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
--endif
--
--ifdef CONFIGURE_BUILD
--	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
--endif
-+#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
-+#	--with-pic=yes --disable-dependency-tracking
-+#ifdef CONFIGURE_HOST
-+#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
-+#endif
-+#
-+#ifdef CONFIGURE_BUILD
-+#	FFI_CONFIGURE += --build=$(CONFIGURE_BUILD)
-+#endif
- 
- all:	$(LIBJFFI)
- 
-@@ -245,55 +245,55 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.cpp $(wi
- 	$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- 
--ifeq ($(OS), darwin)
--build_ffi = \
--	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
--	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
--	    echo "Configuring libffi for $(1)"; \
--	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
--	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
--		$(FFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
--	fi); \
--	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
--	
--$(LIBFFI):
--	@mkdir -p $(@D)
--	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
--	
--	# Assemble into a FAT (i386, x86_64, ppc) library
--	@mkdir -p $(BUILD_DIR)/libffi/.libs
--	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
--	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
--	@mkdir -p $(LIBFFI_BUILD_DIR)/include
--	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
--	@( \
--		printf "#if defined(__i386__)\n"; \
--		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
--		printf "#elif defined(__x86_64__)\n"; \
--		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
--		printf "#elif defined(__ppc__)\n"; \
--		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
--		printf "#endif\n";\
--	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
--else
--$(LIBFFI):		
--	@mkdir -p $(LIBFFI_BUILD_DIR)
--	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
--	    echo "Configuring libffi for $(PLATFORM)"; \
--	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
--		$(FFI_CONFIGURE) > /dev/null; \
--	fi
--	$(MAKE) -C $(LIBFFI_BUILD_DIR)
--endif
-+#ifeq ($(OS), darwin)
-+#build_ffi = \
-+#	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
-+#	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
-+#	    echo "Configuring libffi for $(1)"; \
-+#	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
-+#	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
-+#		$(FFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
-+#	fi); \
-+#	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
-+#	
-+#$(LIBFFI):
-+#	@mkdir -p $(@D)
-+#	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
-+#	
-+#	# Assemble into a FAT (i386, x86_64, ppc) library
-+#	@mkdir -p $(BUILD_DIR)/libffi/.libs
-+#	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
-+#	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
-+#	@mkdir -p $(LIBFFI_BUILD_DIR)/include
-+#	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
-+#	@( \
-+#		printf "#if defined(__i386__)\n"; \
-+#		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
-+#		printf "#elif defined(__x86_64__)\n"; \
-+#		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
-+#		printf "#elif defined(__ppc__)\n"; \
-+#		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
-+#		printf "#endif\n";\
-+#	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
-+#	@( \
-+#		printf "#if defined(__i386__)\n"; \
-+#		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
-+#		printf "#elif defined(__x86_64__)\n"; \
-+#		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
-+#		printf "#elif defined(__ppc__)\n"; \
-+#		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
-+#		printf "#endif\n";\
-+#	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
-+#else
-+#$(LIBFFI):		
-+#	@mkdir -p $(LIBFFI_BUILD_DIR)
-+#	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
-+#	    echo "Configuring libffi for $(PLATFORM)"; \
-+#	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
-+#		$(FFI_CONFIGURE) > /dev/null; \
-+#	fi
-+#	$(MAKE) -C $(LIBFFI_BUILD_DIR)
-+#endif
- clean::
- 	# nothing to do - ant will delete the build dir
- 
diff --git a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
index 25b7e4f8ec00..25b7e4f8ec00 100644
--- a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
+++ b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
diff --git a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
deleted file mode 100644
index 6e66f46e9563..000000000000
--- a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
+++ /dev/null
@@ -1,73 +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/jffi/jffi-0.6.0.2-r1.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-SRC_URI="mirror://gentoo//${P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-0.6.0.2.ebuild b/dev-java/jffi/jffi-0.6.0.2.ebuild
deleted file mode 100644
index 964b8d2a83ca..000000000000
--- a/dev-java/jffi/jffi-0.6.0.2.ebuild
+++ /dev/null
@@ -1,71 +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/jffi/jffi-0.6.0.2.ebuild,v 1.2 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-SRC_URI="mirror://gentoo//${P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-0.7_pre20100131.ebuild b/dev-java/jffi/jffi-0.7_pre20100131.ebuild
deleted file mode 100644
index f2d44debcbe6..000000000000
--- a/dev-java/jffi/jffi-0.7_pre20100131.ebuild
+++ /dev/null
@@ -1,87 +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/jffi/jffi-0.7_pre20100131.ebuild,v 1.3 2012/08/25 19:09:47 thev00d00 Exp $
-
-# Probably best to leave the CFLAGS as they are here. See...
-# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="http://kenai.com/projects/jffi"
-
-TREE_HASH="6c5fb4a241a747f7c8561156ed81fbee52a0174f"
-SRC_URI="http://github.com/wmeissner/jffi/tarball/${TREE_HASH} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/wmeissner-${PN}-${TREE_HASH:0:7}"
-
-LICENSE="LGPL-3"
-SLOT="0.4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/libffi"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/libffi
-	virtual/pkgconfig
-	test? ( dev-java/ant-junit4 )"
-
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
-
-java_prepare() {
-	# Delete the bundled JARs.
-	find lib -name "*.jar" -delete || die
-	# Delete the bundled libffi
-	rm -rf jni/libffi || die
-
-	# bug #271533 and #272058
-	epatch "${FILESDIR}/${PN}-0.7-makefile-flags.patch"
-
-	# bug #272058
-	append-cflags $(pkg-config --cflags-only-I libffi)
-
-	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
-	local arch=""
-	use x86 && arch="i386"
-	use amd64 && arch="x86_64"
-	use ppc && arch="ppc"
-
-	# Fetch our own prebuilt libffi.
-	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
-
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
-
-	# Don't include prebuilt files for other archs.
-	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
-	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
-	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
-
-	# Fix build with GCC 4.7 #421501
-	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
-}
-
-src_install() {
-	mkdir -p "${T}"/com/kenai/jffi
-	cat - > "${T}"/com/kenai/jffi/boot.properties <<EOF
-jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-EOF
-
-	pushd "${T}" &>/dev/null
-	jar -uf "${S}"/dist/${PN}.jar com
-	popd
-
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}
diff --git a/dev-java/jffi/jffi-1.2.2.ebuild b/dev-java/jffi/jffi-1.2.6.ebuild
index fedb1980deb2..f9b1d6a8471f 100644
--- a/dev-java/jffi/jffi-1.2.2.ebuild
+++ b/dev-java/jffi/jffi-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.2.ebuild,v 1.2 2012/05/28 19:33:58 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.1 2013/02/07 13:15:36 sera Exp $
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -41,7 +41,7 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 src_compile() {
 	# generate Version.java
-	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
 		package com.kenai.jffi;
 		public final class Version {
 			private Version() {}
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cat <<-EOF > boot.properties
+	cat > boot.properties <<-EOF
 		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
 	EOF
 	jar -uf target/${PN}.jar boot.properties || die