Migrated to generation 2. Does not use any packed jars. Fixes bug #110905.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 8430fd957d266c7c1421da542c18ddb6cebd778d..874ce57681cb47af4e5df8368ca8dd2f85b4b8fc 100644 (file)
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.3 2006/11/30 15:17:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.4 2006/12/27 23:13:24 betelgeuse Exp $
+
+*octopus-3.0.1-r1 (27 Dec 2006)
+
+  27 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +octopus-3.0.1-r1.ebuild:
+  Migrated to generation 2. Does not use any packed jars. Fixes bug #110905.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org> octopus-3.0.1.ebuild:
   Update xerces dep for upcoming 2.6 slotmove.

diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 28f78ad5844edfcf6dd385cee4f08e9b1ab42db0..162d2817499101902bd71649355fb6617bb20278 100644 (file)
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,21 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX octopus-3.0.1-gentoo-build.xml 15173 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 SHA1 d445125369890ea3a7f7b35938a1674f8540785d SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b
 MD5 24925210eca628235c1f8a498f261dc2 files/octopus-3.0.1-gentoo-build.xml 15173
 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 files/octopus-3.0.1-gentoo-build.xml 15173
 SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b files/octopus-3.0.1-gentoo-build.xml 15173
-DIST octopus-3.0-1.src.tar.gz 25968343
-DIST octopus-xmls-3.0.1.tar.bz2 22492
+DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 SHA1 403f96abcab23429ddb6f4d8709326f73521e263 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac
+DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
+EBUILD octopus-3.0.1-r1.ebuild 1786 RMD160 5634bc7c5fd1fcc1f05949228828da2cf518f0f8 SHA1 bec110e561cec387950efcf2a6b0ce435907f6c1 SHA256 16843477a75bd1e6c5b71c57174b4641a5bcaa817c4c39b5086136023bdb5b28
+MD5 cdc4cb3a8849c29cbb72f7b78a17e556 octopus-3.0.1-r1.ebuild 1786
+RMD160 5634bc7c5fd1fcc1f05949228828da2cf518f0f8 octopus-3.0.1-r1.ebuild 1786
+SHA256 16843477a75bd1e6c5b71c57174b4641a5bcaa817c4c39b5086136023bdb5b28 octopus-3.0.1-r1.ebuild 1786
 EBUILD octopus-3.0.1.ebuild 1664 RMD160 f471219816db054b8a198af8f5e2ff0a722d3400 SHA1 c98463aab85b7d8092e803c6083898e897dacd77 SHA256 6a32137aee1e901223ec34f9b4c338cbf8ed00e6da415576d64ee2a8d886beee
 MD5 d1613e645f027728a52d2f16b747d3f0 octopus-3.0.1.ebuild 1664
 RMD160 f471219816db054b8a198af8f5e2ff0a722d3400 octopus-3.0.1.ebuild 1664
 SHA256 6a32137aee1e901223ec34f9b4c338cbf8ed00e6da415576d64ee2a8d886beee octopus-3.0.1.ebuild 1664
-MISC ChangeLog 646 RMD160 ce2b533b037983199af1977572ac8e257ac8837f SHA1 a80547961f595bf64deec8c2f5b13094dd1a8d63 SHA256 9310559144106b8dbc2b322831c109725c7d290a8b618f406c44ceec9aedd4c6
-MD5 d5b8a753db1558a3c8fbb8071f1b736f ChangeLog 646
-RMD160 ce2b533b037983199af1977572ac8e257ac8837f ChangeLog 646
-SHA256 9310559144106b8dbc2b322831c109725c7d290a8b618f406c44ceec9aedd4c6 ChangeLog 646
+MISC ChangeLog 842 RMD160 c602c1ece501a76a49c2a09e85e098a3168a90e7 SHA1 081c648f0e516599eec2ab675f9cb1e3949f61d3 SHA256 9b25508a7a0c87eeae46225e02e9ce754255a11d53b41f56205620c1b0b860d0
+MD5 91fe7557b075a4c9777f4350f5b42e07 ChangeLog 842
+RMD160 c602c1ece501a76a49c2a09e85e098a3168a90e7 ChangeLog 842
+SHA256 9b25508a7a0c87eeae46225e02e9ce754255a11d53b41f56205620c1b0b860d0 ChangeLog 842
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 a634674c47f2213dc1b3903c4f9a1264 files/digest-octopus-3.0.1 141
-RMD160 ca0d0b10ab5f0e90df7a832151373f017fba2920 files/digest-octopus-3.0.1 141
-SHA256 c7f936d766c0ccf1a8bedfb1773aacfc41343059aeacbfcbc40d71fee6922fa6 files/digest-octopus-3.0.1 141
+MD5 0e40c109914222d2fcda00f41eab2a7d files/digest-octopus-3.0.1 515
+RMD160 6d193267ee00c5c8993163a4a24d68f1e611469e files/digest-octopus-3.0.1 515
+SHA256 d5e311cd19d535c3b487e503b25e905c14813ad409270cdedcc61f1767356f02 files/digest-octopus-3.0.1 515
+MD5 0e40c109914222d2fcda00f41eab2a7d files/digest-octopus-3.0.1-r1 515
+RMD160 6d193267ee00c5c8993163a4a24d68f1e611469e files/digest-octopus-3.0.1-r1 515
+SHA256 d5e311cd19d535c3b487e503b25e905c14813ad409270cdedcc61f1767356f02 files/digest-octopus-3.0.1-r1 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFkv4ecxLzpIGCsLQRAvM7AJ4rWO/07egnsHmv9NCXZJ0bbdzHAgCfb7ST
+TuFhUIa6fB3yUL9AVpRqu6o=
+=oW5m
+-----END PGP SIGNATURE-----

