Fix dependencies, tweak style.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/commons-attributes/ChangeLog b/dev-java/commons-attributes/ChangeLog
index caeab271925e59912ca68184aa369eb970a3507e..30c645b475b7df0ed8887fbf0b38fbc7d77b03c7 100644 (file)
--- a/dev-java/commons-attributes/ChangeLog
+++ b/dev-java/commons-attributes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-attributes
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-attributes/ChangeLog,v 1.6 2007/04/05 11:11:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-attributes/ChangeLog,v 1.7 2007/04/25 21:31:21 caster Exp $
+
+  25 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  commons-attributes-2.1-r1.ebuild:
+  Fix dependencies, tweak style.
 
   05 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   -commons-attributes-2.1.ebuild:

diff --git a/dev-java/commons-attributes/Manifest b/dev-java/commons-attributes/Manifest
index d66e2464b2c10214d217ec3ecc4510c44de44bb4..732eede975694ab805425f341c2b7e84d35251fb 100644 (file)
--- a/dev-java/commons-attributes/Manifest
+++ b/dev-java/commons-attributes/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX anttasks.properties 856 RMD160 21ff6246420b085e8c14742376a589b687f8ef86 SHA1 a8281f67ede0c10c491a6618769e6ea4d3bc0e81 SHA256 fa3969e5e8978d79a1279abbce5f54e2f31554927bf858b7e40d7f69156f5c4f
 MD5 afa7033a8f1ac9174d37628b7734a1f8 files/anttasks.properties 856
 RMD160 21ff6246420b085e8c14742376a589b687f8ef86 files/anttasks.properties 856
@@ -10,14 +7,14 @@ MD5 95c743163c69489b7e543bd18593ce3c files/commons-attributes-2.1-gentoo.patch 1
 RMD160 97d7a5d901fb570771b4c67b4aff4741c1eb1c0f files/commons-attributes-2.1-gentoo.patch 1651
 SHA256 9d1123d0ef3e215b75b55a14f6782421cd1e30c5087e8d491be4feba3e27984f files/commons-attributes-2.1-gentoo.patch 1651
 DIST commons-attributes-2.1-src.tgz 89259 RMD160 59d652ca2b06dc30e328aa99eed1366b91ec72f0 SHA1 55b712dbf01b16f1158008f7065c069919bbfaf7 SHA256 7e66a012e2bf939f717033e1a42c0d32661bd7e8c84f66be11239a03aab9c001
