Dropped old revisions with newer revisions with equivalent keywords.

Package-Manager: portage-2.1.2_rc1-r5

5 files changed, 8 insertions, 140 deletions

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 47300478cd8b..987ab3793274 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -15,14 +15,14 @@ EBUILD fop-0.20.5-r3.ebuild 1649 RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4
 MD5 ae622af96cf7f3f2ebb52bf682848c49 fop-0.20.5-r3.ebuild 1649
 RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4 fop-0.20.5-r3.ebuild 1649
 SHA256 5fb3adec0ac6f61da9fe868cf3ca41bcb4e606f84b96731f120d18fdab3f20ef fop-0.20.5-r3.ebuild 1649
-EBUILD fop-0.20.5-r7.ebuild 1875 RMD160 4036726e7c2cfdcb419a531c4878375017a22a73 SHA1 705bde0f6ab88597cdd9a608afa1cf3f5c0528ba SHA256 f1fd38db41c0dff25aa6320ab81547d5624bdb27d5f0c22ded7817cfcfa034e5
-MD5 e5155c062646c0fb3190182b359b88d5 fop-0.20.5-r7.ebuild 1875
-RMD160 4036726e7c2cfdcb419a531c4878375017a22a73 fop-0.20.5-r7.ebuild 1875
-SHA256 f1fd38db41c0dff25aa6320ab81547d5624bdb27d5f0c22ded7817cfcfa034e5 fop-0.20.5-r7.ebuild 1875
-MISC ChangeLog 4084 RMD160 009f71e313a4654adac32a370fb871bf2c36491b SHA1 7e7ae9ca3a039e28fed2a65197c50f35c2bea6a0 SHA256 c6e98840099e706be3e59d3e859444d2496c66d657473024410e83c9e5c86ea3
-MD5 40d77f1312b30db0ec5accb48e261e40 ChangeLog 4084
-RMD160 009f71e313a4654adac32a370fb871bf2c36491b ChangeLog 4084
-SHA256 c6e98840099e706be3e59d3e859444d2496c66d657473024410e83c9e5c86ea3 ChangeLog 4084
+EBUILD fop-0.20.5-r7.ebuild 1869 RMD160 b1f42d63ce6c5bf4376317971cfca304d5e16373 SHA1 fca5285bac8bd2348a76498e93c2196ee60ee27d SHA256 c66d178c2546ef273f3831cec7c9c8c52181b485b2ae1fbcbf74cfd7d3e3a00d
+MD5 5e91043b0f64b18390ad79c8eb46423a fop-0.20.5-r7.ebuild 1869
+RMD160 b1f42d63ce6c5bf4376317971cfca304d5e16373 fop-0.20.5-r7.ebuild 1869
+SHA256 c66d178c2546ef273f3831cec7c9c8c52181b485b2ae1fbcbf74cfd7d3e3a00d fop-0.20.5-r7.ebuild 1869
+MISC ChangeLog 3996 RMD160 7725f9b7b758ddef687a98c1d4d667c8701fdd93 SHA1 81cd71134f687e6f7508f7df93e44cecd7baa3f3 SHA256 750895fce4c8fe4c84b56395b6e3c406745dfd915947003a16abe59f34904929
+MD5 09ac8f14a5bde62583b52a33a7a72854 ChangeLog 3996
+RMD160 7725f9b7b758ddef687a98c1d4d667c8701fdd93 ChangeLog 3996
+SHA256 750895fce4c8fe4c84b56395b6e3c406745dfd915947003a16abe59f34904929 ChangeLog 3996
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r1 b/dev-java/fop/files/digest-fop-0.20.5-r1
deleted file mode 100644
index f4b8ca285900..000000000000
--- a/dev-java/fop/files/digest-fop-0.20.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
-RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
-SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r6 b/dev-java/fop/files/digest-fop-0.20.5-r6
deleted file mode 100644
index f4b8ca285900..000000000000
--- a/dev-java/fop/files/digest-fop-0.20.5-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
-RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
-SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/fop-0.20.5-r1.ebuild b/dev-java/fop/fop-0.20.5-r1.ebuild
deleted file mode 100644
index 6244bbee53cf..000000000000
--- a/dev-java/fop/fop-0.20.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r1.ebuild,v 1.6 2006/10/05 15:42:07 gustavoz Exp $
-
-inherit java-pkg
-
-MY_V=${PV/_/}
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
-HOMEPAGE="http://xml.apache.org/fop/"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-IUSE="doc jai jimi"
-RDEPEND=">=virtual/jre-1.4
-	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi )"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.5.4
-	!dev-java/fop-bin"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	use jai && java-pkg_jar-from sun-jai-bin
-	use jimi && java-pkg_jar-from sun-jimi
-}
-
-src_compile() {
-	ant package || die "Failed building classes"
-
-	if use doc; then
-		ant javadocs || die "Failed building javadocs"
-	fi
-}
-
-src_install() {
-	sed '2itest "$FOP_HOME" || FOP_HOME=/usr/share/fop/' fop.sh > fop
-	java-pkg_dojar build/*.jar
-
-	exeinto /usr/bin
-	doexe fop
-
-	if use doc; then
-		dodoc CHANGES STATUS README
-		dohtml ReleaseNotes.html
-		dodir /usr/share/doc/${P}
-		cp -a examples ${D}/usr/share/doc/${P}
-		java-pkg_dohtml -r build/javadocs
-	fi
-}
diff --git a/dev-java/fop/fop-0.20.5-r6.ebuild b/dev-java/fop/fop-0.20.5-r6.ebuild
deleted file mode 100644
index 8bd26f0a91ed..000000000000
--- a/dev-java/fop/fop-0.20.5-r6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r6.ebuild,v 1.2 2006/08/06 03:33:16 nichoj Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_V=${PV/_/}
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
-HOMEPAGE="http://xml.apache.org/fop/"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples jai jimi"
-
-# Doesn't like Java 1.5
-COMMON_DEP="
-	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi )
-	=dev-java/avalon-framework-4.1*
-	~dev-java/batik-1.5
-	dev-java/xalan
-	>=dev-java/xerces-2.6.2
-	!dev-java/fop-bin"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
-	${COMMON_DEP}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
-	${COMMON_DEP}
-	>=dev-java/ant-1.5.4"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-buildxml.patch
-
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from avalon-framework-4.1
-	java-pkg_jar-from batik-1.5 batik-all.jar batik.jar
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	use jai && java-pkg_jar-from sun-jai-bin
-	use jimi && java-pkg_jar-from sun-jimi
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-
-	eant package $(use_doc javadocs)
-}
-
-src_install() {
-	java-pkg_dojar build/fop.jar
-
-	dodir /etc/env.d/java/
-	echo 'FOP_HOME=/usr/share/fop/' > ${D}/etc/env.d/java/22fop
-	java-pkg_dolauncher ${PN} --main org.apache.fop.apps.Fop
-
-	if use doc; then
-		dodoc CHANGES STATUS README
-		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -pPR examples ${D}/usr/share/doc/${PF}/examples
-	fi
-}