Cleanup.

Package-Manager: portage-2.1.2-r12

6 files changed, 14 insertions, 210 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index ce4c4126d1a5..03dbba1ad8f0 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/aspectj
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.19 2007/01/27 21:49:44 betelgeuse Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.20 2007/02/28 09:08:13 betelgeuse Exp $
+
+  28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> -aspectj-1.1.1.ebuild,
+  -aspectj-1.2-r1.ebuild:
+  Cleanup.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org> aspectj-1.2-r1.ebuild,
   aspectj-1.2-r2.ebuild:
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 4bf3317e8921..54fc76e6efce 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -29,16 +29,7 @@ AUX aspectj-1.2-version-gentoo.patch 964 RMD160 e2f4c342135064634ce45658f798101c
 MD5 d8e6e955badeb042ec37383717e5ca0c files/aspectj-1.2-version-gentoo.patch 964
 RMD160 e2f4c342135064634ce45658f798101c74fb6194 files/aspectj-1.2-version-gentoo.patch 964
 SHA256 33f7da3f307bc08664b5c34babaebf05e468c8d7a1f23083831b590e51c38570 files/aspectj-1.2-version-gentoo.patch 964
-DIST aspectj-CVS-V1_1_1.tar.bz2 24504831 RMD160 e9af761fa2c693a725511b1a0aaa2635ca8bb248 SHA1 812c3f091612de124a31951391f94f2a743eb106 SHA256 3f50bc9adb88b3934989baf3b92c866a5828e87b8bd7a8e76723d71981eeed03
 DIST aspectj-CVS-V1_2_0.tar.bz2 25289180 RMD160 7bcb9935a2e9992ca8eadb48bebbfa6c83479260 SHA1 0b04be73d43f4a2f35df71c615a75ef901af78ba SHA256 51dae7feb7a3ce2e9c28c37d9440aa0cc7cb8c7d5731e593e466751f935cbef9
-EBUILD aspectj-1.1.1.ebuild 2358 RMD160 2311f0ca250e69acfd2695e1b9cb50b12e9d2c8c SHA1 acb98415eedb2d70e0f1e744ab798718d579041e SHA256 e283c6c1b52d2e1ae6dc81dffe1977bb1c41b2ae3bcc881e965e8203f05dba3a
-MD5 7e80d3b8d68ab9162097a68b797aacd3 aspectj-1.1.1.ebuild 2358
-RMD160 2311f0ca250e69acfd2695e1b9cb50b12e9d2c8c aspectj-1.1.1.ebuild 2358
-SHA256 e283c6c1b52d2e1ae6dc81dffe1977bb1c41b2ae3bcc881e965e8203f05dba3a aspectj-1.1.1.ebuild 2358
-EBUILD aspectj-1.2-r1.ebuild 3058 RMD160 656f498892532be95f8da6315b885241bc4ac76f SHA1 641407a8a08efe3dfd3c8218d85619dc2f0b0f5a SHA256 1b5e1f3bf250a12e35651a72a39574feb3f1d32c715cbe38ecce7e4443cb4546
-MD5 f64c17a29628346a22447a600482e417 aspectj-1.2-r1.ebuild 3058
-RMD160 656f498892532be95f8da6315b885241bc4ac76f aspectj-1.2-r1.ebuild 3058
-SHA256 1b5e1f3bf250a12e35651a72a39574feb3f1d32c715cbe38ecce7e4443cb4546 aspectj-1.2-r1.ebuild 3058
 EBUILD aspectj-1.2-r2.ebuild 3033 RMD160 358d92af2d38b25e1d0eba11020335016c876b51 SHA1 1b37091717e38db9f07bdcff501b19da78dac227 SHA256 8bcfd2ed109c3ded5d76eb6ed7ba9e0ff6a1ba1b9cd64264a8f82e36da8e6619
 MD5 c45fa974b4a72d9a52e2b77f5cb273d1 aspectj-1.2-r2.ebuild 3033
 RMD160 358d92af2d38b25e1d0eba11020335016c876b51 aspectj-1.2-r2.ebuild 3033
