Fixed the installation of the src.zip.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index f2015d199a71adc834410330559944418ed1b7ce..db02da74862ddb24bbbbf93e5d06ed6fc658d46f 100644 (file)
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.14 2006/12/07 14:50:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.15 2006/12/07 15:13:43 betelgeuse Exp $
+
+  07 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> mx4j-3.0.1-r2.ebuild:
+  Fixed the installation of the src.zip.
 
 *mx4j-3.0.1-r2 (07 Dec 2006)
 

diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 05079d3be9056b96176981f45c64a3efec08ef75..b446f9cae6c75f05f615c5e7d47cb198c0ee02f9 100644 (file)
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -7,14 +7,14 @@ EBUILD mx4j-3.0.1-r1.ebuild 1784 RMD160 516450efb08352c4fce290ec01fe49dd15b486e9
 MD5 fea7b625b578d99085e1032900a40c31 mx4j-3.0.1-r1.ebuild 1784
 RMD160 516450efb08352c4fce290ec01fe49dd15b486e9 mx4j-3.0.1-r1.ebuild 1784
 SHA256 5dd88a5cc8f7361c74acde8849904027bd8e056f003501cf9ed93a0a2c600165 mx4j-3.0.1-r1.ebuild 1784
-EBUILD mx4j-3.0.1-r2.ebuild 2525 RMD160 f2094e10d72905daa41839fe6b188cd29685e692 SHA1 8aa752c168d527bbe97be1cd58b71dd5f7e45705 SHA256 1f62b5f118c847b4564b482ec01b0b6fcaa168f982e93cbf8c93d07fdad6db61
-MD5 8952b1c563587078e44badb34275d4e9 mx4j-3.0.1-r2.ebuild 2525
-RMD160 f2094e10d72905daa41839fe6b188cd29685e692 mx4j-3.0.1-r2.ebuild 2525
-SHA256 1f62b5f118c847b4564b482ec01b0b6fcaa168f982e93cbf8c93d07fdad6db61 mx4j-3.0.1-r2.ebuild 2525
-MISC ChangeLog 2300 RMD160 b3c0a177f7ee1c46e9a7ead0810c81ca7810219e SHA1 fe7e911b5a36213dd1ef546a8b85ffd0fd6bce8e SHA256 517296dce533c607066591bee6edd7d2d89576c5d240093ae049f7eb174a8f29
-MD5 5654148669fb83fdf95d4addd33d8570 ChangeLog 2300
-RMD160 b3c0a177f7ee1c46e9a7ead0810c81ca7810219e ChangeLog 2300
-SHA256 517296dce533c607066591bee6edd7d2d89576c5d240093ae049f7eb174a8f29 ChangeLog 2300
+EBUILD mx4j-3.0.1-r2.ebuild 2482 RMD160 781515d308bd4d4b0eaff4e46befe210dd76ba9f SHA1 ce7abb66852134a3d55b87cd3a4888c3525a30d8 SHA256 6e2c1744456667c700beb4e687a98f463d99aa4a804e90db31c26e4f11a53715
+MD5 e320125540db26db19a430baeeff11cd mx4j-3.0.1-r2.ebuild 2482
+RMD160 781515d308bd4d4b0eaff4e46befe210dd76ba9f mx4j-3.0.1-r2.ebuild 2482
+SHA256 6e2c1744456667c700beb4e687a98f463d99aa4a804e90db31c26e4f11a53715 mx4j-3.0.1-r2.ebuild 2482
+MISC ChangeLog 2417 RMD160 3c317b320bd5ec7d250a0ef186e72e79514f9cd9 SHA1 9f3379540285382b94429b2038852439cb615a37 SHA256 eb1263f40cb1f5c7656a741811a59875fb9a4ce0b14b77a93708255682b36d2e
+MD5 14617a23034c1f93e482beea46ab87a4 ChangeLog 2417
+RMD160 3c317b320bd5ec7d250a0ef186e72e79514f9cd9 ChangeLog 2417
+SHA256 eb1263f40cb1f5c7656a741811a59875fb9a4ce0b14b77a93708255682b36d2e ChangeLog 2417
 MISC metadata.xml 960 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 SHA1 0c20fd32321a719a2c1e1047bbad403c0c6158da SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da
 MD5 3ef22a0f5aafa3b6494e26b3639eece2 metadata.xml 960
 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 metadata.xml 960
@@ -28,7 +28,7 @@ SHA256 11aec312a732c1d7aa13be693a289989c049d67d31019fdb1f7c99d651e465e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFeCo+cxLzpIGCsLQRAhtZAKCNMEYrZBWo3bpZXpRvO6zD74U7RwCeMjzs
-1+p7rpwoqL9h/kq4rmgcL0Q=
-=opHB
+iD8DBQFFeC+zcxLzpIGCsLQRAnfzAJ9qwZNfm1ZJOoXHR04PkUnV1M74WQCggcrm
+kf8Im1w0DDy+UYOqiIiybgI=
+=aLDW
 -----END PGP SIGNATURE-----

diff --git a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
index 8800db3bd8a82ec304d713cf854cdb9b733fdc47..3bd499d15d54e86f18bbc66fd58f842f7965ef3d 100644 (file)
--- a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.1 2006/12/07 14:50:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.2 2006/12/07 15:13:43 betelgeuse Exp $
 
 JAVA_PKG_OPT_USE="examples"
 
@@ -81,7 +81,7 @@ src_install() {
                cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples"
        fi
 
-       use source && java-pkg_dosrc examples/mx4j
+       use source && java-pkg_dosrc src/examples/mx4j
 
        if use doc; then
                local docdir="${WORKDIR}/binary/${P}/docs/"
@@ -93,7 +93,6 @@ src_install() {
        # Recording jars to get the same behaviour as before
        oldifs="${IFS}"
        IFS=":"
-       java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0
        for jar in $(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0); do
                java-pkg_regjar "${jar}"
        done