Make live ebuild copyable

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 48 insertions, 8 deletions

diff --git a/dev-go/go-sys/ChangeLog b/dev-go/go-sys/ChangeLog
index 8ad073416e00..39cfa104d625 100644
--- a/dev-go/go-sys/ChangeLog
+++ b/dev-go/go-sys/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-go/go-sys
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/ChangeLog,v 1.3 2015/06/09 03:28:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/ChangeLog,v 1.4 2015/06/28 23:19:15 williamh Exp $
+
+  28 Jun 2015; William Hubbs <williamh@gentoo.org> go-sys-9999.ebuild:
+  Make live ebuild copyable
 
 *go-sys-1.4.2_p20150518-r1 (09 Jun 2015)
 
diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest
index 860a721de911..5a420f455980 100644
--- a/dev-go/go-sys/Manifest
+++ b/dev-go/go-sys/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 DIST go-sys-1.4.2_p20150518.tar.gz 528445 SHA256 8b8af041e424a8bd04a955a1104313f4eb3b282f064c555ef4edc53b552ce753 SHA512 90565340fa64b625877444c84589e1ba870403a239cf43e99ba194b071e89e6a4877b4b04bb85ba5966401e9b6361eb1b1ffa88404d727eb9f02938313264a9c WHIRLPOOL 9bf6bf148b8d63bcd863cf64d16c4f999bc68dd8dc382167122afbc14499dbdf8ca0e5397f3106556cd1e3ebe62f0df31a394fed42d1a506a311aa3f9d232c37
 EBUILD go-sys-1.4.2_p20150518-r1.ebuild 1537 SHA256 4016b46b34e52f060b6c716ad340831e00a629c0e7e555caa04ca7731937145c SHA512 880ea6866dae3beaabad1e1f2fb1c1682c811bf7e733afa5a260a37f71b70ecad6cf34dda66cfbdc151a133d8415839df9c9b59e307c5e530726c862987ae861 WHIRLPOOL 349f8f8d9da5337e12ee9b9cdace2d55925d90a54fd1abab5ec21140be1621a8f3aa6f6c078cd4c19d8a7352112282cb4ea5cfed4eeced719720a64afe4d571e
-EBUILD go-sys-9999.ebuild 486 SHA256 0d508fb11fe05ec2e2e8c39fe6aba0ea989c2a89178fa38615278303cd21073b SHA512 ea688c66be933fa1bac65a167ce242fec4bbb98c7977b90411fecea367cc63f5993d2405fec45647ffaa05828fc1db9f2f7570f9ebb0b3956c2f12a8fa024859 WHIRLPOOL dd80c40ae916bacbe0c6d5866230b07103ed0962cf88880ee4cf26cba2a2e1125dab068d82897b97cd48c58e082e70b6bda80483b177adee1943138d55cd863c
-MISC ChangeLog 719 SHA256 f874dd44a110865284f5b1dd5dcbe8cb8042580dbae76f0de012bb940a737c73 SHA512 264995ec2e68afb14b9da9c29a197bd1b604378e5e58399be2e65af64e5a5d384e3133b970d4a717baeb6b035414231fc4abe54ff44543739b99ce57dd327581 WHIRLPOOL 66a860938561a5ee882837cbaa78165ed3bce00e51ff361db09c68c89bddfbd4feeaeda4b428700ccfd6c521890f417906d02893d93eb1d6f7eee24afd64809b
+EBUILD go-sys-9999.ebuild 1328 SHA256 f6a6a33054b981364663f2fd369cbd9943e979851c0c4dbe0acc0f40cf06759d SHA512 875e3964fda32e3646fbcb816ee855a2ec0dc002e407394b269c71f12e60d79b53f5996d049f23e33b3fda5bcc70f669baceeb60b8ab27b9b61d442d89879d5e WHIRLPOOL 04ccd345350429f21d8e43f149c5c85029967e97d3ba9668891e6b262d30ed5afaa479aefe3c0fb295ddc8ffb63bb43bfd53d34cee66a568ba805c8f5ad631e5
+MISC ChangeLog 820 SHA256 f09a11487a88d1fe39b2918760dd07e573572f0864427472e807500de0c98603 SHA512 7ce3b7683932d1b70725d5ca88655b890126c284945d95e2a7e468336ab613537cf922379fecb9ba7662ae6739848691641e924856cf5e7ecd71172115b90c3c WHIRLPOOL 25cbfe80958388133bb7974022eeca1b7cb1f476ab9bdcfca9620cae1b8a39ec95e9367ba8d0195fb1fb1e05a3316d6bdc6f1d84e70279d0975424de13bd9ee2
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWMQOcACgkQblQW9DDEZTiOrACdEXBTMu5qu30oeN6OlstUfKsN
-BoYAniywI60rDm2/9Eq8HLhTr+CnJKwb
-=2p2D
+iEYEAREIAAYFAlWQgPsACgkQblQW9DDEZThWFACgh9WC/oBeMn/3xdPuHXClZLwP
+UUAAn0TpEBMty1BBEfSZz39HXYo3PSJe
+=4w1B
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
index 218748e417e5..6e408f8b11bb 100644
--- a/dev-go/go-sys/go-sys-9999.ebuild
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -1,12 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-9999.ebuild,v 1.3 2015/06/25 17:56:49 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-9999.ebuild,v 1.4 2015/06/28 23:19:15 williamh Exp $
 
 EAPI=5
-inherit golang-build golang-vcs
 EGO_PN=golang.org/x/sys/...
 EGO_SRC=golang.org/x/sys
 
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+EGIT_COMMIT="58e109635f5d754f4b3a8a0172db65a52fcab866"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+inherit golang-build
+
 DESCRIPTION="Go packages for low-level interaction with the operating system"
 HOMEPAGE="https://godoc.org/golang.org/x/sys"
 LICENSE="BSD"
@@ -14,3 +22,32 @@ SLOT="0"
 IUSE=""
 DEPEND=""
 RDEPEND=""
+
+if [[ ${PV} != *9999* ]]; then
+src_unpack() {
+	local f
+
+	for f in ${A}
+	do
+		case "${f}" in
+			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
+				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
+
+				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
+
+				# XXX: check whether the directory structure inside is
+				# fine? i.e. if the tarball has actually a parent dir.
+				mkdir -p "${destdir}" || die
+				tar -C "${destdir}" -x --strip-components 1 \
+					-f "${DISTDIR}/${f}" || die
+				;;
+			*)
+				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
+
+				# fall back to the default method
+				unpack "${f}"
+				;;
+		esac
+	done
+}
+fi