Install in src instead of src/pkg for go-1.4. Thanks to William Hubbs <williamh@gentoo.org> for the fix (bug 541284).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAE5719A3

3 files changed, 18 insertions, 14 deletions

diff --git a/dev-db/go-etcd/ChangeLog b/dev-db/go-etcd/ChangeLog
index 166d55412133..ebf625838422 100644
--- a/dev-db/go-etcd/ChangeLog
+++ b/dev-db/go-etcd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/go-etcd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/go-etcd/ChangeLog,v 1.1 2014/10/16 00:13:51 zmedico Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/go-etcd/ChangeLog,v 1.2 2015/02/24 23:37:52 zmedico Exp $
+
+  24 Feb 2015; Zac Medico <zmedico@gentoo.org> go-etcd-0_p20141013.ebuild:
+  Install in src instead of src/pkg for go-1.4. Thanks to William Hubbs
+  <williamh@gentoo.org> for the fix (bug 541284).
 
 *go-etcd-0_p20141013 (16 Oct 2014)
 
diff --git a/dev-db/go-etcd/Manifest b/dev-db/go-etcd/Manifest
index 51572d709615..6ea84634d086 100644
--- a/dev-db/go-etcd/Manifest
+++ b/dev-db/go-etcd/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST go-etcd-0_p20141013.zip 28825 SHA256 f10764597620b6743b15740ef1cf12e2f564febc81e41b30026e4cc6aeeac44d SHA512 031c7e877207bbc34520ffd9f58709717045fe3067e2184302d177b9fe637985d175bb0020007c70376efbf781365172d6846a96c18252260e51e1013ad8af94 WHIRLPOOL 4f889b62db97acf2a816737b0133e588e1a96d0a69b77300ad007cdaf65eba5483661758eaf7e1dbfeb33a1cebc8afe6b7d83359582de8a997c4486e276036bd
-EBUILD go-etcd-0_p20141013.ebuild 1132 SHA256 3c60605da7b687d3f1526da2602bf900363779c7b4dbdea2da54b47dd5cb23ef SHA512 4460061f54404c50eb8e1a93068425756db53a4fde7ab9436fd7a5fd7ed9e26318857a36919aec897d313abf13bae22bb9c3a3a22bbb0be5c706a052d439b500 WHIRLPOOL b079a268047a12ffb538e6ed39199ad87a65a53efb9bd15a14c9344563a53475f690dbe1b519c650a4351ce30a2c6e84e4ee74952ab71b13533be5f1be770afd
-MISC ChangeLog 353 SHA256 e682b4c44711202ed9ebcd99233edc94902f2b0c84d05b2e2aefd19dfa59dba5 SHA512 6712802c9408d86700ec500292e7bb9b7bf478b16b488e51e6042fccf7b27ad6bb385638a39cc8700a69d66104b3de15974d0cc8ee4e1f25a999ffe3ba358335 WHIRLPOOL 4660ecb759a1706f9befacfbfa45d768844118c05d5603c38841e6675407cf8a8ccddee7abd97d9acd10a45fb51233a6ce4df25a99ba1d0c77d7f157ee8f2e5f
+DIST go-etcd-0_p20141013.tar.gz 18214 SHA256 1f23919939588fbdc76dc40977f20d47fe67e633be24f53e4042122a942f867e SHA512 af07b2434bbad219962e989ca1d6ccb86bb40f698aa3f2b681ac04094dc7e878593af6a54e9c1e976d1aeb451661d8100295b0637291b46bafa45452537f1575 WHIRLPOOL 6cfb874e90bc43d643eb9b3db59e9d7c914614adfcb34db642b794c645823863cdab70c72b0e60abda2dc97dc1c526bc2d8c4c28d7c32811fcc9798744b4beaa
+EBUILD go-etcd-0_p20141013.ebuild 1130 SHA256 57e6b3b43966dfd0b36d0d453cd332f497a8af7d63bc9f7be8daf22e32d8e68f SHA512 e71afde1a05c210167a3512ccb14d39637e133f554fcce05c03fe6eaad65d4431b87574749bd5160e68cc9cda0ddca1ed0342a9e7eec625ea4d33d7841e1a781 WHIRLPOOL 19339a8f7bafee62aa7723426dd1d1bdab65126da5f5195d7e015ae2a9e56f447523bba1ffcafdc471383e62f3181087a05e09f409b0aeddcf1ac7e80989c968
+MISC ChangeLog 551 SHA256 2db8ab7535bbc9e63086e22930a8e3e56264775b2c1a300e620b78cdfd7710f7 SHA512 69ae578b3099b8d4f246db78e1bfd6116a93902a840f12003df9bf3dae69f9b3209f7d209ceaa53ac4a046823804e0a9f7a520cf1650b9a1c1be06a700d3ae22 WHIRLPOOL dfcd2def64f0c260ccd6df54e2a16da0fc4d01f48adca9f6708c48b43418e167abd91f3fba6b1f494017b6cbecfb74cd1f96f682354d92f0e6c4bf432f11daa9
 MISC metadata.xml 439 SHA256 d394704e81760297675424f9cbd770bd19f843c3e59b583350e0d23985ba40f0 SHA512 9508c22c14222ce44d1e7ff79248d86aa7c2837101e8e55a65e92303c28594b5d25ac3dc49bc21e0d4627386a7be9651bd1fcc43cae0209eb810d2c8b3f0bde0 WHIRLPOOL a7d32edb70be40bf4f283c6f2d2cf8d781c4ae6b115ee7026f5346cda09cd64753eeddd8de765c80724e4cdb89afc5c96d462fb6e7643242f56d2fcb30591b88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ/Db0ACgkQ/ejvha5XGaMcZACg2JnpVWNKm5rFLfkF04xljiDB
