From 854105cbcf5cb36406934e78de59cc1823e0317a Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Sat, 28 Apr 2007 19:28:41 +0000 Subject: [PATCH] Migrated to generation 2. Package-Manager: portage-2.1.2.5 --- dev-java/webgraph/ChangeLog | 9 +++- dev-java/webgraph/Manifest | 37 ++++++++------- dev-java/webgraph/files/digest-webgraph-1.4 | 3 -- .../webgraph/files/digest-webgraph-1.4.1-r1 | 3 ++ .../webgraph/files/webgraph-1.4-gentoo.patch | 38 ---------------- ...ph-1.4.ebuild => webgraph-1.4.1-r1.ebuild} | 45 +++++++++---------- 6 files changed, 53 insertions(+), 82 deletions(-) delete mode 100644 dev-java/webgraph/files/digest-webgraph-1.4 create mode 100644 dev-java/webgraph/files/digest-webgraph-1.4.1-r1 delete mode 100644 dev-java/webgraph/files/webgraph-1.4-gentoo.patch rename dev-java/webgraph/{webgraph-1.4.ebuild => webgraph-1.4.1-r1.ebuild} (56%) diff --git a/dev-java/webgraph/ChangeLog b/dev-java/webgraph/ChangeLog index 4dec956aba6c..72581def444e 100644 --- a/dev-java/webgraph/ChangeLog +++ b/dev-java/webgraph/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/webgraph # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/ChangeLog,v 1.13 2007/04/12 13:50:08 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/ChangeLog,v 1.14 2007/04/28 19:28:41 nelchael Exp $ + +*webgraph-1.4.1-r1 (28 Apr 2007) + + 28 Apr 2007; Krzysiek Pawlik + -files/webgraph-1.4-gentoo.patch, -webgraph-1.4.ebuild, + +webgraph-1.4.1-r1.ebuild: + Migrated to generation 2. 12 Apr 2007; webgraph-1.4.1.ebuild: Stable on amd64 wrt bug 161738 diff --git a/dev-java/webgraph/Manifest b/dev-java/webgraph/Manifest index c62bd8bc0015..894d727943a8 100644 --- a/dev-java/webgraph/Manifest +++ b/dev-java/webgraph/Manifest @@ -1,32 +1,37 @@ -AUX webgraph-1.4-gentoo.patch 1032 RMD160 24c3d36acc7cf24a6e5bd9d40251be23cb4095d7 SHA1 0e0f02b275dd66e18d17c3c39a89f4eaf3c83f66 SHA256 bf0d0203fbe9313fa52fbfdca9e97cc18da6714ebd78e8625cf470a16cefa07f -MD5 ce2de7b5b8bcadaaedcce0d9912e5ac0 files/webgraph-1.4-gentoo.patch 1032 -RMD160 24c3d36acc7cf24a6e5bd9d40251be23cb4095d7 files/webgraph-1.4-gentoo.patch 1032 -SHA256 bf0d0203fbe9313fa52fbfdca9e97cc18da6714ebd78e8625cf470a16cefa07f files/webgraph-1.4-gentoo.patch 1032 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX webgraph-1.4.1-gentoo.patch 1404 RMD160 7a00a7b67b56f784ff44f36657b3afa0289fa630 SHA1 b69c48b6f02d4b8ca237fa6b4bee975a9289d678 SHA256 5f86a77b024821573c51183eb96b6820013ba8906c566e2d765b9aa7d64038ee MD5 ff38403e894b727d945834e40263d4b9 files/webgraph-1.4.1-gentoo.patch 1404 RMD160 7a00a7b67b56f784ff44f36657b3afa0289fa630 files/webgraph-1.4.1-gentoo.patch 1404 SHA256 5f86a77b024821573c51183eb96b6820013ba8906c566e2d765b9aa7d64038ee files/webgraph-1.4.1-gentoo.patch 1404 -DIST webgraph-1.4-src.tar.gz 53214 RMD160 caa11f21f0a2b3e27d15155aeeb91734f72694c5 SHA1 bca8d065ac052755ade0df1b24f689c508fd1a50 SHA256 353f4403bbb6eb0bdd4985a86bdb1027b11dd7b52118b28966d10d30c059c6a1 DIST webgraph-1.4.1-src.tar.gz 55467 RMD160 8c3ecddbfdf2395805fec285f8c161c9f8c38526 SHA1 c1e25b7a7d63021e39ccdbd7784faea1ef0baa32 SHA256 a91402ae46c60234f8234a9b05078feb7d23bfa12a68447ef410e24ceb4dc133 +EBUILD webgraph-1.4.1-r1.ebuild 1147 RMD160 d01c1b14fbaa48c746d2a5e6c8453a718595f2ed SHA1 84e205f88a9e15388a617006221f66c6bdc64d9b SHA256 4dc21602ac7a572db61a90022b752f6b9d81b3b1f3d33c6d2a6bea0c6f8cab2a +MD5 2eff243992e117d335354a8b5e81aeb5 webgraph-1.4.1-r1.ebuild 1147 +RMD160 d01c1b14fbaa48c746d2a5e6c8453a718595f2ed webgraph-1.4.1-r1.ebuild 1147 +SHA256 4dc21602ac7a572db61a90022b752f6b9d81b3b1f3d33c6d2a6bea0c6f8cab2a webgraph-1.4.1-r1.ebuild 1147 EBUILD webgraph-1.4.1.ebuild 1330 RMD160 f0ff863bbe807aa73a6c1c8c708d49aa20fe0361 SHA1 4879a04f623167d73f384c02e8b458da6436a641 SHA256 080c71c93155839c69c77e5c5c5031b44956fade904fa8f10d9c421b7b3a9a4f MD5 ada39dc6bb0f8b46b33332c261d51b26 webgraph-1.4.1.ebuild 1330 RMD160 f0ff863bbe807aa73a6c1c8c708d49aa20fe0361 webgraph-1.4.1.ebuild 1330 SHA256 080c71c93155839c69c77e5c5c5031b44956fade904fa8f10d9c421b7b3a9a4f webgraph-1.4.1.ebuild 1330 -EBUILD webgraph-1.4.ebuild 1335 RMD160 b72dbe2fcec565054f7128970b14893658236532 SHA1 78c0433112df5c55e4ac99fd5dcec6f1e1ce072d SHA256 c9eb308f491e97154abe35c593aa2e61cbfd9fd6984876573ee0d6d00791eeba -MD5 bb660cda77731b83e8d346d80579ae78 webgraph-1.4.ebuild 1335 -RMD160 b72dbe2fcec565054f7128970b14893658236532 webgraph-1.4.ebuild 1335 -SHA256 c9eb308f491e97154abe35c593aa2e61cbfd9fd6984876573ee0d6d00791eeba webgraph-1.4.ebuild 1335 -MISC ChangeLog 1477 RMD160 8cb95d76e5749cede0e635ad0ae555ca6264be7a SHA1 b3aa5401a31174ca0bd49851ef56136152086694 SHA256 804644e4000eac31f738f0143601abef276e2e7e2929838d04e9a8e5d2c63746 -MD5 74f8daef0d7ed912d1ffa5f4c4ea6bb1 ChangeLog 1477 -RMD160 8cb95d76e5749cede0e635ad0ae555ca6264be7a ChangeLog 1477 -SHA256 804644e4000eac31f738f0143601abef276e2e7e2929838d04e9a8e5d2c63746 ChangeLog 1477 +MISC ChangeLog 1684 RMD160 8e55f9fa8354e1cb10f54a34f9333c6fec994d43 SHA1 b243c11366fd89cd04797c052d5ee229e93f5f50 SHA256 f29875db927bc06ad1caa84c8ceb0bffe55ec059de8d10c723cb63c681808277 +MD5 d47d63a5f040217deb414310402354b4 ChangeLog 1684 +RMD160 8e55f9fa8354e1cb10f54a34f9333c6fec994d43 ChangeLog 1684 +SHA256 f29875db927bc06ad1caa84c8ceb0bffe55ec059de8d10c723cb63c681808277 ChangeLog 1684 MISC metadata.xml 339 RMD160 c5a1cb7e59639ac7c3573ec6a806ff1ee2eb23ef SHA1 c3540f56af4ac4f53981d38561f4c5835537b916 SHA256 354c0a816deeb5142c1db03c87bb6c903ae7b93e2b07baa4abd2c1718a0f8b0e MD5 c900f3303ecdaeb9142aa735c9e35393 metadata.xml 339 RMD160 c5a1cb7e59639ac7c3573ec6a806ff1ee2eb23ef metadata.xml 339 SHA256 354c0a816deeb5142c1db03c87bb6c903ae7b93e2b07baa4abd2c1718a0f8b0e metadata.xml 339 -MD5 4df127a881d9dc7657bfccdd68677fce files/digest-webgraph-1.4 247 -RMD160 1f33344548a1c41c96cdfaf545411ad7e17e06e9 files/digest-webgraph-1.4 247 -SHA256 9aae60ab9fea58b4ade82c069ef87768705297069f84d54aed781023aede22e4 files/digest-webgraph-1.4 247 MD5 d08c9e38f3413ee1b75a403d30d6faf5 files/digest-webgraph-1.4.1 253 RMD160 f3a0a6ad9631dc79dd030d11ef6386f2d41d1b70 files/digest-webgraph-1.4.1 253 SHA256 87af1570187ba3544d75a3136022191a3513f868d78d2d722579b6b5cab3cf4f files/digest-webgraph-1.4.1 253 +MD5 d08c9e38f3413ee1b75a403d30d6faf5 files/digest-webgraph-1.4.1-r1 253 +RMD160 f3a0a6ad9631dc79dd030d11ef6386f2d41d1b70 files/digest-webgraph-1.4.1-r1 253 +SHA256 87af1570187ba3544d75a3136022191a3513f868d78d2d722579b6b5cab3cf4f files/digest-webgraph-1.4.1-r1 253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGM6Cfgo/w9rxVVVERApugAJ9Jc/Mj69MDSQ1DpOJcEq3QbYQ8DQCeIzrO ++BDGlrAsh4buP1arCf+rmg8= +=7zKn +-----END PGP SIGNATURE----- diff --git a/dev-java/webgraph/files/digest-webgraph-1.4 b/dev-java/webgraph/files/digest-webgraph-1.4 deleted file mode 100644 index dede4ce3f2da..000000000000 --- a/dev-java/webgraph/files/digest-webgraph-1.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7bb0b781124d8c6966c927ab669f697c webgraph-1.4-src.tar.gz 53214 -RMD160 caa11f21f0a2b3e27d15155aeeb91734f72694c5 webgraph-1.4-src.tar.gz 53214 -SHA256 353f4403bbb6eb0bdd4985a86bdb1027b11dd7b52118b28966d10d30c059c6a1 webgraph-1.4-src.tar.gz 53214 diff --git a/dev-java/webgraph/files/digest-webgraph-1.4.1-r1 b/dev-java/webgraph/files/digest-webgraph-1.4.1-r1 new file mode 100644 index 000000000000..6c0415b8c5c9 --- /dev/null +++ b/dev-java/webgraph/files/digest-webgraph-1.4.1-r1 @@ -0,0 +1,3 @@ +MD5 b22b0cf78075c21367a1bba03f8d87c8 webgraph-1.4.1-src.tar.gz 55467 +RMD160 8c3ecddbfdf2395805fec285f8c161c9f8c38526 webgraph-1.4.1-src.tar.gz 55467 +SHA256 a91402ae46c60234f8234a9b05078feb7d23bfa12a68447ef410e24ceb4dc133 webgraph-1.4.1-src.tar.gz 55467 diff --git a/dev-java/webgraph/files/webgraph-1.4-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4-gentoo.patch deleted file mode 100644 index a18d127634c1..000000000000 --- a/dev-java/webgraph/files/webgraph-1.4-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -uprN webgraph-1.4.old/build.xml webgraph-1.4/build.xml ---- webgraph-1.4.old/build.xml 2004-11-25 22:09:18.924727128 +0100 -+++ webgraph-1.4/build.xml 2004-11-25 22:31:37.224274672 +0100 -@@ -15,6 +15,14 @@ - - -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -25,7 +33,10 @@ - optimize="on" - destdir="${build}" - source="1.4" -- /> -+ target="1.4"> -+ -+ -+ - - - -@@ -48,6 +59,7 @@ - - - -+ - - - diff --git a/dev-java/webgraph/webgraph-1.4.ebuild b/dev-java/webgraph/webgraph-1.4.1-r1.ebuild similarity index 56% rename from dev-java/webgraph/webgraph-1.4.ebuild rename to dev-java/webgraph/webgraph-1.4.1-r1.ebuild index fbe08da083f5..2845491388ce 100644 --- a/dev-java/webgraph/webgraph-1.4.ebuild +++ b/dev-java/webgraph/webgraph-1.4.1-r1.ebuild @@ -1,56 +1,53 @@ # Copyright 1999-2007 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.6 2007/01/13 13:05:46 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/webgraph/webgraph-1.4.1-r1.ebuild,v 1.1 2007/04/28 19:28:41 nelchael Exp $ -inherit eutils java-pkg +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="WebGraph is a framework to study the web graph." 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="amd64 ~ppc x86" -IUSE="doc jikes source" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" -RDEPEND=">=virtual/jre-1.4 - =dev-java/java-getopt-1.0* - =dev-java/fastutil-4.3* +COMMON_DEP="=dev-java/java-getopt-1.0* + =dev-java/fastutil-4.4* =dev-java/colt-1* >=dev-java/jal-20031117 =dev-java/mg4j-0.9*" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.4 - ${RDEPEND} - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" + ${COMMON_DEP}" src_unpack() { + unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" mkdir lib/ && cd lib/ java-pkg_jar-from java-getopt-1 - java-pkg_jar-from fastutil-4.3 + 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() { + java-pkg_newjar ${P}.jar ${PN}.jar - if use doc; then - dodoc CHANGES - java-pkg_dohtml -r docs/* - fi + dodoc CHANGES + + use doc && java-pkg_dojavadoc docs use source && java-pkg_dosrc java/it -} +} -- 2.26.2