Remove fetch restriction by manually uploading to distfile as versioned to the Gentoo...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/echo2/ChangeLog b/dev-java/echo2/ChangeLog
index f8a947786efd53a51e23d04e224ca33ac3f4e696..cc3e062a574041ed513f3764e57bd3818ff7c1e6 100644 (file)
--- a/dev-java/echo2/ChangeLog
+++ b/dev-java/echo2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/echo2
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/ChangeLog,v 1.3 2006/09/10 16:52:18 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/ChangeLog,v 1.4 2007/01/12 21:12:23 betelgeuse Exp $
+
+  12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> echo2-2.0.0.ebuild:
+  Remove fetch restriction by manually uploading to distfile as versioned to
+  the Gentoo mirrors and corrected LICENSE.
 
   10 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> echo2-2.0.0.ebuild:
   Added ~ppc.

diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest
index a31682f82f9b704ff489be3fb216ac8363f5ed13..4640aacc628163f515ef71db7cd4bdb7a39f9153 100644 (file)
--- a/dev-java/echo2/Manifest
+++ b/dev-java/echo2/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST NextApp_Echo2-2.0.0.tgz 4330345 RMD160 a4061b7792524381a17e3b91240bdedf3adb521b SHA1 c9f2c27a6d0845123cb32b8151dbb2579f11b00a SHA256 9509c400e3b87714e65270658cbc1da2c417e141a2bb8b6369d244004dd0ed8f
-EBUILD echo2-2.0.0.ebuild 1398 RMD160 58fe0a0702a5f83f0021bd4efea61b1ffced0579 SHA1 10369a3a97fbcae0dd7a2dc6b133ed7a7df6abdc SHA256 4fd7a6d7804fce5bc44531e28ee33ba71e3264520af0342c1d61770d685b3702
-MD5 b4d64948b61f8bb96df0e9b1797e8a75 echo2-2.0.0.ebuild 1398
-RMD160 58fe0a0702a5f83f0021bd4efea61b1ffced0579 echo2-2.0.0.ebuild 1398
-SHA256 4fd7a6d7804fce5bc44531e28ee33ba71e3264520af0342c1d61770d685b3702 echo2-2.0.0.ebuild 1398
-MISC ChangeLog 533 RMD160 afbbe551caa9d5359ec4f8c74b85e3b1b56af961 SHA1 abca44bf258b5b4373cbe1daa5bb57175702ecce SHA256 e7feb938ae0daa59862ca9dea14085a6a6b9afb331da3d8933dee8e7a5b6e44d
-MD5 786046340102b660c10f8d9ef28e23f9 ChangeLog 533
-RMD160 afbbe551caa9d5359ec4f8c74b85e3b1b56af961 ChangeLog 533
-SHA256 e7feb938ae0daa59862ca9dea14085a6a6b9afb331da3d8933dee8e7a5b6e44d ChangeLog 533
+EBUILD echo2-2.0.0.ebuild 1285 RMD160 97e82acd7452ec6b921d70f2d1f5875355d54948 SHA1 273c8272ff78f03efcaf471676c4fa8fa0bf6efa SHA256 482f6ac5167998951ba6239434ebf16d2cae9436dbec5a768064624a59a4f5ee
+MD5 d8477993e93eb95a0e7174d814250d4e echo2-2.0.0.ebuild 1285
+RMD160 97e82acd7452ec6b921d70f2d1f5875355d54948 echo2-2.0.0.ebuild 1285
+SHA256 482f6ac5167998951ba6239434ebf16d2cae9436dbec5a768064624a59a4f5ee echo2-2.0.0.ebuild 1285
+MISC ChangeLog 730 RMD160 6255202ca0c4622f97f2a7a2ff452e5b85be2ed6 SHA1 0ba96f4769f34d3d117e36eea0ec2c245a07eb48 SHA256 d80b7663369b5777fde945afad9b4903533d975e9b4b61a899bcaf7f4c4ea6b3
+MD5 cb41bb8fb4da852e42ff87ce68c53432 ChangeLog 730
+RMD160 6255202ca0c4622f97f2a7a2ff452e5b85be2ed6 ChangeLog 730
+SHA256 d80b7663369b5777fde945afad9b4903533d975e9b4b61a899bcaf7f4c4ea6b3 ChangeLog 730
 MISC metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 SHA1 37c1f64045f8874b69bb7dffd084e7f699c37678 SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d
 MD5 83f6bf68e595b0ec2e45d8e4b78c1f5a metadata.xml 224
 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 metadata.xml 224
@@ -18,9 +18,9 @@ MD5 560a4e4b8ced0f05ff19618afb1e629c files/digest-echo2-2.0.0 253
 RMD160 25290b2b3240ecad8e988b44e3737fd7c3f94fd0 files/digest-echo2-2.0.0 253
 SHA256 596fe3770fd431612a0f09abe36e5f38263adaf2bc2ed5706cc3af90971082fe files/digest-echo2-2.0.0 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFBELOgo/w9rxVVVERAuTUAJ0RJoxr+w/c4nogjg1gKab4u0xWTgCfcBYf
-UHZS/XmvdWjxN34wBrh5J5I=
-=iEht
+iD8DBQFFp/m7cxLzpIGCsLQRAjxAAKCJg3I38zD8UFp6JZXXjv82YWwiZwCfRWgM
+cQXuwsE85/6AT1PO3rl8UZQ=
+=e3Mt
 -----END PGP SIGNATURE-----

diff --git a/dev-java/echo2/echo2-2.0.0.ebuild b/dev-java/echo2/echo2-2.0.0.ebuild
index 4c42d10b5a32891efba4698efc42290440a20331..d21b9e1aa90910d29831dc3c88a78de82439fccf 100644 (file)
--- a/dev-java/echo2/echo2-2.0.0.ebuild
+++ b/dev-java/echo2/echo2-2.0.0.ebuild
@@ -1,42 +1,30 @@
-# 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/echo2/echo2-2.0.0.ebuild,v 1.3 2006/09/10 16:52:18 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/echo2/echo2-2.0.0.ebuild,v 1.4 2007/01/12 21:12:23 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
 HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
-SRC_URI="NextApp_Echo2-${PV}.tgz"
 
-DOWNLOAD_URI="http://www.nextapp.com/downloads/echo2/${PV}/NextApp_Echo2.tgz"
+# NextApp uses broken file naming, all versions of Echo2
+# are named NextApp_Echo2.tgz. So you have manually put this to the mirrors
+# DOWNLOAD_URI="http://www.nextapp.com/downloads/echo2/${PV}/NextApp_Echo2.tgz"
 
-LICENSE="GPL-2"
+SRC_URI="mirror://gentoo/NextApp_Echo2-${PV}.tgz"
+
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="doc source"
 
-RESTRICT="fetch"
-
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
        >=dev-java/servletapi-2.4"
 
 S="${WORKDIR}/NextApp_Echo2/"
 
-pkg_nofetch() {
-
-       ewarn
-       ewarn "NextApp uses broken file naming, all versions of Echo2"
-       ewarn "are named NextApp_Echo2.tgz."
-       ewarn
-       ewarn "Please download following file:"
-       ewarn " ${DOWNLOAD_URI}"
-       ewarn "and move it to:"
-       ewarn " ${DISTDIR}/${SRC_URI}"
-       ewarn
-
-}
-
 src_compile() {
 
        export SERVLET_LIB_JAR=$(java-config -p servletapi-2.4)