Remove old.

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

3 files changed, 6 insertions, 105 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index c1670b31a02d..dd7e0bdaa226 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.99 2009/07/04 14:26:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.100 2009/10/08 10:18:44 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  08 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  -ant-core-1.7.1-r2.ebuild:
+  Remove old.
+
   04 Jul 2009; Brent Baude <ranger@gentoo.org> ant-core-1.7.1-r4.ebuild:
   Marking ant-core-1.7.1-r4 ppc64 for bug 270005
 
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index a994b7fd5f96..7c3516b4ec5c 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -3,7 +3,6 @@ AUX 1.7.1-jdk4-javadoc.patch 2026 RMD160 4354a94c8af1e139b343711db51c3d9cf49c00d
 AUX 1.7.1-pkg-info.patch 9325 RMD160 1ea5ce708bbb5dd3815f1eadc7cba3b3d0dc5db4 SHA1 ac8d14e9090a02060f44999673888c1431b203b2 SHA256 43041836e2ed4e883e6878649f4e43f6cc8399f9bae79b8de49c48b773ec7b06
 DIST ant-1.7.1-gentoo.tar.bz2 11836 RMD160 9194996b5b04113d2a6542221890e1ef3f7953d0 SHA1 ef848268ec2b7ecd9aca2f8a3d6705ec8386a621 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5
 DIST apache-ant-1.7.1-src.tar.bz2 6979386 RMD160 09ff510a9801c734689db23e66ccf353b7361824 SHA1 8a468d3ce1e84739a78f779770416a8bd502eaf5 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
-EBUILD ant-core-1.7.1-r2.ebuild 2813 RMD160 fa11aba3a9ffb6f2d17a1cfb92b20dfd9cfe1dfa SHA1 c75e7b36876fd9dabfa4fc82e8ad146a1a4863d4 SHA256 1c1f38afc9bd6ec655c8ecac1ab5fc44145ef748aafccd5ce64585436b6026c6
 EBUILD ant-core-1.7.1-r4.ebuild 2913 RMD160 943b6fa28c7150d5de626bd586d3bbd32fbdc3c4 SHA1 786659fec0fc58cccfb38e6864efe2fd06ec48db SHA256 3f34a5e546ad31d3c46e349c9a34f30029247bcba01454ec75ab526d53086088
-MISC ChangeLog 28388 RMD160 f84df71446194483509700c9c35f5e699de14669 SHA1 688b5348c5e7af98bdd30d36d33f3bdb769134f4 SHA256 e39c1b650c574309ae3771526f22ac0f37857cb78a90e5dde20cff32ceb81ddc
+MISC ChangeLog 28484 RMD160 e24581c7fc4c78af1b35992e4a2e3daa9570171e SHA1 460d728ab5b4e026f8f9d53bb777e4c045860d5b SHA256 e05335bf1c23caf37c829a416cc157b0416d00820cb2661ee25847889515b3b0
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/ant-core/ant-core-1.7.1-r2.ebuild b/dev-java/ant-core/ant-core-1.7.1-r2.ebuild
deleted file mode 100644
index 2e629a9937af..000000000000
--- a/dev-java/ant-core/ant-core-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r2.ebuild,v 1.7 2009/05/10 15:14:37 armin76 Exp $
-
-# don't depend on itself
-JAVA_ANT_DISABLE_ANT_CORE_DEP=true
-# rewriting build.xml files for the testcases has no reason atm
-JAVA_PKG_BSFIX_ALL=no
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
-	mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove bundled xerces
-	rm -v lib/*.jar || die
-
-	# use our split-ant build.xml
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# bug #196080
-	java-ant_bsfix_one build.xml
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# this ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant
-	# but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars-core internal_dist \
-		$(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	newbin "${FILESDIR}/${PV}-ant-r1" ant || die "failed to install wrapper"
-	dodir /usr/share/${PN}/bin
-	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
-		dobin "${S}/src/script/${each}"
-		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
-	done
-	dosym /usr/share/${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym /usr/share/${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant" || die "failed to install env.d file"
-
-	dodoc README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml welcome.html
-		dohtml -r docs/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	elog "The way of packaging ant in Gentoo has changed significantly since"
-	elog "the 1.7.0 version, For more information, please see:"
-	elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
-	elog
-	elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
-	elog "flags have been moved to dev-java/ant."
-}