Fixed for Prefix, bug #499456

Package-Manager: portage-2.2.8-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 30 insertions, 17 deletions

diff --git a/games-misc/cowsay/ChangeLog b/games-misc/cowsay/ChangeLog
index b56e7deab737..ba99f394bb37 100644
--- a/games-misc/cowsay/ChangeLog
+++ b/games-misc/cowsay/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/cowsay
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/ChangeLog,v 1.36 2011/04/21 20:13:20 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/ChangeLog,v 1.37 2014/02/01 11:55:59 grobian Exp $
+
+  01 Feb 2014; Fabian Groffen <grobian@gentoo.org> cowsay-3.03-r2.ebuild:
+  Fixed for Prefix, bug #499456
 
   21 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org>
   cowsay-3.03-r2.ebuild, +files/cowsay-3.03-utf8.patch:
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index e6f1b241430f..f89c48415130 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,7 +1,17 @@
-AUX cowsay-3.03-mech.patch 490 RMD160 bc2318e9832108a39728e92806578566618fad8e SHA1 cec033ce530daa01736a841f351144f3ca5aea3d SHA256 e41ec32c25afd5e8ed8708cc35b228646e0d2d793f91d27327119850b554d6e2
-AUX cowsay-3.03-tongue.patch 358 RMD160 9de33eec59e44fd2a375bca1419313f856bade7f SHA1 4cb24d5ea35df531c1e8ad2d000d643e41e97964 SHA256 07a01f73455a00c50760cf1ef9e17a6483b0036ac23fb51d978d38deacdd0f9e
-AUX cowsay-3.03-utf8.patch 454 RMD160 00ea66c1561dd6ec2a31156c49f7f8d067b7b119 SHA1 f8eca4fa5dd4c7d404b215ca98601715042a7b62 SHA256 5400fd73294e86f1d58098276e57bf74e3688ce22f07f1df453dd903eda397b1
-DIST cowsay-3.03.tar.gz 15189 RMD160 f26b9ffe3d5551ee8049979c628bbe198817044a SHA1 cc65a9b13295c87df94a58caa8a9176ce5ec4a27 SHA256 0b8672a7ac2b51183780db72618b42af8ec1ce02f6c05fe612510b650540b2af
-EBUILD cowsay-3.03-r2.ebuild 1245 RMD160 14bce76715480958f0dfa33d1c95e7033965c4d1 SHA1 7c73d1ef3dc0166174acfb28749a896ce8832272 SHA256 8f801328113e872908d32158a99a363c8c14b0ba0ba389490166d3b2506020ac
-MISC ChangeLog 4354 RMD160 5681d5b0ee3d5c8a343451258269797fb9140793 SHA1 0378422a1656d493aad0e31aad66c42cf0a10e71 SHA256 6049c0d281da8e00fb42361fe6688b1515a0391569df60303fc78e012cc46019
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cowsay-3.03-mech.patch 490 SHA256 e41ec32c25afd5e8ed8708cc35b228646e0d2d793f91d27327119850b554d6e2 SHA512 abaa76dee0c896100bab79a68c25720bb8449af77990ced74d89d271e22fd8fa5cb1b4586ef79e4c12a21d7091164d8c19a1162e78636874864a3fafa3a8df1d WHIRLPOOL 0c2ba09bafceb2a2fd0f97ee774fb641bad0764b6aab27a8a0641695ae839fb8f5a60f3d76287fcad926e5fe9620e7fac72556fd6e6410d167e2a28fd4e3eb10
+AUX cowsay-3.03-tongue.patch 358 SHA256 07a01f73455a00c50760cf1ef9e17a6483b0036ac23fb51d978d38deacdd0f9e SHA512 bce27566383debd01f00c40e867dff9d405304f70e72de9ca4c2611c6242da9919c5a74b6ac3d0632ad7c928ef578f8bb78d125ed6141a0adf3f7498731f8e6f WHIRLPOOL 9c4c77ded59ce3aef0f6a0dd220fd2acbe64c7c8717041275bae0fa0f76c762751f957330e8e01a8fdf822744d58296e47b066134b05c5bf1208e54addfc0396
+AUX cowsay-3.03-utf8.patch 454 SHA256 5400fd73294e86f1d58098276e57bf74e3688ce22f07f1df453dd903eda397b1 SHA512 4519c799311b5e31b3299fc66285ad0f9bfd2148dbfb34411437d37cda37d7cea8e823c8f99b0a0ef3652bb839f09d05fd5c5c727db4b091c6ed86d335ed6ece WHIRLPOOL aa3773f75cd371422be19e448ae703231f9314b7c9f22950290e4c0bde7a068c9d54cda4fd7222342ec5d1fa3274626de7bb5cb207f3911533ea9a153ac02c3c
+DIST cowsay-3.03.tar.gz 15189 SHA256 0b8672a7ac2b51183780db72618b42af8ec1ce02f6c05fe612510b650540b2af SHA512 8e91d0c929c2e0743106c08643029a943d0684343ff44ad8ff172636a8f47fd25ee8bc4d108ccfe308c756d2871b956cceef0c406800615ed0dc1e1e24648219 WHIRLPOOL 08b1f7818c073390dd4061e955888d5344b8d091b1a7ec12eeeb9d584b084e3a3e630fa03a6da3c80721f59e5d8ba10cffc677b892304fc900136fed110e7e87
+EBUILD cowsay-3.03-r2.ebuild 1287 SHA256 c2dfd73c25c4f2f3e07ccfef2a215bf956a4e1a9ecef76e2b9a9250e6ab29059 SHA512 a7846703bc861e4c27096e4d8f909c8078458c70990520ca9526fb61e0c4e46b0e68aa0754da9c4208bac365f182add2f7756c686833fa0269786580b410dfd9 WHIRLPOOL 036d6beb679d5c74f315c26b5499e761b1b10a1e778110315368fb1b686bca6374a5c61cbc4a125a3f2d50a3100f114daf58e233f428e1fb6c9fc340c8b05df2
+MISC ChangeLog 4459 SHA256 e392d17bf5a387c4c7e91b7edc76045224011717b2badb32ffbf5e0a70a9aefb SHA512 2be8d52a09546a5e917347da827db3385c1c0d965a520af77cd356410b69892774030cc82faefc4ef8fde81426039fa29f44e0ef610287cf30ac7113b1ee315e WHIRLPOOL 4ccdffcab6989a017b58286b4d676761cb0cd97916431980b48a38c7bbdb061d66a2847b51b92b1154a0f7f0141a4b59c77994803fd511a97ba89417a0246199
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (SunOS)
+
+iEYEAREIAAYFAlLs4NIACgkQX3X2B8XHTokP5wCeLr5PH0WZ6NHMDxIo1Hcvvo38
+fNMAni/U+zWksFKuVeQ/ux1L/bKLBmJ6
+=3Z81
+-----END PGP SIGNATURE-----
diff --git a/games-misc/cowsay/cowsay-3.03-r2.ebuild b/games-misc/cowsay/cowsay-3.03-r2.ebuild
index ba890fe93b89..8ec65cdefb0d 100644
--- a/games-misc/cowsay/cowsay-3.03-r2.ebuild
+++ b/games-misc/cowsay/cowsay-3.03-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/cowsay-3.03-r2.ebuild,v 1.10 2011/04/21 20:13:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/cowsay-3.03-r2.ebuild,v 1.11 2014/02/01 11:55:59 grobian Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils
 
 DESCRIPTION="configurable talking ASCII cow (and other characters)"
