Mirror distfiles locally to prevent hash conflicts. Bug #123920.

Package-Manager: portage-2.1.4.1

3 files changed, 33 insertions, 20 deletions

diff --git a/app-admin/flexlm/ChangeLog b/app-admin/flexlm/ChangeLog
index d62f01cea0ee..055424c9086a 100644
--- a/app-admin/flexlm/ChangeLog
+++ b/app-admin/flexlm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/flexlm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/ChangeLog,v 1.15 2007/07/02 13:34:02 peper Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/ChangeLog,v 1.16 2008/02/05 01:08:53 dirtyepic Exp $
+
+  05 Feb 2008; Ryan Hill <dirtyepic@gentoo.org> flexlm-9.5-r1.ebuild:
+  Mirror distfiles locally to prevent hash conflicts.  Bug #123920.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> flexlm-9.5-r1.ebuild:
   (QA) RESTRICT clean up.
diff --git a/app-admin/flexlm/Manifest b/app-admin/flexlm/Manifest
index 97a3a3bd869f..87f262b9f4c2 100644
--- a/app-admin/flexlm/Manifest
+++ b/app-admin/flexlm/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 90flexlm 70 RMD160 ca37848713be4cf22aa26ff86436af9b50233b83 SHA1 d6192cccd3679aa281247a1c4c1d4f389124e38e SHA256 4b0c57837ed0f2013fb390120c0a0c3a4d4ab91f9131cdb618ba08ca14b9a823
 AUX flexlm-conf 549 RMD160 859ea76e3e5f211170cd4ff6fd99e68951192aad SHA1 e10b82e3a41a59da205116e090461a6b86353717 SHA256 81fe865f570ecb030b0917ec3c42671ace3bd2c21d4185c50b779e4efba2ef6d
 AUX flexlm-init 511 RMD160 6f0f3f5abf3b712ea772ef24a23273c343c0092a SHA1 d86c46b25ca2a0894b33601e4db1e2c5630bd6cc SHA256 84e910973e8a2a09d5367577d69001e2e12d57a85ea0e501d904511084927514
 DIST enduser.pdf 1136567 RMD160 a049cd535f8948e99ac0385f4d53a574d4a027be SHA1 b0149e8d6d96b4ecedc8e1680f372ceb3adf837e SHA256 483818333b4d959d14fe7e5939843a68687fbe87657bf90f0b12230f18053b11
-DIST lmgrd.Z 318617 RMD160 cad7633c20ed311b02ab79604b42332883e5b4a6 SHA1 21bd151b7ccdcb9c8a2df0bac84b31e3aa33b251 SHA256 d79e1cc24ab8216c2d8252b90ac18ef771f0e89629f2f482a39fc77dd8f31523
-DIST lmutil.Z 324583 RMD160 50ef30b8971ad49d4da9aeac99ea0c041c41302e SHA1 7ab054fb287d50076b8ec7d0e6d05bad451bbcff SHA256 8b3da0d810fd8071ab968c74c74cff2ba90ae7d1a38dbfce0fbd802253eac0e5
-EBUILD flexlm-9.5-r1.ebuild 1813 RMD160 21ea9d44f60378b195b9b7eb187bf0bac12dfc97 SHA1 7d728f3aeb83d094c59cfcbdf5d70b67073e068f SHA256 766c9c4bf80464662b1ef10c485dc0442c751983c3355bcb67394dee8331f6c1
-MISC ChangeLog 2158 RMD160 75ea2a20449fe72a3f73212d4ba05e664809aed6 SHA1 223bfb069e6c18eeb811ff73ad5c4c1679bad860 SHA256 7a8a76660b19889e4669e62fbacf9fd3b68a1f259ae8b1e2f893fd11a0c9b98e
+DIST lmgrd-amd64.Z 327568 RMD160 f0bbd9ad2f25168c2e8283e48d2adee475b51ef3 SHA1 c6b7fe2a84a7770f15a29c8f9f53f6936e391d02 SHA256 49a5e24757502231295ec2c7ea23a770fe39642f0405fae3ba9715deee2ebfab
+DIST lmgrd-x86.Z 318617 RMD160 cad7633c20ed311b02ab79604b42332883e5b4a6 SHA1 21bd151b7ccdcb9c8a2df0bac84b31e3aa33b251 SHA256 d79e1cc24ab8216c2d8252b90ac18ef771f0e89629f2f482a39fc77dd8f31523
+DIST lmutil-amd64.Z 331103 RMD160 9d5c753bca3ba83cbd01c8491c98b4c101ad5da2 SHA1 7b0bad17913858c538c430589ee4b505d0d58254 SHA256 2af1934b02d4499324389fa4491bdcfd8d72cca431e804d05848827abfc85413
+DIST lmutil-x86.Z 324583 RMD160 50ef30b8971ad49d4da9aeac99ea0c041c41302e SHA1 7ab054fb287d50076b8ec7d0e6d05bad451bbcff SHA256 8b3da0d810fd8071ab968c74c74cff2ba90ae7d1a38dbfce0fbd802253eac0e5
+EBUILD flexlm-9.5-r1.ebuild 1684 RMD160 cc57d9e48c54d93d5967b794131d76a459eec2e9 SHA1 b01fbaa88fdfc7cc916df64c6f623b01f9221db1 SHA256 78b73042714eb73def6e58453e59a3176b7be7e52e2752e2635f866687452634
+MISC ChangeLog 2301 RMD160 e4e285ce1cdf14e93a240cdcec165f7e9419c154 SHA1 0c196efcf31609c932e4bd611fbac967274002d8 SHA256 13c787bc4805244f98719044b398720b2abbe4d97a85c0a83bbce6cfccefbe26
 MISC metadata.xml 327 RMD160 8ab217feea81d6ea8c157fe6330fbf1ce3a57da3 SHA1 1ebee31e8f09edd91882e430ca8cf4ccabe6d88f SHA256 1870fcdf1b9d46d2686a7da79bc6f5a39474a1252b3c45fd521bdc89dc96e1d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHp7cwiqiDRvmkBmIRAp6DAJ95+IbXLnBGc57lGdEeckXkSUbi+gCglgM9
