Version bump

Package-Manager: portage-2.2_rc61-r1/cvs/Linux x86_64

4 files changed, 104 insertions, 7 deletions

diff --git a/dev-java/fec/ChangeLog b/dev-java/fec/ChangeLog
index 2e473d054719..2b8e7a69c3a9 100644
--- a/dev-java/fec/ChangeLog
+++ b/dev-java/fec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/fec
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.6 2009/03/09 22:34:52 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.7 2010/01/09 12:50:45 tommy Exp $
+
+*fec-1.0.4 (09 Jan 2010)
+
+  09 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +fec-1.0.4.ebuild, +files/fec-1.0.4-libfec8path.patch:
+  Version bump
 
   09 Mar 2009; Markus Meier <maekke@gentoo.org> fec-1.0.3-r1.ebuild:
   amd64/x86 stable, bug #260958
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index 1592ec2fe7e9..a8e5524201a8 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fec-1.0.4-libfec8path.patch 1068 RMD160 8e1ad3dde5cbcd21eb04040e152d6d196ac20d5d SHA1 be2e21795943690c7333c3bbed445fe01e8ca64c SHA256 942e1b7f5bf4ae2da1270140d51d24c4a4e112d3eb6f833c68e48ef7bb3cce3d
 AUX libfec8path.patch 950 RMD160 0df6aad13aeea91116f7a03a8833e4e89bef9773 SHA1 c5936a8e9e738ea74ef3798932e8308b0a13ec31 SHA256 cedc6420e56ad4e707499fd40ae603887a253476c23368058945da64c2ce4081
 DIST fec-1.0.3.zip 745195 RMD160 b1b302071c6eb90ce586e01da6c31de4a469acf5 SHA1 35de94815de1a132bc0aa991dcfffd5547226ff4 SHA256 2b23956854800b85a0d2eec11ab0940daec44e4c828b78782686efe8511a7d12
+DIST fec-1.0.4.tar.bz2 611131 RMD160 77c7a10562a91cd33f50f94ec322f41bc74ff4a9 SHA1 88d66aa906f12f55114d37e67c8f2a47ae13363f SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd
 EBUILD fec-1.0.3-r1.ebuild 1562 RMD160 5e00700b19316b8f4135475daf7e3679faad7a00 SHA1 ed27c9ddd6b3ed1b482fdee0f98dadaf4dcb06a2 SHA256 953c768350589fa1e42aba2bfab7236af871d9ddca863773c4390d46ccbc1b9b
-MISC ChangeLog 1006 RMD160 8d6fecbd35a2b3f745fa2b426baf61095e5d5d75 SHA1 e5360615795378f192d7479491450b6f72dd5d86 SHA256 3aeda4d195dbf318b0d6d7ab41dd5add40fdb359ad3d4a6ff59ea55c36d2f86f
+EBUILD fec-1.0.4.ebuild 1467 RMD160 44a1754d0bfd51c1dade0b5cd1ec851010b7e306 SHA1 63d3ed926d8a75fb84bf55547cfb9e959aeef881 SHA256 eca4e507e7ba2a1bffa2ce3e0179d8a0960bee257cefd6856a24217bb1319f49
+MISC ChangeLog 1163 RMD160 8c369c783c3d26666930c85060917eb7ee94c542 SHA1 1eebd8bc3146960dd048f9d367f92d6586f83931 SHA256 de0b03da242a3369d4316912905b038cb6044fb00a9257ef409fedd441164340
 MISC metadata.xml 262 RMD160 beccaa043c2480f3afbd62f89a4c8ba55ef725f8 SHA1 c05367066b98af14b7089a2122ac09a3fa109281 SHA256 5a48177bba82f308c835efee09c4f2da15fe97eb7bf5a9a9950940dd1b7c95a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkm1mZUACgkQkKaRLQcq0GJQsQCgiy0nsfKla+M6N0B/dAD3S9eF
-KO0An3FDCUYCWIrWxgO238S1DFrLxA7h
-=ZUOb
+iJwEAQECAAYFAktIe78ACgkQG7kqcTWJkGdBqAQAgu2hoZQUtY6+/B6McI97X+wS
+QxM97TX7fhwSuNgkLljzjumc0xTkA0XKf4/vpF2VCmXdSINddxkbr2iHdKgmIjVo
+UpiTdhYZq4VA7X70Q3d6KYMv6OAR4mc43DA7JdAkp63l836GYIP/nx76ohhVVKii
+62tpCUepHKB+xARlOPM=
+=3dY2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fec/fec-1.0.4.ebuild b/dev-java/fec/fec-1.0.4.ebuild
new file mode 100644
index 000000000000..eb61b8679840
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# 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.1 2010/01/09 12:50:45 tommy Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Forword error correction libs"
+HOMEPAGE="http://www.onionnetworks.com/developers/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hardened"
+
+COMMON_DEPEND="dev-java/log4j
+	dev-java/concurrent-util"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPEND}"
+EANT_BUILD_TARGET="jars"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
+	epatch "${FILESDIR}"/${P}-libfec8path.patch
+	eant clean
+	cd lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from log4j
+	java-pkg_jar-from concurrent-util concurrent.jar concurrent-jaxed.jar
+	cd "${S}" || die
+	unzip -q common-20020926.zip || die
+	cd common-20020926 || die
+	eant clean
+	cp -r src/com ../src/ || die
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd "${S}"/src/csrc
+	use hardened && append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so || die
+}
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
new file mode 100644
index 000000000000..503db7c837eb
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -0,0 +1,29 @@
+--- src/com/onionnetworks/fec/Native8Code.java	2009-08-21 02:37:00.515004583 +0200
++++ src/com/onionnetworks/fec/Native8Code.java.new	2009-08-21 02:37:57.829254678 +0200
+@@ -3,6 +3,7 @@
+ //import java.security.AccessController;
+ //import sun.security.action.*;
+ import com.onionnetworks.util.*;
++import java.io.File;
+ 
+ /**
+  * This class is the frontend for the JNI wrapper for the C implementation of
+@@ -21,15 +22,10 @@
+     final private long code;
+ 
+     static {
+-        String path = NativeDeployer.getLibraryPath
+-            (Native8Code.class.getClassLoader(),"fec8");
+-        if (path != null) {
+-            System.load(path);
++       File path = new File("/usr/lib/libfec8.so");
++       System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++       System.load(path.getAbsolutePath());
+             initFEC();
+-        } else {
+-            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
+-            System.out.println(path);
+-        }
+     }
+ 
+     public Native8Code(int k, int n) {