Fix one broken ChangeLog entry and remove redundant src_compile.

Package-Manager: portage-2.1.2-r9

3 files changed, 29 insertions, 16 deletions

diff --git a/dev-java/avalon-framework/ChangeLog b/dev-java/avalon-framework/ChangeLog
index 7e0732d05ae1..9832e7cd85e8 100644
--- a/dev-java/avalon-framework/ChangeLog
+++ b/dev-java/avalon-framework/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-framework
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.13 2007/02/13 08:47:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.14 2007/02/13 19:46:46 betelgeuse Exp $
+
+  13 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  avalon-framework-4.1.5-r1.ebuild:
+  Fix one broken ChangeLog entry and remove redundant src_compile.
 
   13 Feb 2007; Markus Rothe <corsair@gentoo.org>
   avalon-framework-4.1.5-r1.ebuild:
@@ -19,6 +23,9 @@
   avalon-framework-4.1.5-r1.ebuild, avalon-framework-4.2.0-r1.ebuild:
   ant_src_unpack -> src_unpack
 
+*avalon-framework-4.2.0-r1 (02 Jul 2006)
+*avalon-framework-4.1.5-r1 (02 Jul 2006)
+
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +avalon-framework-4.1.5-r1.ebuild, +avalon-framework-4.2.0-r1.ebuild:
   Revision bumps to support new Java system.
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 5b2e03364cee..a03d36a032d9 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,13 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 1838 RMD160 a8ab0340a5999e8988c295f2317e66198e0d9284 SHA1 d4d3a60b53e78faf36b0c0c13ea32262eca85e79 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25afb6d5a020d
 MD5 3c945053b5c79d286570b89c81418996 files/build.xml 1838
 RMD160 a8ab0340a5999e8988c295f2317e66198e0d9284 files/build.xml 1838
 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25afb6d5a020d files/build.xml 1838
 DIST avalon-framework-4.1.5.src.tar.gz 99475 RMD160 2399c240446694d99fbf39c43279c00decd55342 SHA1 932ea06702beee4124eaa7103b77ac949dc81f83 SHA256 29ec054ff5da5dede98e90156fb2f3037c617a04f9fa2753ab034718031e058d
 DIST avalon-framework-4.2.0-src.tar.gz 68887 RMD160 03b49287a05c95fabe70aaeacfc2103e4cfc8436 SHA1 0a9dc2b80c4cc6365134a8f3b06f1d1c84ddd8c4 SHA256 16374c0a1f67e21c5d44030ba2a01df614775a9c3ec3a387632c3c6e592d8e7d
-EBUILD avalon-framework-4.1.5-r1.ebuild 1145 RMD160 115c200a94c8c3f04431ca62cf671bca8cabc628 SHA1 2f07f8341db9860456f01a9ba042ea39f72a3eee SHA256 f82aa4238e73e6d9db0232e4842f5ff00ad442883b2e9aa9c6cee4e611e2e0d8
-MD5 315b8ec627da05b0dc11dc2407e9a810 avalon-framework-4.1.5-r1.ebuild 1145
-RMD160 115c200a94c8c3f04431ca62cf671bca8cabc628 avalon-framework-4.1.5-r1.ebuild 1145
-SHA256 f82aa4238e73e6d9db0232e4842f5ff00ad442883b2e9aa9c6cee4e611e2e0d8 avalon-framework-4.1.5-r1.ebuild 1145
+EBUILD avalon-framework-4.1.5-r1.ebuild 1112 RMD160 ec75ea942f4fd504a9590447f99e01f2d8455d77 SHA1 a1bc8185ccf6e4c9cb7791b9d793ba31378aa430 SHA256 8065de59404cf42400d684c9ca4cc94cab7f65e557abe8bd7472f360cc0a3f03
+MD5 334f999a5bc7b862f0af1150672ded01 avalon-framework-4.1.5-r1.ebuild 1112
+RMD160 ec75ea942f4fd504a9590447f99e01f2d8455d77 avalon-framework-4.1.5-r1.ebuild 1112
+SHA256 8065de59404cf42400d684c9ca4cc94cab7f65e557abe8bd7472f360cc0a3f03 avalon-framework-4.1.5-r1.ebuild 1112
 EBUILD avalon-framework-4.1.5.ebuild 1279 RMD160 9d330209e2fe8fb3f08999dc9b76b8c72b7c1b7d SHA1 b21842ec1fceeaafcf12cae2f5d6d98a25920cbc SHA256 08e3b3ae857da52f93f9b7ea1ba9eb854ffd53f23377745a6fbc327e29541327
 MD5 1a6ebe73b354daadb68ff7af74f35181 avalon-framework-4.1.5.ebuild 1279
 RMD160 9d330209e2fe8fb3f08999dc9b76b8c72b7c1b7d avalon-framework-4.1.5.ebuild 1279
