Revision bump, add onion-common, include net-libs/fec, update deps

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 33 insertions, 53 deletions

diff --git a/dev-java/fec/ChangeLog b/dev-java/fec/ChangeLog
index 2dc445f6ca08..008bd1dc4f24 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.2 2009/01/25 23:50:06 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.3 2009/01/27 23:30:41 tommy Exp $
+
+*fec-1.0.3-r1 (27 Jan 2009)
+
+  27 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -files/build.xml,
+  -fec-1.0.3.ebuild, +fec-1.0.3-r1.ebuild:
+  Revision bump, add onion-common, include net-libs/fec, update deps
 
   25 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   +files/libfec8path.patch:
diff --git a/dev-java/fec/fec-1.0.3.ebuild b/dev-java/fec/fec-1.0.3-r1.ebuild
index 404ccef0d31d..791efb0463a6 100644
--- a/dev-java/fec/fec-1.0.3.ebuild
+++ b/dev-java/fec/fec-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.3.ebuild,v 1.1 2009/01/24 18:27:35 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.3-r1.ebuild,v 1.1 2009/01/27 23:30:41 tommy Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,50 +10,53 @@ DESCRIPTION="Forword error correction libs"
 HOMEPAGE="http://www.onionnetworks.com/developers/"
 SRC_URI="http://www.onionnetworks.com/downloads/${P}.zip"
 
-LICENSE="BSD-2"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.4"
+COMMON_DEPEND="dev-java/log4j
+	dev-java/concurrent-util
+	!net-libs/fec"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
-	dev-java/log4j
-	dev-java/concurrent-util"
+	${COMMON_DEPEND}"
+EANT_BUILD_TARGET="jars"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
-	cp "${FILESDIR}"/build.xml src/ || die
-	epatch "${FILESDIR}"/libfec8path.patch
 	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
+	epatch "${FILESDIR}"/libfec8path.patch
 	eant clean
 	cd lib || die
-	rm -rf * || die
-	java-pkg_jar-from --build-only log4j
-	java-pkg_jar-from --build-only concurrent-util concurrent.jar concurrent-jaxed.jar
-
+	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
-	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
 	eant clean
-	cd lib || die
-	rm -f *jar || die
+	cp -r src/com ../src/ || die
 }
 
 src_compile() {
-	cd common-20020926 || die
-	eant
-	cp lib/onion-common.jar "${S}"/lib/ || die
-	cd "${S}" || die
-	eant
-	cd src || die
-	eant jar $(use_doc)
+	java-pkg-2_src_compile
+	if use x86; then
+		cd "${S}"/src/csrc
+		append-flags -fPIC
+		emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die
+	fi
 }
 
 src_install() {
-	java-pkg_dojar src/${PN}.jar
-	use doc && java-pkg_dojavadoc src/docs
+	java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc src/com
+	if use x86; then
+		 dolib.so ../../lib/fec-linux-x86/lib/linux/x86/libfec{8,16}.so || die
+	fi
 }
diff --git a/dev-java/fec/files/build.xml b/dev-java/fec/files/build.xml
deleted file mode 100644
index de128ab68a4e..000000000000
--- a/dev-java/fec/files/build.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="fec" default="jar" basedir=".">
-	<target name="init">
-		<mkdir dir="build"/>
-		<mkdir dir="docs"/>
-	</target>
-	<target name="compile" depends="init">
-		<javac srcdir="." destdir="build">
-			<classpath path="../lib/onion-common.jar"/>
-			<classpath path="../lib/log4j.jar"/>
-			<classpath path="../lib/concurrent-jaxed.jar"/>
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar jarfile="fec.jar" basedir="build"/>
-	</target>
-
-	<target name="javadoc" depends="init">
-		<javadoc destdir="docs">
-			<classpath path="../lib/onion-common.jar"/>
-			<classpath path="../lib/log4j.jar"/>
-			<classpath path="../lib/concurrent-jaxed.jar"/>
-			<fileset dir=".">
-				<include name="**/*.java"/>
-			</fileset>
-		</javadoc>
-	</target>
-</project>