@@ -47,30 +38,24 @@ EBUILD aspectj-1.2.ebuild 2383 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 S
 MD5 5f80accb3c4baa44ed55ccfa8c0f08f3 aspectj-1.2.ebuild 2383
 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 aspectj-1.2.ebuild 2383
 SHA256 796a565d5b5cd3f10bbef89f4498474010183f7173da90d8d2691cffd139001e aspectj-1.2.ebuild 2383
-MISC ChangeLog 2354 RMD160 6a4c06e45b84926a74f506f60ee8e98269b38446 SHA1 fce5363386f8273daee246052c8991c898570480 SHA256 c4f757106f1e85c91a17305d4a091df6bcd743d321e5579997b490845b4562d2
-MD5 5621e513ea84904fd3cb41d67c295eff ChangeLog 2354
-RMD160 6a4c06e45b84926a74f506f60ee8e98269b38446 ChangeLog 2354
-SHA256 c4f757106f1e85c91a17305d4a091df6bcd743d321e5579997b490845b4562d2 ChangeLog 2354
+MISC ChangeLog 2468 RMD160 e782b952e2aa8572d3fd86d77645d6dcf3e3814f SHA1 72139e4f98effd91c5da2dc3238aeb68582a7473 SHA256 e35c7f44277876c5746c4edde5387447f54e8540f53e136ae7bb09ff5dd50d56
+MD5 4f432eb4094a2f31261906f3371a60d6 ChangeLog 2468
+RMD160 e782b952e2aa8572d3fd86d77645d6dcf3e3814f ChangeLog 2468
+SHA256 e35c7f44277876c5746c4edde5387447f54e8540f53e136ae7bb09ff5dd50d56 ChangeLog 2468
 MISC metadata.xml 663 RMD160 770e21ab0069ea0f04dc4aa3b6a0746362d12c03 SHA1 f473d1fee9dec03ef5360ff45ad0ddb1de1db4c8 SHA256 3365a2c3312e74be120776989cd689f04ab7e2bc7dbc8bf759fb42e7f1d197b8
 MD5 72ba0dd87abe126d73774a74b1b4cbb1 metadata.xml 663
 RMD160 770e21ab0069ea0f04dc4aa3b6a0746362d12c03 metadata.xml 663
 SHA256 3365a2c3312e74be120776989cd689f04ab7e2bc7dbc8bf759fb42e7f1d197b8 metadata.xml 663
-MD5 95a5ddf8e779d75772fbfd2d0d257d76 files/digest-aspectj-1.1.1 265
-RMD160 e893cb9d5949c6c554fd34bd132a07a3f93aebf2 files/digest-aspectj-1.1.1 265
-SHA256 39525744260aa51b8cd2d82c46308cfd029c81dcc577e52b58a3d30e2ebf2eeb files/digest-aspectj-1.1.1 265
 MD5 7ba8bf395bec103ba01c137764036f9b files/digest-aspectj-1.2 265
 RMD160 dd8d1c2faaaefb0c2cc2eef633ba390b16c3a5b7 files/digest-aspectj-1.2 265
 SHA256 9b8162d8104f4321acead881ce409a15401534ee6d6f449e23341f6ab91b8d1e files/digest-aspectj-1.2 265
-MD5 7ba8bf395bec103ba01c137764036f9b files/digest-aspectj-1.2-r1 265
-RMD160 dd8d1c2faaaefb0c2cc2eef633ba390b16c3a5b7 files/digest-aspectj-1.2-r1 265
-SHA256 9b8162d8104f4321acead881ce409a15401534ee6d6f449e23341f6ab91b8d1e files/digest-aspectj-1.2-r1 265
 MD5 7ba8bf395bec103ba01c137764036f9b files/digest-aspectj-1.2-r2 265
 RMD160 dd8d1c2faaaefb0c2cc2eef633ba390b16c3a5b7 files/digest-aspectj-1.2-r2 265
 SHA256 9b8162d8104f4321acead881ce409a15401534ee6d6f449e23341f6ab91b8d1e files/digest-aspectj-1.2-r2 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFu8kDcxLzpIGCsLQRAnCzAJ9D1gR/FX6MCKjWIddB/hrtG7qJSgCfbXfm
