new upstream version, introduced support for the source useflag. marked 1.4 stable on amd64 and x86.

Package-Manager: portage-2.0.51.19

7 files changed, 129 insertions, 18 deletions

diff --git a/dev-java/webgraph/ChangeLog b/dev-java/webgraph/ChangeLog
index 49bb382afa50..e062a5acb145 100644
--- a/dev-java/webgraph/ChangeLog
+++ b/dev-java/webgraph/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/webgraph
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/ChangeLog,v 1.7 2005/01/20 19:42:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/ChangeLog,v 1.8 2005/04/15 13:12:42 luckyduck Exp $
+
+*webgraph-1.4.1 (15 Apr 2005)
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/webgraph-1.4-gentoo.patch, +files/webgraph-1.4.1-gentoo.patch,
+  -files/webgraph-gentoo.patch, +webgraph-1.4.1.ebuild, webgraph-1.4.ebuild:
+  new upstream version, introduced support for the source useflag. marked 1.4
+  stable on amd64 and x86.
 
   20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> webgraph-1.4.ebuild:
   added missing jikes dependency. see #78819.
diff --git a/dev-java/webgraph/Manifest b/dev-java/webgraph/Manifest
index 8ab7930a5623..156343e32da6 100644
--- a/dev-java/webgraph/Manifest
+++ b/dev-java/webgraph/Manifest
@@ -1,5 +1,18 @@
-MD5 1dc1b1ef08b3eeb234425d0d20940a5c webgraph-1.4.ebuild 1370
-MD5 0e26162761f84c42abfa7141abd7fe77 ChangeLog 514
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e6f2f551e5a05c4c993cd185e015f91d webgraph-1.4.ebuild 1432
+MD5 b14892083231abbc6b7de25b7c430a9b ChangeLog 852
+MD5 03e4e5d5a591502e4fe084cc0919303d webgraph-1.4.1.ebuild 1443
 MD5 0c9017518e143d58321621a078612580 metadata.xml 340
+MD5 ce2de7b5b8bcadaaedcce0d9912e5ac0 files/webgraph-1.4-gentoo.patch 1032
 MD5 691e86513d4baf7f43f8159360c15094 files/digest-webgraph-1.4 67