-EBUILD commons-attributes-2.1-r1.ebuild 1545 RMD160 86ece180449027a49a5369d59d157978e3c911f0 SHA1 755dc1de3c6f49d70a0476345dd10ec9b0857c5a SHA256 093fde0e01a00e90851455b4f613fecbf697bf3d1c218d9705d6ddd1e972b037
-MD5 be80dd0614b150238d02cd9c9d3a0db7 commons-attributes-2.1-r1.ebuild 1545
-RMD160 86ece180449027a49a5369d59d157978e3c911f0 commons-attributes-2.1-r1.ebuild 1545
-SHA256 093fde0e01a00e90851455b4f613fecbf697bf3d1c218d9705d6ddd1e972b037 commons-attributes-2.1-r1.ebuild 1545
-MISC ChangeLog 1313 RMD160 6a9a6395dca6add804a726214ec12ca694844f9e SHA1 03885b5c29d90d8fafaa072a60f90d0908b58585 SHA256 8ba77adb16369695cecf97b6e647c6fc5921189e6d162c37418c39e55e41cf90
-MD5 8408134dbbddf6eac8be72125a8f55ad ChangeLog 1313
-RMD160 6a9a6395dca6add804a726214ec12ca694844f9e ChangeLog 1313
-SHA256 8ba77adb16369695cecf97b6e647c6fc5921189e6d162c37418c39e55e41cf90 ChangeLog 1313
+EBUILD commons-attributes-2.1-r1.ebuild 1509 RMD160 3b38ef5b642a9175fae33203c3a29f78c041a974 SHA1 f53b58618b5a7fdc6a1408ba1ef27c973cdd0347 SHA256 ad13a84d84ae6b4e32d246b6cbb5484f3656ae61e9d9bf949842bda4be62831e
+MD5 c29f4dc35244cae9d85b69664eef69be commons-attributes-2.1-r1.ebuild 1509
+RMD160 3b38ef5b642a9175fae33203c3a29f78c041a974 commons-attributes-2.1-r1.ebuild 1509
+SHA256 ad13a84d84ae6b4e32d246b6cbb5484f3656ae61e9d9bf949842bda4be62831e commons-attributes-2.1-r1.ebuild 1509
+MISC ChangeLog 1430 RMD160 7afc267593972b7afb3fc043c6366738ae386395 SHA1 ee21195571910e53692958acdb8b4a734bccc5d2 SHA256 15b4d2e745ab1614aca10c5e963b4764b88b4b628dd5e9e7909193e26d0bc91d
+MD5 755775cb57f49b2563d0ba6e7a7518cd ChangeLog 1430
+RMD160 7afc267593972b7afb3fc043c6366738ae386395 ChangeLog 1430
+SHA256 15b4d2e745ab1614aca10c5e963b4764b88b4b628dd5e9e7909193e26d0bc91d ChangeLog 1430
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,10 +22,3 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 fa8e5cdc6dcd7f5c4b13e8e889963fd7 files/digest-commons-attributes-2.1-r1 268
 RMD160 8c6dc363d8a4771d78b5358155f58957e44a753c files/digest-commons-attributes-2.1-r1 268
 SHA256 98aa5b426023dc41abcf3c6dc64cf0e787a347462a9d68f4d9245878a19aae76 files/digest-commons-attributes-2.1-r1 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGFNlycxLzpIGCsLQRAsVYAJ9+iW/CaGc8lZXhA43c4Cs5v3x7CgCdFvmQ
-WblG8PM0LEo5l+IUzT9qiu0=
-=A+Z5
------END PGP SIGNATURE-----

diff --git a/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild b/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild
index 54f9046d24a015ec620c58008aa2730ebb1e911d..d734d15b0cb88910feb0a91506b83ee620ef2efa 100644 (file)
--- a/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild
+++ b/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild,v 1.3 2006/09/09 17:39:31 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-attributes/commons-attributes-2.1-r1.ebuild,v 1.4 2007/04/25 21:31:21 caster Exp $
 
+JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Commons Attributes enables Java programmers to use C#/.Net-style attributes in their code."
@@ -11,15 +12,14 @@ SRC_URI="mirror://apache/jakarta/commons/attributes/source/${P}-src.tgz"
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE=""
 
-COMMON_DEP="dev-java/xjavadoc"
-DEPEND=">=virtual/jdk-1.4
-       dev-java/ant-core
-       source? ( app-arch/zip )
+COMMON_DEP="dev-java/xjavadoc
        dev-java/gjdoc
+       dev-java/ant-core"
+DEPEND=">=virtual/jdk-1.4
        ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.2
+RDEPEND=">=virtual/jre-1.4
        ${COMMON_DEP}"
 
 src_unpack() {
@@ -41,10 +41,6 @@ src_unpack() {
        java-pkg_jar-from gjdoc
 }
 
-src_compile() {
-       eant jar -Dnoget=true $(use_doc)
-}
-
 src_install() {
        java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
        java-pkg_newjar target/${PN}-compiler-${PV}.jar ${PN}-compiler.jar
@@ -52,6 +48,6 @@ src_install() {
        dodoc NOTICE.txt RELEASE.txt
        dohtml README.html
 
-       use doc && java-pkg_dohtml -r dist/docs/api
-       use source && java-pkg_dosrc */src/java/*
+       use doc && java-pkg_dojavadoc dist/docs/api
+       use source && java-pkg_dosrc api/src/java/org compiler/src/java/org
 }