-0GQb1gcD22ATWKTwN4nUS3k=
-=UBy6
+iD8DBQFF5UKEcxLzpIGCsLQRAkwlAKCKSSPw8Rd/BgLgDlrWguHVrimhNgCfaEcY
+18by24riph1egbB6IpVNR9M=
+=1suA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/aspectj/aspectj-1.1.1.ebuild b/dev-java/aspectj/aspectj-1.1.1.ebuild
deleted file mode 100644
index bb55b38282e6..000000000000
--- a/dev-java/aspectj/aspectj-1.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.1.1.ebuild,v 1.14 2005/10/18 11:06:23 axxo Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="AspectJ is a seemless extension to the Java programming language for Aspect Oriented Programming (AOP)"
-SRC_URI="mirror://gentoo/aspectj-CVS-V1_1_1.tar.bz2"
-HOMEPAGE="http://www.eclipse.org/aspectj/"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.3"
-SLOT="0"
-LICENSE="CPL-1.0 Apache-1.1"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-
-# Welcome to the AspectJ ebuild.  An upstream source archive is not
-# available directly.  The AspectJ source .tar.bz2 snapshot is taken
-# from CVS with the following command:
-#
-#	 cvs -z3 -d:pserver:anonymous@dev.eclipse.org:/home/technology \
-#		 co -rV1_1_1 org.aspectj/modules
-#
-# The source is then patched so that the installed binaries have
-# version information which reflects the tagged source release.	 The
-# AspectJ build system does not do this automatically.
-#
-# Useful documentation for this port:
-#
-#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&content-type=text/html&cvsroot=Technology_Project
-#
-#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release-checklist.txt?rev=HEAD&content-type=text/plain&cvsroot=Technology_Project
-#
-
-S=${WORKDIR}/org.aspectj/modules
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-version-gentoo.patch
-	cd ${S}
-	epatch ${FILESDIR}/${P}.build.xml.patch
-	epatch ${FILESDIR}/${PN}-1.2-fix-examples-build.xml.patch
-	sed -i "s,DEVELOPMENT,${PV},g" build/build-properties.xml
-	sed -i -e "s,@PV@,${PV},g" -e "s,@PV_LONG@,${PV} (Gentoo Build),g" \
-		org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
-}
-
-src_compile() {
-	cd build
-	ant -f build.xml || die "build failed"
-}
-
-src_install() {
-	mkdir aspectj-unpack
-	java -jar aj-build/dist/aspectj-${PV}.jar -to aspectj-unpack
-	cd aspectj-unpack
-	java-pkg_dojar lib/*.jar
-	dobin ${FILESDIR}/{ajc,ajbrowser}
-
-	dohtml doc/*.html
-	dohtml README-AspectJ.html
-	if use doc; then
-		cp -R doc/{devguide,api,progguide} ${D}/usr/share/doc/${PF}/html
-		cp -R doc/examples ${D}/usr/share/doc/${PF}
-		cp doc/*.pdf ${D}/usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-java/aspectj/aspectj-1.2-r1.ebuild b/dev-java/aspectj/aspectj-1.2-r1.ebuild
deleted file mode 100644
index cb1f7e35e85b..000000000000
--- a/dev-java/aspectj/aspectj-1.2-r1.ebuild
+++ /dev/null
@@ -1,111 +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/aspectj/aspectj-1.2-r1.ebuild,v 1.4 2006/11/30 15:24:13 caster Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="AspectJ is a seemless extension to the Java programming language for Aspect Oriented Programming (AOP)"
-SRC_URI="mirror://gentoo/aspectj-CVS-V1_2_0.tar.bz2"
-HOMEPAGE="http://www.eclipse.org/aspectj/"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	sys-apps/findutils"
-RDEPEND=">=virtual/jre-1.3
-	dev-java/xalan
-	dev-java/bcel
-	dev-java/junit
-	dev-java/jython
-	=dev-java/jakarta-regexp-1.3*
-	=dev-java/saxon-6.5*
-	dev-java/xml-commons
-	>=dev-java/xerces-2.7"
-
-SLOT="0"
-LICENSE="CPL-1.0 Apache-1.1"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-
-# Welcome to the AspectJ ebuild.  An upstream source archive is not
-# available directly.  The AspectJ source .tar.bz2 snapshot is taken
-# from CVS with the following command:
-#
-#	 cvs -z3 -d:pserver:anonymous@dev.eclipse.org:/home/technology \
-#		 co -rV1_2_0 org.aspectj/modules
-#
-# The source is then patched so that the installed binaries have
-# version information which reflects the tagged source release.	 The
-# AspectJ build system does not do this automatically.
-#
-# Useful documentation for this port:
-#
-#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&content-type=text/html&cvsroot=Technology_Project
-#
-#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release-checklist.txt?rev=HEAD&content-type=text/plain&cvsroot=Technology_Project
-#
-
-S=${WORKDIR}/org.aspectj/modules
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/aspectj-${PV}-version-gentoo.patch
-	epatch ${FILESDIR}/aspectj-${PV}-fix-javadoc.patch
-	epatch ${FILESDIR}/aspectj-${PV}-fix-examples-build.xml.patch
-	sed -i "s,DEVELOPMENT,${PV},g" build/build-properties.xml
-	sed -i -e "s,@PV@,${PV},g" -e "s,@PV_LONG@,${PV} (Gentoo Build),g" \
-		org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
-
-	cd lib/ant/lib
-		rm *.jar
-		java-pkg_jar-from xalan
-		java-pkg_jar-from ant-core
-		java-pkg_jar-from xml-commons xml-apis.jar
-		java-pkg_jar-from xerces-2
-
-	cd ../../commons
-		rm *.jar
-
-	cd ../../bcel
-		rm *.jar
-		java-pkg_jar-from bcel
-
-	cd ../../jdiff
-		rm *.jar
-
-	cd ../junit
-		rm *.jar
-		java-pkg_jar-from junit
-
-	cd ../jython
-		rm *.jar
-		java-pkg_jar-from jython
-
-	cd ../regexp
-		rm *.jar
-		java-pkg_jar-from jakarta-regexp-1.3
-
-	cd ../saxon
-		rm *.jar
-		java-pkg_jar-from saxon-6.5
-}
-
-src_compile() {
-	cd build
-	ant -f build.xml || die "build failed"
-}
-
-src_install() {
-	mkdir aspectj-unpack
-	java -jar aj-build/dist/aspectj-${PV}.jar -to aspectj-unpack
-	cd aspectj-unpack
-	java-pkg_dojar lib/*.jar
-	dobin ${FILESDIR}/{ajc,ajbrowser}
-
-	dohtml doc/*.html
-	dohtml README-AspectJ.html
-	if use doc; then
-		cp -R doc/{devguide,api,progguide} ${D}/usr/share/doc/${PF}/html
-		cp -R doc/examples ${D}/usr/share/doc/${PF}
-		cp doc/*.pdf ${D}/usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-java/aspectj/files/digest-aspectj-1.1.1 b/dev-java/aspectj/files/digest-aspectj-1.1.1
deleted file mode 100644
index b76d2ea4d05e..000000000000
--- a/dev-java/aspectj/files/digest-aspectj-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfe210b3c071e0827b4366c712734096 aspectj-CVS-V1_1_1.tar.bz2 24504831
-RMD160 e9af761fa2c693a725511b1a0aaa2635ca8bb248 aspectj-CVS-V1_1_1.tar.bz2 24504831
-SHA256 3f50bc9adb88b3934989baf3b92c866a5828e87b8bd7a8e76723d71981eeed03 aspectj-CVS-V1_1_1.tar.bz2 24504831
diff --git a/dev-java/aspectj/files/digest-aspectj-1.2-r1 b/dev-java/aspectj/files/digest-aspectj-1.2-r1
deleted file mode 100644
index 3126a0944131..000000000000
--- a/dev-java/aspectj/files/digest-aspectj-1.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f90f1bde5f9076a9df555b5474254602 aspectj-CVS-V1_2_0.tar.bz2 25289180
-RMD160 7bcb9935a2e9992ca8eadb48bebbfa6c83479260 aspectj-CVS-V1_2_0.tar.bz2 25289180
-SHA256 51dae7feb7a3ce2e9c28c37d9440aa0cc7cb8c7d5731e593e466751f935cbef9 aspectj-CVS-V1_2_0.tar.bz2 25289180