Revision bump, fixes bug 276728 and bug 307549, thanks to Diego “Flameeyes” Pettenò for investigation and patch

(Portage version: 2.2_rc67-r3/cvs/Linux x86_64)

4 files changed, 47 insertions, 10 deletions

diff --git a/dev-java/fec/ChangeLog b/dev-java/fec/ChangeLog
index 7905d42b917e..d0f0017f0dc8 100644
--- a/dev-java/fec/ChangeLog
+++ b/dev-java/fec/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/fec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.9 2010/02/26 12:24:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.10 2010/04/10 00:11:01 tommy Exp $
+
+*fec-1.0.4-r1 (10 Apr 2010)
+
+  10 Apr 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -fec-1.0.4.ebuild, +fec-1.0.4-r1.ebuild, +files/fec-1.0.4-build.patch,
+  files/fec-1.0.4-soname.patch:
+  Revision bump, fixes bug 276728 and bug 307549, thanks to Diego
+  “Flameeyes” Pettenò for investigation and patch
 
   26 Feb 2010; Alistair Bush <ali_bush@gentoo.org> fec-1.0.4.ebuild,
   +files/fec-1.0.4-soname.patch:
diff --git a/dev-java/fec/fec-1.0.4.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild
index f30cacd70faf..f6872ea6e658 100644
--- a/dev-java/fec/fec-1.0.4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild,v 1.3 2010/02/26 12:24:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4-r1.ebuild,v 1.1 2010/04/10 00:11:02 tommy Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
+IUSE=""
 
 COMMON_DEPEND="dev-java/log4j
 	dev-java/concurrent-util"
@@ -30,10 +30,7 @@ src_unpack() {
 	cd "${S}" || die
 	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
 	sed -i -e 's/test.lib/lib/g' build.properties || die
-	epatch "${FILESDIR}"/${P}-libfec8path.patch
-	pushd src/csrc > /dev/null
-	epatch "${FILESDIR}/${P}-soname.patch"
-	popd > /dev/null
+	epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch
 
 	eant clean
 	cd lib || die
@@ -50,7 +47,7 @@ src_unpack() {
 src_compile() {
 	java-pkg-2_src_compile
 	cd "${S}"/src/csrc
-	(use amd64 || use hardened ) && append-flags -fPIC
+	append-flags -fPIC
 	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
 }
 
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
new file mode 100644
index 000000000000..3920dcec4c7d
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -0,0 +1,32 @@
+Index: csrc/Makefile
+===================================================================
+--- src/csrc.orig/Makefile
++++ src/csrc/Makefile
+@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c
+ 		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
+ 		-o fec8-jinterf.o
+ 
+-fec8.o: fec.h fec8.S
+-	$(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec8.S
+-
+-fec8.S: fec.c Makefile
+-	$(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c
++fec8.o: fec.h fec.c
++	$(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec.c
+ 
+ libfec16.so: fec16.o fec16-jinterf.o
+ 	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
+@@ -42,11 +39,8 @@ fec16-jinterf.o: fec-jinterf.c
+ 		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
+ 		-o fec16-jinterf.o
+ 
+-fec16.o: fec.h fec16.S
+-	$(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec16.S
+-
+-fec16.S: fec.c Makefile
+-	$(CC) $(CFLAGS) -DGF_BITS=16 -S -o fec16.S fec.c
++fec16.o: fec.h fec.c
++	$(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec.c
+ 
+ clean:
+ 	- rm -f *.o *.S fec *.so
diff --git a/dev-java/fec/files/fec-1.0.4-soname.patch b/dev-java/fec/files/fec-1.0.4-soname.patch
index 57fc90026ab4..ae00449ced40 100644
--- a/dev-java/fec/files/fec-1.0.4-soname.patch
+++ b/dev-java/fec/files/fec-1.0.4-soname.patch
@@ -1,5 +1,5 @@
---- Makefile.bak	2010-02-27 00:51:38.000000000 +1300
-+++ Makefile	2010-02-27 00:56:06.000000000 +1300
+--- src/csrc/Makefile.bak	2010-02-27 00:51:38.000000000 +1300
++++ src/csrc/Makefile	2010-02-27 00:56:06.000000000 +1300
 @@ -21,7 +21,8 @@
  	$(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c