diff --git a/dev-db/octopus/files/digest-octopus-3.0.1 b/dev-db/octopus/files/digest-octopus-3.0.1
index 082387fe869aa05f92c2adb4e65365f25bc96063..cd48e73b876a111efab49c98a8055b8d2f0f5879 100644 (file)
--- a/dev-db/octopus/files/digest-octopus-3.0.1
+++ b/dev-db/octopus/files/digest-octopus-3.0.1
@@ -1,2 +1,6 @@
 MD5 f10c24812c25006dedf71ee8e9c1a754 octopus-3.0-1.src.tar.gz 25968343
+RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 octopus-3.0-1.src.tar.gz 25968343
+SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac octopus-3.0-1.src.tar.gz 25968343
 MD5 68e08cccd4251b577b2becef5d64b26c octopus-xmls-3.0.1.tar.bz2 22492
+RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 octopus-xmls-3.0.1.tar.bz2 22492
+SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095 octopus-xmls-3.0.1.tar.bz2 22492

diff --git a/dev-db/octopus/files/digest-octopus-3.0.1-r1 b/dev-db/octopus/files/digest-octopus-3.0.1-r1
new file mode 100644 (file)
index 0000000..cd48e73
--- /dev/null
+++ b/dev-db/octopus/files/digest-octopus-3.0.1-r1
@@ -0,0 +1,6 @@
+MD5 f10c24812c25006dedf71ee8e9c1a754 octopus-3.0-1.src.tar.gz 25968343
+RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 octopus-3.0-1.src.tar.gz 25968343
+SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac octopus-3.0-1.src.tar.gz 25968343
+MD5 68e08cccd4251b577b2becef5d64b26c octopus-xmls-3.0.1.tar.bz2 22492
+RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 octopus-xmls-3.0.1.tar.bz2 22492
+SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095 octopus-xmls-3.0.1.tar.bz2 22492

diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..d6959e1
--- /dev/null
+++ b/dev-db/octopus/octopus-3.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.1 2006/12/27 23:13:24 betelgeuse Exp $
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV//./-}
+MY_PV=${MY_PV/-/.}
+DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool. It may connect to any JDBC data sources and perform transformations defined in an XML file."
+SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
+       mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
+HOMEPAGE="http://octopus.objectweb.org"
+LICENSE="LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+# Does not like org.w3c.dom.Node
+# from 1.6
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jdk-1.5* )
+       >=dev-java/xerces-2.7
+       >=dev-java/log4j-1.2.8
+       =dev-java/rhino-1.6*
+       dev-java/junit
+       >=dev-java/ant-core-1.4"
+
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+       ${RDEPEND}
+       source? ( app-arch/zip )"
+
+TOPDIR="${PN}-$(get_version_component_range 1-2)"
+S=${WORKDIR}/${TOPDIR}/Octopus-src
+
+src_unpack() {
+       unpack ${A}
+       rm -fr ${TOPDIR}/maven
+
+       mv xmls "${S}"/modules/Octopus
+
+       cd "${S}"/modules
+       cp ${FILESDIR}/${P}-gentoo-build.xml build.xml
+       java-ant_rewrite-classpath build.xml
+}
+
+src_compile() {
+       cd ${S}/modules
+
+       use source && antflags="${antflags} sourcezip-all"
+
+       deps="xerces-2,rhino-1.6,ant-core,junit,log4j"
+       eant jar-all $(use_doc docs-all) ${antflags} \
+               -Dgentoo.classpath="$(java-pkg_getjars ${deps})"
+}
+
+src_install() {
+       dodoc ChangeLog.txt ReleaseNotes.txt
+
+       cd ${S}/modules
+       java-pkg_dojar dist/*.jar
+
+       if use source; then
+               dodir /usr/share/doc/${PF}/source
+               cp dist/*-src.zip ${D}usr/share/doc/${PF}/source
+       fi
+       if use doc; then
+               java-pkg_dohtml -r docs/*
+       fi
+}