-oPcAnj7wc/OKD+NIQqu/J13ejoE9h0Rr
-=mKYy
+iEYEAREIAAYFAlTtC1EACgkQ/ejvha5XGaMTSACfYvDVGXHUbFfy1eoyObuqtd7y
+NKkAn22g6W2RCxTjote/CvxxR9ehpLLO
+=3rRp
 -----END PGP SIGNATURE-----
diff --git a/dev-db/go-etcd/go-etcd-0_p20141013.ebuild b/dev-db/go-etcd/go-etcd-0_p20141013.ebuild
index 2dc3178e9075..78361195a1db 100644
--- a/dev-db/go-etcd/go-etcd-0_p20141013.ebuild
+++ b/dev-db/go-etcd/go-etcd-0_p20141013.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/go-etcd/go-etcd-0_p20141013.ebuild,v 1.1 2014/10/16 00:13:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/go-etcd/go-etcd-0_p20141013.ebuild,v 1.2 2015/02/24 23:37:52 zmedico Exp $
 
 EAPI=5
 
@@ -9,11 +9,11 @@ DESCRIPTION="Go client library for etcd"
 GO_PN=github.com/coreos/${PN}
 HOMEPAGE="https://${GO_PN}"
 EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-DEPEND=">=dev-lang/go-1.3"
+DEPEND=">=dev-lang/go-1.4"
 RDEPEND=""
 S=${WORKDIR}
 
@@ -27,7 +27,7 @@ src_compile() {
 	# Create a filtered GOROOT tree out of symlinks,
 	# excluding go-etcd, for bug #503324.
 	cp -sR /usr/lib/go goroot || die
-	rm -rf goroot/src/pkg/${GO_PN} || die
+	rm -rf goroot/src/${GO_PN} || die
 	rm -rf goroot/pkg/linux_${ARCH}/${GO_PN} || die
 	GOROOT=${WORKDIR}/goroot GOPATH=${WORKDIR} \
 		go install -x ${GO_PN}/etcd || die
@@ -36,7 +36,7 @@ src_compile() {
 src_install() {
 	insinto /usr/lib/go
 	doins -r pkg
-	insinto /usr/lib/go/src/pkg
+	insinto /usr/lib/go/src
 	find src/${GO_PN} -name .gitignore -delete
 	doins -r src/*
 }