Fix documentation installation for bug #305573 and migrate to EAPI 2.

Package-Manager: portage-2.2_rc65/cvs/Linux i686

diff --git a/dev-java/xmlc/ChangeLog b/dev-java/xmlc/ChangeLog
index 8a022382d4301cdf4d809b58919e165d41811491..69ae73e693849e2fb931bf1c712e142f3504a552 100644 (file)
--- a/dev-java/xmlc/ChangeLog
+++ b/dev-java/xmlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmlc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.12 2009/01/31 18:30:09 serkan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.13 2010/03/07 14:40:38 betelgeuse Exp $
+
+  07 Mar 2010; Petteri Räty <betelgeuse@gentoo.org> xmlc-2.3.1.ebuild:
+  Fix documentation installation for bug #305573 and migrate to EAPI 2.
 
   31 Jan 2009; Serkan Kaba <serkan@gentoo.org> ChangeLog:
   Version bump and add missing dependency to ant-core.

diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest
index db2a4f28e1761ae9b4f3fab519147623b1724ecd..223a8351e6c79cae03f84d7f87c24a5571232573 100644 (file)
--- a/dev-java/xmlc/Manifest
+++ b/dev-java/xmlc/Manifest
@@ -5,14 +5,14 @@ AUX xmlc-2.3-build.xml.patch 2607 RMD160 c44551fe87dd8d0236311ed13cf11f935d76435
 AUX xmlc-2.3.1-build.xml.patch 2725 RMD160 e9da71126b1454965aa4f60964cb3f6f387b21b9 SHA1 2d2c9cb80c73c610c2c2a3d3ce98269258327aeb SHA256 98398a01e965f59a13c4b04a7f704baadb4e8e00339d78fbb81d0baa24d90c09
 DIST xmlc-src-2.3.1.zip 8147268 RMD160 824a9830fd5d76f3f8a84debfddbc4ea90c623d4 SHA1 53344cc2abcea67f5561d6c054d8e54053e6398d SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04
 DIST xmlc-src-2.3.zip 8089379 RMD160 8eda969549572abe1728f45c32221b369619de78 SHA1 e6b8a874a747a311c5fbfefea3d5677e4f8ac13c SHA256 570aa044bc5d081dd2ef9f08763909fa98add74493a4a5bd69972aadcc358227
-EBUILD xmlc-2.3.1.ebuild 2089 RMD160 2c8ce1c6a2780f04ff73a949a25b74efe3e74f06 SHA1 882079c7db6131d0d1ceb60cdfb25e16ad36aa92 SHA256 2bbcfd3d977ea6e6b77f57fffddaaeec065a8baed1dbbd123c6cfb7a39cf0a66
+EBUILD xmlc-2.3.1.ebuild 2071 RMD160 e17eb9692f6b87b46129603e409c01b21f086200 SHA1 5656928633c1d0e05738429651ca0af7d5da7d79 SHA256 88147ecbd52ff2e480e0386c60c7e44699235c20cc52cb12ae469e225c4a8fe6
 EBUILD xmlc-2.3.ebuild 2076 RMD160 842ba815a4b2cd9ed9d20c7486e77eff7677397b SHA1 0713a35dd16c35c6019786eaf463b643d78e94ed SHA256 8add8bfb113b899fc9b97407722355295f241aea6f8e8e8b5d15120416426195
-MISC ChangeLog 1770 RMD160 308da0a5d40d9f5cebc77a6a9ecc9e928869a020 SHA1 7a11d3604acfea7dbc15f8bc0cfbc8db27b21df1 SHA256 ff2a54e0dafc0ac9c383cc4e9fc5e09f500bdc3c4924bc9f1ecb47c4ef385504
+MISC ChangeLog 1919 RMD160 c766afdf88ad476fe5da03dd93a8028b56550aad SHA1 947e279a0d841e0182f2c5b50e10dcc6c3e8bf19 SHA256 8418675a3a219ffe8dfaea6990608b271e796ce011700eedb5f1894e68d5871b
 MISC metadata.xml 426 RMD160 e794d7d9a128851eb1f2043e3f6d6d0de99b83be SHA1 235213947ed35c258258541adbe8a025787a4e8d SHA256 3d312d61b3c8f1ebb6fb30f2521cd3bcc2ed1256c4329ed1bfee343b8186172d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkmEmLcACgkQRh6X64ivZaLYMQCdE9mue68SUzblskEEvVA0qcKn
-4I8An039Rtc4blhUnx3g2fnLFgpjYcaH
-=pQtF
+iEYEARECAAYFAkuTuq4ACgkQcxLzpIGCsLRpXgCfY4dzvbns7B80LDE3BA4EaOor
+JYkAn2VaxduzFUVNRwwUHK2jNnVeLgaF
+=8BDW
 -----END PGP SIGNATURE-----

diff --git a/dev-java/xmlc/xmlc-2.3.1.ebuild b/dev-java/xmlc/xmlc-2.3.1.ebuild
index c4c382f3cd403c34f2ed5a68ec7364a235fb18e0..1d05cf29455f536b9c788b5e63f55d6684390f72 100644 (file)
--- a/dev-java/xmlc/xmlc-2.3.1.ebuild
+++ b/dev-java/xmlc/xmlc-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.3.1.ebuild,v 1.1 2009/01/31 18:30:09 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.3.1.ebuild,v 1.2 2010/03/07 14:40:38 betelgeuse Exp $
 
-EAPI="1"
+EAPI="2"
 JAVA_PKG_IUSE="doc"
 
 inherit java-pkg-2 java-ant-2
@@ -33,10 +33,7 @@ IUSE=""
 
 S="${WORKDIR}/${MY_P}/"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+java_prepare() {
        # get rid of jarjar, and add ant.jar to the taskdef module's classpath
        epatch "${FILESDIR}/${P}-build.xml.patch"
 
@@ -58,7 +55,7 @@ src_install() {
 
        newdoc xmlc/modules/xmlc/README.XMLC README || die
        dodoc xmlc/modules/xmlc/ChangeLog || die
-       dohtml release/release-notes/xmlc-${PV/./-}-release-note.html \
+       dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \
                xmlc/bugs/bugs.html || die
 
        # move the generated documentation around