Fix by roger for SRC_URI setting with ebuild unification.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 22 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 6d4b5e371f12..6bb7d7eac97a 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.106 2008/12/30 00:12:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.107 2008/12/30 02:18:04 vapier Exp $
+
+  30 Dec 2008; Mike Frysinger <vapier@gentoo.org> grub-1.96.ebuild,
+  grub-9999.ebuild:
+  Fix by roger for SRC_URI setting with ebuild unification.
 
 *grub-9999 (30 Dec 2008)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 155a5966b999..84c191ee145e 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -18,6 +18,7 @@ DIST grub-0.97-patches-1.4.tar.bz2 24693 RMD160 6afefff73b5f3ab5c6d05563c4f67f37
 DIST grub-0.97-patches-1.7.tar.bz2 31190 RMD160 f72f956c36d07e914bb7b4512ff9c88349123ab0 SHA1 6c5e011a8a55fc986abc84c43d59266a42f2ac9c SHA256 6dfb17ff874ce8f737211a728c319a133b90e3633a80daf5ef370c15ee625389
 DIST grub-0.97-patches-1.8.tar.bz2 48274 RMD160 99c967daca704e853e9d161a51db3d39040bab4f SHA1 3e643d8de0d77456409176ebc4b3b14d547d99dc SHA256 fcd16e6def8ace7bb5928c2d16ddb032a57a5df24a69f9cfae5ce6292785318b
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
+DIST grub-1.96.tar.gz 639970 RMD160 80c8a41b73063706310f3f6e99acb912e2e8f9ab SHA1 6af22f354d8c551dd82e71f15196e2f96a1318ba SHA256 0cdfb104da5492b1b2b402ed45873b3b7a7407f5017ae7d8806327a619dc1d59
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2639 RMD160 cacac6d3ed808c52a05fc6b1c0c929af7f114926 SHA1 5828e84ded260a50bd7c6cd30217e1d0cf881299 SHA256 40c896a0ec005d50e9c6effd4d2ee95c1e0712d26a13f8f55bc6d7380c6d7102
 EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a SHA1 a2131f5f673ad9f5dbf6288d7484eb844de52e37 SHA256 864ca6f410a0a6caf18d4bdc4a0389bb922802459e0c2a975c0442f6bd4a4fd5
@@ -31,14 +32,14 @@ EBUILD grub-0.97-r5.ebuild 6880 RMD160 942a63d78c6c1f58f7139b5df863c89466484828
 EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6 SHA1 ebf3222a1eaac1c272de84617a64e2e3da80a315 SHA256 c7fb9191776c0bacf6b9160f1e78cb1fa6ccefbed03b85a219a1ab355bc5f36b
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.96.ebuild 1144 RMD160 6d7adcfb69d13fb2efb20563e8e3c9ff6b8d0b30 SHA1 aea660a158fe999ba48c70fdf969d4ae39cc1a26 SHA256 e50b28bfb9576ea1aa9a4681eb2c16ed453461923aad83b6bb3f09d372a572cd
-EBUILD grub-9999.ebuild 1144 RMD160 7ab327da3af3e98be482a3bdb7d3a84cf77a7ce8 SHA1 36633280517982fb38857da0f020912227226550 SHA256 8b2dafbbe66037d579613ef7a8d81bf4e92a01ff40af97150b4452a9d46bd37e
-MISC ChangeLog 24107 RMD160 6998558dedccce64d289a4dcc9f846229ce4bbec SHA1 2bf18e542abb0531586a94fbeecd6b57ead6be58 SHA256 b55447aee123fcd000c841d550acb08f9d94f01ae2f761b90323dd2717801bdc
+EBUILD grub-1.96.ebuild 1244 RMD160 39d6c28a7df823c74b0e02440d1e578eb9574413 SHA1 6bc806a4c499cd2a07841d0b50050e2cddbbd81b SHA256 6520c3fe6f3ac37a14453c1f307b8be863e0e41f50224966078076c4016cb209
+EBUILD grub-9999.ebuild 1244 RMD160 b9a87645d42ac22686cc3e4a5da3008029328eb5 SHA1 8c1a2a74fd45aaa468031993bfabb8dc79b2c712 SHA256 313e65c1376be7eefc837c2a8b2cd34889a60ab800cc163459ccfeaf34fce971
+MISC ChangeLog 24256 RMD160 a693ba76cddaf4f841bc8a494744b60a17815663 SHA1 cc79a3c8c7f05db8087366a6977bc35f57ac0e5a SHA256 f24d183526ca238a0fe56dffc65afc38bfbf3eaa998bd1d3feadc1e9d3a47d3a
 MISC metadata.xml 250 RMD160 5d297cf8754c72fea2a5afa5b9e3b35c2e131f31 SHA1 37c9d016076a9869497199b1d2280437b01aa9ee SHA256 9cc0f0e1b861d82b2396fa0ea25e5ea3f41d066fbce9ef9404d651a011020be3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklZZ5AACgkQn/5bYzqsSmHFFQCgjuTK/XJZD994m1XoaH6n31KT
-zf0AoICmx3Gpojvqf57FIz8JKzBhzPdM
-=1Mu0
+iEYEARECAAYFAklZhOIACgkQn/5bYzqsSmGO7wCfaklvf30pxXSngbc0dUbEx7Kz
+qeMAnibGJl4qJWcX5gQ54QA0YnylqVxn
+=E7wS
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.96.ebuild b/sys-boot/grub/grub-1.96.ebuild
index f7076657b7fe..3fc7686a570a 100644
--- a/sys-boot/grub/grub-1.96.ebuild
+++ b/sys-boot/grub/grub-1.96.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.96.ebuild,v 1.6 2008/12/30 00:12:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.96.ebuild,v 1.7 2008/12/30 02:18:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="svn://svn.sv.gnu.org/grub/trunk/grub2"
 	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
 fi
 
 DESCRIPTION="GNU GRUB 2 boot loader"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a99f2ac9b021..2c62773b4ec8 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.1 2008/12/30 00:12:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.2 2008/12/30 02:18:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="svn://svn.sv.gnu.org/grub/trunk/grub2"
 	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
 fi
 
 DESCRIPTION="GNU GRUB 2 boot loader"