Use generated tarball from specific git hash version needed instead of downloading via git during build (bug #425134)

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

3 files changed, 27 insertions, 17 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index c49deb1923cf..d9d61bb22cb8 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.46 2012/07/03 18:12:38 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.47 2012/07/08 17:04:09 lavajoe Exp $
+
+  08 Jul 2012; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.19.11.ebuild:
+  Use generated tarball from specific git hash version needed instead of
+  downloading via git during build (bug #425134)
 
 *btrfs-progs-0.19.11 (03 Jul 2012)
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 53a2147db2c1..af29b3045d8c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,11 @@
-AUX btrfs-progs-0.19-convert-remove-used-space-update.patch 1005 RMD160 52925f470e96f851f74862fa0ac9cf7bc729c536 SHA1 49636f68528d1faacc0d8a72be63862e4e3a672c SHA256 75759924f7d766705c5ea97d4cc2d70962b4c49e7f274465c3c2e9021d481f38
-AUX btrfs-progs-0.19-fix-underlinking.patch 579 RMD160 4ed32f7a10875af18589f2fe7051e5b70238c883 SHA1 82f36161a7b921fa45ad0f036e4cd8783115c122 SHA256 d79d53eb798c7f504a895e7bf461f801c86937df11d824eefe1ff8721ad88bf4
-AUX btrfs-progs-0.19-glibc212.patch 535 RMD160 c7d444ec10ac7e30a8eb5645ffae1be53881f96a SHA1 eb5167b9c03c3052ca7516e0a427fba3a4b65ba0 SHA256 c9a1479df01ba8b74b97ecf723d7f2a5e7c347dc0c92ae6676b9d1dc311a6bd1
-DIST btrfs-progs-0.19-redhat.patch.bz2 21699 RMD160 9e554223fcc2f820f4bb44580f97519ee243d3b7 SHA1 09c1957dcc784733970c32b705d9034799053892 SHA256 36e581ce32aad7119195a0f5c47d3007d38b3520b92ba3c825baf22f35f17723
-DIST btrfs-progs-0.19.tar.bz2 118119 RMD160 28e7955fd1f9e0ac68c465cf3bbeec3c889b0513 SHA1 483b44e844c3a97ccb830add21ca9327545dbc69 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc
-EBUILD btrfs-progs-0.19-r3.ebuild 2733 RMD160 29980e62033edb0d0c09cc5c022b56b7e01ca66d SHA1 dfb099a75e696d151f463099ddbc5c4c70c47aa5 SHA256 77ae329be086d9d70848c9f63ecb46dc6f820ebacba9e3bf094c092094a0ff8b
-EBUILD btrfs-progs-0.19.11.ebuild 1415 RMD160 33c6a47b2c91be9351b7db386f70e0b091e0caee SHA1 9b768d90e538be125457eaba96b436a292be3130 SHA256 5fe84d619f5ce010321359c083be5e07793c2ec571f09c60630f2a3e98c1c128
-EBUILD btrfs-progs-9999.ebuild 1198 RMD160 8bc5fd6bba2fedd4b30dbbee64be63d85e4d98f2 SHA1 e39de1305c65a0cfadd122fffd8b64079df9d157 SHA256 61fbe204d4663599a566ba9de75106b8e13b65882212152bf8fad52776b9caa0
-MISC ChangeLog 7332 RMD160 9f9d73437fbc5675bf7b517dbce4d4d612dea6e3 SHA1 7d7174ac96478b2e50e8cb09c64bc6ab8dd71873 SHA256 06167d7461cfa6e9826c204b3743a4a7193e4dca218768948e186b7b6aa67d0e
-MISC metadata.xml 298 RMD160 7913df44fb40331be43ddcba84794a32570a1181 SHA1 8c3aa24b41d2d37d44a3709fe7aa78dcd4ba5cf8 SHA256 d6790f3c52e3a94a090e7127c6bb40ee6cc4e84e40b0cbb38adc7ed8e663a81e
+AUX btrfs-progs-0.19-convert-remove-used-space-update.patch 1005 SHA256 75759924f7d766705c5ea97d4cc2d70962b4c49e7f274465c3c2e9021d481f38 SHA512 ff51a89dfed6149d6e5938a661cd4a4f344706480195b219672ec950a8a1aaad7cdf416163191cccf84944d5b06bfc98d7e784d2ad659daebd3fd4b387174856 WHIRLPOOL e5c683640f5e0ed950fc69b6e8693e93826f1f5e011402d39272ba835f084194f3e5d5abfee2d0ed4b1aee9ad3d927113b01c813363b673c5b22fc5108b8ed92
+AUX btrfs-progs-0.19-fix-underlinking.patch 579 SHA256 d79d53eb798c7f504a895e7bf461f801c86937df11d824eefe1ff8721ad88bf4 SHA512 8d6604d195f4757171a4ce5cf017b893a92fff4b90553bf24765278ccefc50bcc1fe9de410562b4451cd4ed9359cb6427c4a80087db2ac37aa1d195371675db2 WHIRLPOOL be41966ed844c05109aeea1e44871191153593343b57408c930ca5ffee1636b41d79669e6901dccdce57653875db7438f8e72c92a6361a21d893403b480091cd
+AUX btrfs-progs-0.19-glibc212.patch 535 SHA256 c9a1479df01ba8b74b97ecf723d7f2a5e7c347dc0c92ae6676b9d1dc311a6bd1 SHA512 16f2a7e6fd813f4163c954860e47394d8123dd603c379ea4e2efc0a2dea17be925cf8d95c87306bb96395d09572156520cb0ae5af1d465f63752b58f09bce6db WHIRLPOOL f379a59e5e89cbb9dbed090893da939e2a52d4ddc9a9c9df36dfa90e388aa64e19a99c40e6e155a1ec54da50cecfc5233feb3c8bd2effab6621f317751b80fc5
+DIST btrfs-progs-0.19-redhat.patch.bz2 21699 SHA256 36e581ce32aad7119195a0f5c47d3007d38b3520b92ba3c825baf22f35f17723 SHA512 a3a9809548b61fcd25336789952d83d53a9ad1d221447907b85acd43a68518e3a746de3469bb917f51a49024b99bec1b9e1a46014b460ed8000b3919e3d444a1 WHIRLPOOL 3c33b0a2283cf55d3399609ebeb407567cb3daa60fcf01476b5acd22dd9fb1af7fa228a66d9ef24086543c9383a107811846c741feff503169561de6ef2b06d2
+DIST btrfs-progs-0.19.11.tar.bz2 171425 SHA256 b4b510c4106a5b6159f2e51ac685ca700d53693140137e45f67e3767db18b662 SHA512 3704f240f7128bff8c5fc1ce7fd44b4eb985c1cddd7139fa96da0536849bdbbe9b08bbd928c3a20e91c5a0ccd07f60020f6dacb91a6887c2fc73de668477fa99 WHIRLPOOL 7fa6e7fb5566a17bb147ec847f6c1a3a55814a5676b1bf413f9b310de503c5cfef62b3e4b86a4ce28f7ae905416fad44fa802fc75c6cecd51265a9f69cc6175a
+DIST btrfs-progs-0.19.tar.bz2 118119 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc SHA512 f0978432b524f307302d80e3a904684c21b6549f0b444f51a17f1d6f0a3dfebfc39ef185c3431a007fb354218aa7027e665ca6a3c58267bb8d0905ae34dc7b80 WHIRLPOOL c11134671eab375b51b190bba9583d7b064486563bdb4a19bd16d27ce7e1812a2b3ab4efc3cce0ce19a60b0d50d96f3110c39ce770cd9535bd839378b68e0be2
+EBUILD btrfs-progs-0.19-r3.ebuild 2733 SHA256 77ae329be086d9d70848c9f63ecb46dc6f820ebacba9e3bf094c092094a0ff8b SHA512 97d92488a923e1efc938f8bed4ece3f6893192fd16976dcb24bf28a778e319dfd4442c8660e9599d73a97ca4e269a416364422a1d7c80868938a4e23728152a8 WHIRLPOOL e1d4f67116c48aafea82c96bd5fb895dac531f6aa62ca225b8e14df10feffda0a7e5c6ef5563992bf20d14e7ccf7e1df035ab8561849e4d9a48b9579a14e7e5b
+EBUILD btrfs-progs-0.19.11.ebuild 1689 SHA256 28c3dd4d46b915fdf4120779e7270e785a745f7e92f4e400d4b9cee0c3d866b2 SHA512 f46982ea1a12c792536545200b048ff0fc1f67438e4aae5e3713c6ad5fa73f2bb91914800dac837d11c487ce68983d39d1591b4f85fb4c42712cd2ec9b868800 WHIRLPOOL 56c29b90368ae047b85b19d809ad5287bc254089bcf8bb0516076efe8008b00c7bf3d072d0dbff147b9b302ee4226540eb1f0ca84819ad1397114855f24fc48b
+EBUILD btrfs-progs-9999.ebuild 1198 SHA256 61fbe204d4663599a566ba9de75106b8e13b65882212152bf8fad52776b9caa0 SHA512 61747df147301cc735003e278cb9a27014bd023c35eac430b8ec2e2837fe4f2e006f7971f7c40191fab36bdae4fe8b112a6819dc2b5f87e1bc25d51200606ac7 WHIRLPOOL 3aa105cee9b504ac1ee25ae0dbae3748eb62a6db04e10cb0f331423a6d40298e98d248fb41cc2b05b9e3c71b80509e6e350b4733c466abaee3844419cd3fc978
+MISC ChangeLog 7532 SHA256 451e05290ab37a002d56baa58b56dbbe10f5a60720655eddbfb0133d827017c3 SHA512 448691ebff793127038b63221803003777c84c9e4c349898efcbe2aa1bf9352d112e8135d5c3dfd5c3844b6530dcabc0f4c41ce350c1c3cf8e076318d9371845 WHIRLPOOL 9b86773aacfc155d17712c5d4c583fc0bd03ed3256302f9de14c6208e4d973912f26214798062753503ae559d3e91c16b539cf8c353c47454c224153279e4254
+MISC metadata.xml 298 SHA256 d6790f3c52e3a94a090e7127c6bb40ee6cc4e84e40b0cbb38adc7ed8e663a81e SHA512 808f7ffc9ba582f129b25fb2a1620e9e4ca3274222a9afcbf613e25d03fad6a436349650c4cf18bc563bfa528ba9540910894bf2f8fe3bfa86727948ddbcd493 WHIRLPOOL 81f84832e4c13dfaf5e40c22cd1afce327cb5750061cdc2ae355f52d61057de0ee4aad92ddc677cfa0b7c5a5252b4b048fb030d6e6930082baf7c0777667930f
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
index faceae1ed1c1..410a6d78b353 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
@@ -1,14 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild,v 1.1 2012/07/03 18:12:38 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild,v 1.2 2012/07/08 17:04:09 lavajoe Exp $
 
 EAPI=4
 
-inherit git-2 toolchain-funcs
+# Note: leaving commented-out references to using git downloading, since
+#       upstream does not produce tarballs for the versions we need.
+#       We, for now, are using the git hash and subversion used by Fedora.
+
+#inherit git-2 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Btrfs filesystem utilities"
 HOMEPAGE="https://btrfs.wiki.kernel.org"
-SRC_URI=""
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,9 +25,9 @@ DEPEND="sys-libs/zlib
 	sys-fs/e2fsprogs"
 RDEPEND="${DEPEND}"
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-	https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-EGIT_COMMIT="1957076ab4fefa47b6efed3da541bc974c83eed7"
+#EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+#	https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
+#EGIT_COMMIT="1957076ab4fefa47b6efed3da541bc974c83eed7"
 
 src_prepare() {
 	# Fix hardcoded "gcc" and "make"