@@ -11,20 +11,20 @@ SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5"
 
 src_prepare() {
 	sed	-i \
-		-e '1 c\#!/usr/bin/perl'\
+		-e "1 c\#!${EPREFIX}/usr/bin/perl"\
 		-e 's/\$version/\$VERSION/g'\
-		-e "s:%PREFIX%/share/cows:/usr/share/${P}/cows:" \
+		-e "s:%PREFIX%/share/cows:${EPREFIX}/usr/share/${P}/cows:" \
 		-e '/getopts/ i\$Getopt::Std::STANDARD_HELP_VERSION=1;' cowsay \
 			|| die "sed cowsay failed"
 	sed -i \
-		-e "s|%PREFIX%/share/cows|/usr/share/${P}/cows|" cowsay.1 \
+		-e "s|%PREFIX%/share/cows|${EPREFIX}/usr/share/${P}/cows|" cowsay.1 \
 			|| die "sed cowsay.1 failed"
 	epatch \
 		"${FILESDIR}/${P}"-tongue.patch \
@@ -38,5 +38,5 @@ src_install() {
 	dosym cowsay /usr/bin/cowthink
 	dosym cowsay.1 /usr/share/man/man1/cowthink.1
 	dodir /usr/share/${P}/cows
-	cp -r cows "${D}"/usr/share/${P}/ || die "cp failed"
+	cp -r cows "${ED}"/usr/share/${P}/ || die "cp failed"
 }