From c6bf8b84b54189f888c9ff2b7c320250be588a9d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 24 Feb 2015 23:39:35 +0000 Subject: [PATCH] Install in src instead of src/pkg for go-1.4. Thanks to William Hubbs for the fix (bug 541284). Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xAE5719A3 --- dev-libs/go-fuse/ChangeLog | 8 ++++++-- dev-libs/go-fuse/Manifest | 10 +++++----- dev-libs/go-fuse/go-fuse-0_p20140812.ebuild | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dev-libs/go-fuse/ChangeLog b/dev-libs/go-fuse/ChangeLog index 1ddb09e8d5db..4fe9268cae2d 100644 --- a/dev-libs/go-fuse/ChangeLog +++ b/dev-libs/go-fuse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/go-fuse -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/go-fuse/ChangeLog,v 1.7 2014/10/19 08:02:14 zmedico Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/go-fuse/ChangeLog,v 1.8 2015/02/24 23:39:29 zmedico Exp $ + + 24 Feb 2015; Zac Medico go-fuse-0_p20140812.ebuild: + Install in src instead of src/pkg for go-1.4. Thanks to William Hubbs + for the fix (bug 541284). 19 Oct 2014; Zac Medico go-fuse-0_p20140812.ebuild: Use tar.gz instead of zip, so there's no need for app-arch/unzip in DEPEND. diff --git a/dev-libs/go-fuse/Manifest b/dev-libs/go-fuse/Manifest index 8b4b4335e96f..368424b34457 100644 --- a/dev-libs/go-fuse/Manifest +++ b/dev-libs/go-fuse/Manifest @@ -2,14 +2,14 @@ Hash: SHA256 DIST go-fuse-0_p20140812.tar.gz 111389 SHA256 183f477e02822528693ea824680a79f44b14a4491b10d1738658d71a32e6faf3 SHA512 d951094e290bc914b418c165106368d6b73634ffb177b770ce53baaca4cd6026967f11d602b3e687e59a49323c7af1af74913ec1a911093e4e32503025842cb3 WHIRLPOOL 067eb869634d52ade241113c2c4827ad2266c7d192bc1d89a052e8bbcea699a51c4d0917cea4d93d12185fe55381341a4363a9cc689ed8df90abcd79679c632e -EBUILD go-fuse-0_p20140812.ebuild 1448 SHA256 8eabb6e4ba68fe61bd481208fe8f12b2e78f79da77f81ebfb0f1c9b35795c04a SHA512 05c7a9549d7108081410b2ee5208d921ac8b30540d08488ae775b4ccab33b7dbdf0f90b8363627059424ac501cf9d959fc8dd047856185db6e0305b65530bfe9 WHIRLPOOL d06ca86add0ccac8ba110dca87e6351c3582556ab234555b898a66e1ba79ea2b49cd207ceb8ded2f9fae1995e070795bea62226d416ca37bade8e12810271277 +EBUILD go-fuse-0_p20140812.ebuild 1440 SHA256 c6244d5098d288cf1d35f0f76eec74847eea92d182c5536d0ee7fb0d7aa37b28 SHA512 a56942aa05e257fe529f39d8bf50b37aaf7ea9b16448565b60d2cfeca0f765c950de357360eaada340ad80cd548440f67eeef872b7bb4280838bce5a4e6c5147 WHIRLPOOL 4fd45e2e99c0b445ff39607ca439d9827f6c3429af75c4b3153d06d0779856b19e9d6a9dc10434b9ebd3db66112311a6db62ed4bfd038d68bd9edbb3cc60ab9f EBUILD go-fuse-9999.ebuild 1349 SHA256 3293577741f195b648057dee4d5bf7308fa7f81dc76f179cd51bc6dd16669a2e SHA512 16de84636287dca89630a3ad65ff30cae07595979ae752617c9d008710942347e609f746a6a1fed19c68024a65633ee411a3be472d7ea49856c2e0a33d0aa871 WHIRLPOOL 867c6641c77d2d987b54a3559f46804d200c7c4ce3a62934e8dc6026c69988b27d09b5def59b0eb3a92128bf86e83188daf7cf544d6121b040a0c6a5bc53be50 -MISC ChangeLog 1207 SHA256 27caf743ecb1ae2c35c857a0a421ce39637880d89d95b5e99f04f4d63f58515b SHA512 d435904c826066e1d7ba0375bcadb6acd30a4c0a498cdf5efdafe0a0c6ee310a7deb72b25fa1de0d2f448dfd212afec0d3c96e4bd3f4a003c5878eecbc4d22e1 WHIRLPOOL 8a7d009fc599de5f38455146327cd9f8512c8683878bdd01135255531501949b5e0b02f96b13b355f59f48a4e519fdb99d28e46785ae35f713d25ab5c45c3bd5 +MISC ChangeLog 1405 SHA256 d486dda2c9bbbc7c3eaf518ad84225a54eef87da70f54bd98d6e096472485473 SHA512 d0692ff21485cea343e3f9884a74eab4c89e28a383abfa5ad89ab9844e24f5e72321c5f5c6d7de49ba7cd363db23f4a6d76397b85ee57307bd5e0331289d44a8 WHIRLPOOL 4ae94f58deff42e7d0c5801e48ebeca00cc3f384abf94a88c04de6ce292e069d362da84eb1ac3c51806e57ae594bbe9c93d9ff2fe556e2e7d1f8c4cd07d33061 MISC metadata.xml 274 SHA256 fcdb6e69f3adb718ed543a83635badf4e360a57c550760997c4c5f8ea5c7193a SHA512 8b3d3358fe15d41a5bae960eb75727923c05bab81f63ab6cbab1134e9f49fe69c7e710edf051765950c57a2ef0025207d5f7c129b2bdccfca5be3ec042cf458e WHIRLPOOL 152e28545dc06eb18012d2545644b8bd223c546d10524a7c879573fb1ad265d75ff1ae8e3a95ee6777dbff155ff4ab6795841a884d3dd722579fa8ed5fa6bb49 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRDcAcACgkQ/ejvha5XGaNuUgCdGoKBXHVq1UoGPgrOZYOU2VT+ -V6cAnA9MzviPgmFZ/rpWSBinGHj6ZwZX -=Ii+X +iEYEAREIAAYFAlTtC7IACgkQ/ejvha5XGaNDaACgkoTdz7wBxQzqJUMY91dvBsbn +D48An2Kpsa98egFm1AYAX7MZjDuAaFcq +=uBa3 -----END PGP SIGNATURE----- diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812.ebuild index a381fd67f0bf..5bfcac5b1671 100644 --- a/dev-libs/go-fuse/go-fuse-0_p20140812.ebuild +++ b/dev-libs/go-fuse/go-fuse-0_p20140812.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-libs/go-fuse/go-fuse-0_p20140812.ebuild,v 1.2 2014/10/19 08:02:14 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/go-fuse/go-fuse-0_p20140812.ebuild,v 1.3 2015/02/24 23:39:29 zmedico Exp $ EAPI=5 @@ -35,7 +35,7 @@ src_compile() { # Create a filtered GOROOT tree out of symlinks, # excluding go-fuse, 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 CGO_CFLAGS="${CFLAGS}" GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}" \ bash src/${GO_PN}/all.bash.patched || die @@ -44,7 +44,7 @@ src_compile() { src_install() { insinto /usr/lib/go doins -r pkg - insinto /usr/lib/go/src/pkg + insinto /usr/lib/go/src rm src/${GO_PN}/all.bash.patched || die find src/${GO_PN} -name .gitignore -delete doins -r src/* -- 2.26.2