Remove old.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

3 files changed, 5 insertions, 94 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index b49d32b566ee..d5196c5ea964 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.16 2009/11/10 14:33:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.17 2009/11/10 19:57:09 caster Exp $
+
+  10 Nov 2009; Vlastimil Babka <caster@gentoo.org> -octopus-3.0.1-r1.ebuild:
+  Remove old.
 
   10 Nov 2009; Markus Meier <maekke@gentoo.org> octopus-3.0.1-r2.ebuild:
   x86 stable, bug #291465
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 7865ae2de73b..daa93cb31c06 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX octopus-3.0.1-gentoo-build.xml 15173 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 SHA1 d445125369890ea3a7f7b35938a1674f8540785d SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b
 AUX octopus-jdk-1.5.patch 5528 RMD160 daf63fa18083a347a48527f888630361f1f88a2e SHA1 304e85c4cc6f16ac404716faed21bf66664d1d72 SHA256 86d3989a5c8641966af58c5e1dda3278816d98383409227b547cbac81fda5fbb
 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 1852 RMD160 4d2385fad2a48a6853e55b2ab6d2c2b35bd7a5c9 SHA1 28014889582bd59ba9d00669a3ec24f2a8431d25 SHA256 7c3d582184e8575bea53216462eb34a5e62ed1df441d8ac7b8cd3761576ebf8c
 EBUILD octopus-3.0.1-r2.ebuild 1968 RMD160 04abb4faaa25fb27cd53d61809a81432d1b90f1c SHA1 d883e4ca605c05964441f33766723470dce1ae89 SHA256 c97215046078a70fde6c6d4dda0b6aa256e2eb5f849affa268157b33a2675cbc
 EBUILD octopus-3.0.1-r3.ebuild 2013 RMD160 93ef774e9982e42be17dcfb4da04e746c85f6dcf SHA1 b5ed604f07a119aa99e7fe0f2e6e1fbdcc9d9738 SHA256 9bae5b64b595a3cf79a78ccd4ff35e1f6704c89d769a8f2fbeb66b18f3a2a617
-MISC ChangeLog 2537 RMD160 a3641bc0218e12650b2f5375e553250dc3e2a60a SHA1 0b2faa312a57e1925e1cd49859a5e3be7f892865 SHA256 8e9dca943dab573cb26fbf72273afb13a3209c1fe0da063a376fa305ef854547
+MISC ChangeLog 2629 RMD160 3ad8a38cb8767337bcf553605101ce1212149acc SHA1 828fdba00c412112708c9152e513cd6ea8e8aa90 SHA256 3e78478835f0aa837562579334f9bf4a995ea97945f374e095e6b7044abc8c46
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr5ed4ACgkQkKaRLQcq0GIwswCfQKeJKFANHP0ClF5Z/mxmAn8m
-8jcAn0OqmX0fQwT8dZwjTYnoRurzbVby
-=cWor
------END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild
deleted file mode 100644
index cd6d26684801..000000000000
--- a/dev-db/octopus/octopus-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 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.9 2008/01/10 21:59:09 caster Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-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."
-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=""
-COMMON_DEP="
-	>=dev-java/xerces-2.7
-	>=dev-java/log4j-1.2.8
-	=dev-java/rhino-1.6*
-	=dev-java/junit-3.8*
-	>=dev-java/ant-core-1.4"
-
-# Does not like org.w3c.dom.Node
-# from 1.5+
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND="=virtual/jdk-1.4*
-	${COMMON_DEP}"
-
-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
-	java-pkg_filter-compiler jikes
-}
-
-EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
-
-src_compile() {
-	cd "${S}/modules"
-
-	use source && antflags="${antflags} sourcezip-all"
-
-	eant jar-all $(use_doc docs-all) ${antflags}
-}
-
-RESTRICT="test"
-
-# Would need maven to work properly as the build.xml just launches maven
-#src_test() {
-#	eant test
-#}
-
-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
-		docinto html/api
-		# Has multiple javadoc subdirs here
-		java-pkg_dohtml -r docs/*
-	fi
-}