Few more gen 2 migration cleanups to 1.1. Stable on amd64, bug #173150

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index 06dfdf2bb8365a31f083f5d831f9c915f1ecfb0b..30117f189668134c4941d4e5392ec8d6910ac7f7 100644 (file)
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-modeler
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.24 2007/04/03 07:36:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.25 2007/04/06 23:50:05 wltjr Exp $
+
+  06 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  commons-modeler-1.1-r1.ebuild, commons-modeler-2.0.ebuild:
+  Few more gen 2 migration cleanups to 1.1. Stable on amd64, bug #173150
 
   03 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   commons-modeler-2.0.ebuild:

diff --git a/dev-java/commons-modeler/Manifest b/dev-java/commons-modeler/Manifest
index 16ffd4a637e2aa9f0d3df7a88ef988cbe2765952..768b4013d0fa0571c5db3755de664c0ce95ee459 100644 (file)
--- a/dev-java/commons-modeler/Manifest
+++ b/dev-java/commons-modeler/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1-commons-digester.patch 740 RMD160 6a325f080775d878680422a32128ef050e4fdbe9 SHA1 e34c4c7dd01ff258a60778b523bb90b467171fa7 SHA256 78466ec39edddfaa21963750b39ac0a819f7a89ff73d500d90db5813bbaaa7ee
 MD5 3ea8e5a7a0691966d7bdd64aee739d7b files/1.1-commons-digester.patch 740
 RMD160 6a325f080775d878680422a32128ef050e4fdbe9 files/1.1-commons-digester.patch 740
@@ -11,22 +8,22 @@ RMD160 d3e9aa460b2308ca79624a8242536fb20a32d255 files/gentoo.diff 510
 SHA256 e002206cc3a326a2bd492bb177f8f7a0a954826abdc13e590c75236be61e1ff1 files/gentoo.diff 510
 DIST commons-modeler-2.0-src.tar.gz 115756 RMD160 3b5165ade1b6f54b63100af210e44f86eb5e0499 SHA1 8ae3fcd1b45975a95e52c031a84a39a89341a102 SHA256 3576b4703f6e851ac4b54d2f2347760248ceecb4a2586adc08d70223d3a0288a
 DIST modeler-1.1-src.tar.gz 92211 RMD160 dd1d1548784ff4fbc5549294b7a6bed16e319803 SHA1 1ae5000e42daddf8f9a545c10c80395c122013ef SHA256 41146b9e3614eda22064fbdde457750608b0cbc0ff2d904a39c5938b165fc2e7
-EBUILD commons-modeler-1.1-r1.ebuild 1684 RMD160 9aa0b5a9abfc399dba8d9b518e723ace27d99c62 SHA1 99a2522176acdfcfdaae562faf4e560a28ea19eb SHA256 e06ba2f021e560794d673b2fd7b51085bb7beb81b751603c5d003503a462741f
-MD5 7357f8fff33675b37420a88984cee4c8 commons-modeler-1.1-r1.ebuild 1684
-RMD160 9aa0b5a9abfc399dba8d9b518e723ace27d99c62 commons-modeler-1.1-r1.ebuild 1684
-SHA256 e06ba2f021e560794d673b2fd7b51085bb7beb81b751603c5d003503a462741f commons-modeler-1.1-r1.ebuild 1684
+EBUILD commons-modeler-1.1-r1.ebuild 1600 RMD160 00ed93ba46c6e385458b972312c2f128ab2ddfb9 SHA1 4979d282e7e28ea245ea6d45c4c544a9dffcc0c0 SHA256 0828ec5e2051d4d102db273d75755eb5f81df7373d88543a1493b7d6e92153f8
+MD5 8566a670ca43f5f71b08120002de6c93 commons-modeler-1.1-r1.ebuild 1600
+RMD160 00ed93ba46c6e385458b972312c2f128ab2ddfb9 commons-modeler-1.1-r1.ebuild 1600
+SHA256 0828ec5e2051d4d102db273d75755eb5f81df7373d88543a1493b7d6e92153f8 commons-modeler-1.1-r1.ebuild 1600
 EBUILD commons-modeler-1.1.ebuild 1758 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3cb1649 SHA1 5538c181352044aaefaf125a21887fd2bef08e05 SHA256 0fbc22d6e7fed13c8318ce99172c073925f746946f03fc16686d7f450673603c
 MD5 06ed7856de3e3cbeb14fca948fb55bae commons-modeler-1.1.ebuild 1758
 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3cb1649 commons-modeler-1.1.ebuild 1758
 SHA256 0fbc22d6e7fed13c8318ce99172c073925f746946f03fc16686d7f450673603c commons-modeler-1.1.ebuild 1758