-MD5 ce2de7b5b8bcadaaedcce0d9912e5ac0 files/webgraph-gentoo.patch 1032
+MD5 049d988590f3dd6aed3a765931e542e4 files/digest-webgraph-1.4.1 69
+MD5 ff38403e894b727d945834e40263d4b9 files/webgraph-1.4.1-gentoo.patch 1404
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCX73b06ebR+OMO78RAlXeAJ9s4geY9wshmZ28LVHWGk6bZZ/FYwCfV0qN
+Lt+f52+NOvTgMCrsgO0nJMc=
+=PFJG
+-----END PGP SIGNATURE-----
diff --git a/dev-java/webgraph/files/digest-webgraph-1.4.1 b/dev-java/webgraph/files/digest-webgraph-1.4.1
new file mode 100644
index 000000000000..82131256b9ea
--- /dev/null
+++ b/dev-java/webgraph/files/digest-webgraph-1.4.1
@@ -0,0 +1 @@
+MD5 b22b0cf78075c21367a1bba03f8d87c8 webgraph-1.4.1-src.tar.gz 55467
diff --git a/dev-java/webgraph/files/webgraph-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4-gentoo.patch
index a18d127634c1..a18d127634c1 100644
--- a/dev-java/webgraph/files/webgraph-gentoo.patch
+++ b/dev-java/webgraph/files/webgraph-1.4-gentoo.patch
diff --git a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..a4ad2d262a15
--- /dev/null
+++ b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2005-04-15 14:36:14.000000000 +0200
++++ build.xml	2005-04-15 14:38:45.000000000 +0200
+@@ -19,6 +19,14 @@
+ 	<property name="jar.base" value="/usr/share/java"/>
+ 	<property name="javadoc.base" value="/usr/share/javadoc"/>
+ 
++	<path id="compile.classpath">
++		<pathelement location="lib/jal.jar" />
++		<pathelement location="lib/colt.jar" />
++		<pathelement location="lib/fastutil.jar" />
++		<pathelement location="lib/gnu.getopt.jar" />
++		<pathelement location="lib/mg4j.jar" />
++	</path>
++	
+ 	<!--
+ 		Groovy and Cobertura need different versions of asm.
+ 		Due to the delegation-based class-loading model used
+@@ -119,7 +127,9 @@
+ 	<target name="all" depends="jar,javadoc"/>
+ 
+ 	<target name="compile" depends="init" description="Compile standard sources (not test files)">
+-		<javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4"/>
++		<javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4" target="1.4">
++			<classpath refid="compile.classpath" />
++		</javac>
+ 	</target>
+ 
+ 	<target name="jar" depends="compile" description="Creates jar (without tests)">
+@@ -144,6 +154,7 @@
+ 			<link href="${colt.apiurl}"/>
+ 			<link href="${jal.apiurl}"/>
+ 			<link href="${mg4j.apiurl}"/>
++			<classpath refid="compile.classpath" />
+ 		</javadoc>
+ 	</target>
+ 
diff --git a/dev-java/webgraph/webgraph-1.4.1.ebuild b/dev-java/webgraph/webgraph-1.4.1.ebuild
new file mode 100644
index 000000000000..54226a370f19
--- /dev/null
+++ b/dev-java/webgraph/webgraph-1.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/webgraph-1.4.1.ebuild,v 1.1 2005/04/15 13:12:42 luckyduck Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="WebGraph is a framework to study the web graph. It provides simple ways to manage very large graphs, exploiting modern compression techniques."
+SRC_URI="http://webgraph.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://webgraph.dsi.unimi.it"
+LICENSE="LGPL-2.1"
+SLOT="1.4"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc jikes source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/jal-20031117
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/java-getopt-1.0*
+	=dev-java/fastutil-4.4*
+	=dev-java/colt-1.1*
+	=dev-java/mg4j-0.9*"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from java-getopt-1
+	java-pkg_jar-from fastutil-4.4
+	java-pkg_jar-from colt colt.jar
+	java-pkg_jar-from jal jal.jar
+	java-pkg_jar-from mg4j-0.9
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	mv ${P}.jar ${PN}.jar
+	java-pkg_dojar ${PN}.jar
+
+	if use doc; then
+		dodoc CHANGES COPYING
+		java-pkg_dohtml -r docs/*
+	fi
+	use source && java-pkg_dosrc java/it
+}
diff --git a/dev-java/webgraph/webgraph-1.4.ebuild b/dev-java/webgraph/webgraph-1.4.ebuild
index a6d819d68637..5373180aaf61 100644
--- a/dev-java/webgraph/webgraph-1.4.ebuild
+++ b/dev-java/webgraph/webgraph-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/webgraph-1.4.ebuild,v 1.2 2005/01/20 19:42:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/webgraph-1.4.ebuild,v 1.3 2005/04/15 13:12:42 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -9,12 +9,13 @@ SRC_URI="http://webgraph.dsi.unimi.it/${P}-src.tar.gz"
 HOMEPAGE="http://webgraph.dsi.unimi.it"
 LICENSE="LGPL-2.1"
 SLOT="1.4"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc jikes"
+KEYWORDS="x86 ~ppc amd64"
+IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/jal-20031117
-	jikes? ( dev-java/jikes )"
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/java-getopt-1.0*
 	=dev-java/fastutil-4.3*
@@ -23,9 +24,9 @@ RDEPEND=">=virtual/jre-1.4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
-	epatch ${FILESDIR}/webgraph-gentoo.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	mkdir lib/ && cd lib/
 	java-pkg_jar-from java-getopt-1
@@ -37,22 +38,19 @@ src_unpack() {
 
 src_compile() {
 	local antflags="jar"
-	if use doc; then
-		antflags="${antflags} javadoc"
-	fi
-	if use jikes; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-	ant ${antflags}
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
 	mv ${P}.jar ${PN}.jar
 	java-pkg_dojar ${PN}.jar
 
-	dodoc CHANGES COPYING
 	if use doc; then
+		dodoc CHANGES
 		java-pkg_dohtml -r docs/*
 	fi
+	use source && java-pkg_dosrc java/it
 }