Remove old version.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 17 insertions, 81 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index c24dfa5c16be..aea34a55c836 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/freemarker
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.23 2008/11/22 16:32:28 fordfrog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.24 2009/07/03 16:51:28 betelgeuse Exp $
+
+  03 Jul 2009; Petteri Räty <betelgeuse@gentoo.org>
+  -freemarker-2.3.10-r1.ebuild:
+  Remove old version.
 
   22 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org>
   freemarker-2.3.13.ebuild:
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 6cd5aaec15d2..6a71518bbd5e 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freemarker-2.3.10-gentoo.patch 1934 RMD160 63b558825d19eb9492a728a478caf96ed522ae15 SHA1 8af8ad60fbee21c4655070da25aa74fa39f0476c SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266
 AUX freemarker-2.3.13-gentoo.patch 5228 RMD160 5c053ee78b5bf0084ac4d47919ae3870c41cb999 SHA1 73bd0f98997bdb258c40dc4e08aa712a84f510f6 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad
 AUX freemarker-jython-2.2.patch 1132 RMD160 4a0d4357cfa9876f18f4d7b7623bfa6a176b098c SHA1 f6794b5bb2a8a4d050da503de98316aa97222edb SHA256 f46b6f48c25b170561a1bbc3d95d37294362b0f60810ad8264ab4678461958fa
-DIST freemarker-2.3.10.tar.gz 2029438 RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 SHA1 b903d4a8a7530c72f468fe76ee9f66b37a3f6d8c SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e
 DIST freemarker-2.3.13.tar.gz 2136791 RMD160 beaaf510c992d435dd9b842733e4583e9512a4f5 SHA1 f1a93bf620f0542a35c2ed3da7b3caea8276c337 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5
-EBUILD freemarker-2.3.10-r1.ebuild 1879 RMD160 9b0876f7003438005fcaf1ea659a3330a5601a00 SHA1 b09c721051a8043da3906fc69ff38df54e8e7736 SHA256 782d7ef24f1f3c54a78a8f874689f0c2b4e2031dfe14af347d9afedb759d5167
 EBUILD freemarker-2.3.13.ebuild 1809 RMD160 2875120cbd879492e5dd3abe42da79ee6c2a72c9 SHA1 500b1cde50de87244659fdaef79f8345e0db23df SHA256 36d998a1e29f60e5644d32390bc7d621452da01a004f211b57bd3605d7446ea9
-MISC ChangeLog 3654 RMD160 c17440c57097bbad9eb47042cc21592e9ad2e95e SHA1 6afc6aca4697b280474fb25d8328b4e3c7a2feb6 SHA256 3a8e1086c9e29fcf93b33c379908b2c21a8d27190f46fd675ea9ac15f75143a9
+MISC ChangeLog 3764 RMD160 c7987f740b478ac415172f2ce437bb236af5724d SHA1 5301d78f1128ecc90a714245f02896a4afd27787 SHA256 406f4295567ee911fecafc3e9cc2594df245dfab680e9dec6a72b1724e49d1c5
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpONx4ACgkQcxLzpIGCsLTItwCeOYKAjJDH01z9w7HM/Isrk2z8
+q1MAnRQ988p/0IWs8DDxdXUSBlzIp0al
+=fyhU
+-----END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/freemarker-2.3.10-r1.ebuild b/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
deleted file mode 100644
index 4bb4816d8bfa..000000000000
--- a/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.10-r1.ebuild,v 1.3 2008/06/20 21:51:13 nelchael Exp $
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output based on templates."
-HOMEPAGE="http://freemarker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="freemarker"
-SLOT="2.3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/javacc
-	>=dev-java/jython-2.2.1
-	=dev-java/servletapi-2.3*
-	=dev-java/jaxen-1.1*"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	#If you remove this patch, remove the postinst function.
-	epatch "${FILESDIR}/${PN}-jython-2.2.patch"
-
-	cd "${S}/lib/"
-	rm -f *.jar
-
-	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/taglib2.jar"
-	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/lib/taglib-foo.jar"
-
-}
-
-src_compile() {
-
-	# BIG FAT WARNING:
-	# clean target removes lib/ directory!!
-	eant clean
-
-	mkdir lib/
-	cd lib/
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from jaxen-1.1
-	java-pkg_jar-from jython
-
-	cd "${S}"
-	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
-}
-
-src_install() {
-
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README.txt || die
-
-	use doc && java-pkg_dojavadoc build/api
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "This version of freemarker has been patched to allow use with"
-	elog ">=dev-java/jython-2.2.1.  This patch breaks compatibility with"
-	elog "the upstream supported jython-2.1.  Please be aware of this before"
-	elog "using and file bugs at https://bugs.gentoo.org, not upstream."
-}