-EBUILD commons-modeler-2.0.ebuild 1967 RMD160 5c4aa4d5feb72aaf1ab77f76fb4eafb23f002dcc SHA1 f58fdf16d605fdd51f74c1e53cb5abff05ae9af4 SHA256 3bde74d35408257c0b3dc819eb0eef21e45b9aff8f6e74ef95d2382e4166cfc3
-MD5 610d1c2e3b663165ee65bcdb4faa38fb commons-modeler-2.0.ebuild 1967
-RMD160 5c4aa4d5feb72aaf1ab77f76fb4eafb23f002dcc commons-modeler-2.0.ebuild 1967
-SHA256 3bde74d35408257c0b3dc819eb0eef21e45b9aff8f6e74ef95d2382e4166cfc3 commons-modeler-2.0.ebuild 1967
-MISC ChangeLog 3845 RMD160 ead314ecb8feb4e6b04a683b06baff7eb084afe6 SHA1 949d15bf314b1f62d44cdefc931b4301ccb22512 SHA256 e0f1898f77ac5db625c7740863490c4fc56c59b2a328511ab5cfa35cb1d6a4eb
-MD5 726fe1313b8a797cb392f89a6529b9a9 ChangeLog 3845
-RMD160 ead314ecb8feb4e6b04a683b06baff7eb084afe6 ChangeLog 3845
-SHA256 e0f1898f77ac5db625c7740863490c4fc56c59b2a328511ab5cfa35cb1d6a4eb ChangeLog 3845
+EBUILD commons-modeler-2.0.ebuild 1966 RMD160 dffe2fed41b824ad1e38ccb4518f8df9052b76d1 SHA1 56b53e5e322d0668fc381bcb658dfb4a60ce8734 SHA256 d2bfbdf18edee9427fd498a63383f0626aa4e9d8e8c6f18ad7bf77d69a9640fa
+MD5 e7bdbcb0a64420afb5fd6110717a8ff8 commons-modeler-2.0.ebuild 1966
+RMD160 dffe2fed41b824ad1e38ccb4518f8df9052b76d1 commons-modeler-2.0.ebuild 1966
+SHA256 d2bfbdf18edee9427fd498a63383f0626aa4e9d8e8c6f18ad7bf77d69a9640fa commons-modeler-2.0.ebuild 1966
+MISC ChangeLog 4037 RMD160 97f7aa4895845eedd8b5428adb503556351810b5 SHA1 612c3af7110c65ab31e2d5f1f96f3c3a7af58d6d SHA256 9c03f56803268b2ce3bb96cc128c680e35023803a7a567051a303ab872815478
+MD5 a31405d0384178cd813c155e46cb5f35 ChangeLog 4037
+RMD160 97f7aa4895845eedd8b5428adb503556351810b5 ChangeLog 4037
+SHA256 9c03f56803268b2ce3bb96cc128c680e35023803a7a567051a303ab872815478 ChangeLog 4037
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -40,10 +37,3 @@ SHA256 a71565242314c79297eafc39bf43da0d5e12a30fcd1f3ae78af13f5c84b1cfb4 files/di
 MD5 8e3030dc8e47b74acfe4cf69a6e45dca files/digest-commons-modeler-2.0 271
 RMD160 6b3d2cd27822c09689d66166c6e7aecc871043ce files/digest-commons-modeler-2.0 271
 SHA256 b77c1275aceb71a7f97552f825cf97a3506a952d684d3700db520be55e987fee files/digest-commons-modeler-2.0 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGEgQCNQqtfCuFneMRAtG1AJ4tbp+ZEEzBci8UxXYv+PlKve6hvACbBZbb
-snhdqSdaCAPPnKpdZAdknS0=
-=pXu2
------END PGP SIGNATURE-----

diff --git a/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild
index 65623f547d4fd60d28f29028b5440e3dc66e834a..1a33013f398c7a139942a1847cb763704a92ffea 100644 (file)
--- a/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild
+++ b/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild
@@ -1,6 +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-modeler/commons-modeler-1.1-r1.ebuild,v 1.2 2006/10/05 15:30:20 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild,v 1.3 2007/04/06 23:50:05 wltjr Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -19,13 +21,12 @@ DEPEND=">=virtual/jdk-1.4
        source? ( app-arch/zip )"
 
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc source"
 
-S=${WORKDIR}/${P}-src
+S="${WORKDIR}/${P}-src"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        # Setup the build environment
        echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties
@@ -37,15 +38,11 @@ src_unpack() {
        mkdir dist
 }
 
-src_compile() {
-       local antflags="prepare jar"
-       use doc && antflags="${antflags} javadoc"
-       eant ${antflags} || die "compile problem"
-}
+EANT_BUILD_TARGET="prepare jar"
 
 src_install() {
        java-pkg_dojar dist/${PN}.jar
-       dodoc RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt
-       use doc && java-pkg_dohtml -r docs/*
+       dodoc RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt || die
+       use doc && java-pkg_dojavadoc docs/*
        use source && java-pkg_dosrc src/java/*
 }

diff --git a/dev-java/commons-modeler/commons-modeler-2.0.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.ebuild
index 29b32faa766b0d74bedb947bcfbddc57ec8f743f..f643b8a0fc98a9388fcb2ffde6ccb92282cda023 100644 (file)
--- a/dev-java/commons-modeler/commons-modeler-2.0.ebuild
+++ b/dev-java/commons-modeler/commons-modeler-2.0.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/commons-modeler/commons-modeler-2.0.ebuild,v 1.3 2007/04/03 07:36:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-2.0.ebuild,v 1.4 2007/04/06 23:50:05 wltjr Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -21,7 +21,7 @@ DEPEND=">=virtual/jdk-1.4
        source? ( app-arch/zip )
        test? ( dev-java/junit )"
 
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="commons-digester doc source test"
 
 S=${WORKDIR}/${P}-src