@@ -20,10 +23,10 @@ EBUILD avalon-framework-4.2.0.ebuild 1285 RMD160 7c6eb290f28845176fcb688bd6feb57
 MD5 6bf022e65009522877af11ae4b6c52c3 avalon-framework-4.2.0.ebuild 1285
 RMD160 7c6eb290f28845176fcb688bd6feb5742af19bbc avalon-framework-4.2.0.ebuild 1285
 SHA256 4430c0bac2efec5fa2ac2f6c7604bd090552169d91ada14ca667e3b4cc5269cc avalon-framework-4.2.0.ebuild 1285
-MISC ChangeLog 2300 RMD160 bbc3535790cf7a422587aefdf3243e4a3a2a16e4 SHA1 a40715b5acbedbfe97ad47e57050f978ef528f3b SHA256 e5f8a4bb00dfcf96e2f0613c2bd5da8fca329a2e1a130cc6d571e81c69f4a202
-MD5 978a1cff0c146337dbb57e4bb65ecb50 ChangeLog 2300
-RMD160 bbc3535790cf7a422587aefdf3243e4a3a2a16e4 ChangeLog 2300
-SHA256 e5f8a4bb00dfcf96e2f0613c2bd5da8fca329a2e1a130cc6d571e81c69f4a202 ChangeLog 2300
+MISC ChangeLog 2543 RMD160 075fb388e2931e02a883de4d197ee75f966093e3 SHA1 2a7494b74745bc5028fbc7f2cfebda5ca5063eae SHA256 1f6b2eff74cd02e87ac55ee0c632aa5e07072aec5c84c111d01afc072a61022d
+MD5 ad8c381a2be820d3ae2599cb2153a599 ChangeLog 2543
+RMD160 075fb388e2931e02a883de4d197ee75f966093e3 ChangeLog 2543
+SHA256 1f6b2eff74cd02e87ac55ee0c632aa5e07072aec5c84c111d01afc072a61022d ChangeLog 2543
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -40,3 +43,10 @@ SHA256 3d2d738b596fd368ea6fb1c4cdbf972e24dbd37178bb8223ea1599bef653df3f files/di
 MD5 61835ed35499ac399b002b2d83f7c9b3 files/digest-avalon-framework-4.2.0-r1 277
 RMD160 1a2136f3e60ae14d2a3bd31b243dd8b2bbcfd393 files/digest-avalon-framework-4.2.0-r1 277
 SHA256 3d2d738b596fd368ea6fb1c4cdbf972e24dbd37178bb8223ea1599bef653df3f files/digest-avalon-framework-4.2.0-r1 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0hWucxLzpIGCsLQRAm4PAKCOgGbR/BoddSxORiJe/W7lSEuMwgCfam60
+iq+7RYVYCm8F+qyaPOOD3WI=
+=TCbK
+-----END PGP SIGNATURE-----
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index 8065d9e6acfa..e82eda2072fe 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.5 2007/02/13 08:47:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild,v 1.6 2007/02/13 19:46:46 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -27,17 +27,13 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	cp ${FILESDIR}/build.xml ./build.xml || die "ANT update failure!"
+	cp "${FILESDIR}"/build.xml ./build.xml || die "ANT update failure!"
 	local libs="log4j,avalon-logkit-2.0"
 	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
 }
 
-src_compile() {
-	eant jar $(use_doc)
-}
-
 src_install() {
 	java-pkg_dojar ${S}/dist/avalon-framework.jar