+Zi6uH+Zh/XnItOoHuQEyRcw=
+=OXnU
+-----END PGP SIGNATURE-----
diff --git a/app-admin/flexlm/flexlm-9.5-r1.ebuild b/app-admin/flexlm/flexlm-9.5-r1.ebuild
index a8cf48352eab..b6edb7ecee65 100644
--- a/app-admin/flexlm/flexlm-9.5-r1.ebuild
+++ b/app-admin/flexlm/flexlm-9.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/flexlm-9.5-r1.ebuild,v 1.4 2007/07/02 13:34:02 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/flexlm-9.5-r1.ebuild,v 1.5 2008/02/05 01:08:53 dirtyepic Exp $
 
 inherit eutils
 
@@ -8,12 +8,12 @@ DESCRIPTION="Macrovision FLEXlm license manager and utils"
 HOMEPAGE="http://www.macrovision.com/services/support/flexlm/lmgrd.shtml"
 SRC_URI="http://www.macrovision.com/services/support/flexlm/enduser.pdf
 	x86? (
-		ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmgrd.Z
-		ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmutil.Z
+		mirror://gentoo/lmgrd-x86.Z
+		mirror://gentoo/lmutil-x86.Z
 	)
 	amd64? (
-		ftp://ftp.globes.com/flexlm/unix/v${PV}/amd64_s8/lmgrd.Z
-		ftp://ftp.globes.com/flexlm/unix/v${PV}/amd64_s8/lmutil.Z
+		mirror://gentoo/lmgrd-amd64.Z
+		mirror://gentoo/lmutil-amd64.Z
 	)"
 
 LICENSE="as-is"
@@ -22,17 +22,15 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
-DEPEND="virtual/libc"
-
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 
-	mv lmutil-${ARCH}-${PV} lmutil
-	mv lmgrd-${ARCH}-${PV} lmgrd
+	mv lmutil-${ARCH} lmutil
+	mv lmgrd-${ARCH} lmgrd
 
-	cp ${DISTDIR}/enduser.pdf ${S}
+	cp "${DISTDIR}"/enduser.pdf "${S}"
 }
 
 src_install () {
@@ -54,11 +52,11 @@ src_install () {
 	dodoc enduser.pdf
 
 	# init files
-	newinitd ${FILESDIR}/flexlm-init flexlm
-	newconfd ${FILESDIR}/flexlm-conf flexlm
+	newinitd "${FILESDIR}"/flexlm-init flexlm
+	newconfd "${FILESDIR}"/flexlm-conf flexlm
 
 	# environment
-	doenvd ${FILESDIR}/90flexlm
+	doenvd "${FILESDIR}"/90flexlm
 
 	# empty dir for licenses
 	keepdir /etc/flexlm