added prefix support (bug #534032)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 50 insertions, 20 deletions

diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 81ef2d54038a..48b3bdc4a0b6 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/gzip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.124 2014/01/18 01:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.125 2014/12/31 19:44:39 ottxor Exp $
+
+  31 Dec 2014; Christoph Junghans <ottxor@gentoo.org>
+  +files/gzip-1.4-asmv.patch, gzip-1.6.ebuild:
+  added prefix support (bug #534032)
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> gzip-1.5.ebuild,
   gzip-1.6.ebuild:
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 270e18dd0a96..100db1faf60f 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX gzip-1.3.8-install-symlinks.patch 280 SHA256 f8b8c8548ae32975ba8e5bbc79add0f951954e1b4a21de55575274de177925d1 SHA512 b804a4d4ef9294a8f241b75a06ee6464d932330824dc95f2fa1f67bb6f22f4d66287e4f47dcafce4e59e68fa3d11ac61cdbca55ab0939747d8a17464d2aa29c1 WHIRLPOOL 13a5806a61a565a5a1de4d07b7aa252743016e559fe72752f2e7130d414eba0c6167608f3485f2fadf21a592cd15aa36c8e58682ca5309aa28ea874a8b7bdcb5
+AUX gzip-1.4-asmv.patch 702 SHA256 b065aaed488c6ed1930e93e99f9cc94cc9da8b355337b2a82c2cb168eebd122b SHA512 34ab638432a690e1678a1754817d65f5e0258a50ea4f308f4a26ae48a2829537ae23a252ee08540c486931c617e634e6a0fc5712d8c337099029c7b3eeb3b408 WHIRLPOOL 17a8af8bb17c88988822f0aacba738339cede8a764ab3ae04a1f24904d68fc592acacd1bb1f9da8dd66e702a6a973aff0e6ddc6811aa428f21be0dc38ab2f415
 AUX gzip-1.4-assembler.patch 1703 SHA256 4d05f0c6df2fcca0dcc6f72f4545ea89e0cdcb92d1f6b9e9e2bd1942da46cf81 SHA512 8a501a03263b2cf2e4c87d0f8736bfe598ecf3f32c0e76b508d88504888405fb75ce97614a2c138a49d18f516fe3dd6d9440b8d04c8f67f7b4c1833d5cb25413 WHIRLPOOL f40b81cb1ed1b3566fa3e27503ae5d8dc3fa28b15b72c1278da894190ddbf1fbeca4d158bb78d913b02edd6c9ad83f149149a40633b451cb0395194eb844a4e3
 AUX gzip-1.4-no-gets.patch 779 SHA256 adf17732f03e1a794018da083ad9a2f754176d2590dd1671a4b33d1ef788d474 SHA512 451a50f9a4025ed52d1689a86a86e53f5caf30c4363d5cedae45a20361d5b8f09d0aa05e0b55aca139358e0997cb5491627d5425bf2ba43cc58efcbd685ec0b7 WHIRLPOOL 59a0ae40f20eecb1b8d4e14980b34fa2cf8845cd26860a63905749a40d22452025fd93895775ef5f11d860d67de27efc20c491895674abfeb1ccde4d240b6ff2
 DIST gzip-1.4.tar.gz 907411 SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee SHA512 9ba6d11f0469b80433a5da25f834f7652db109c235e2a849f4249adae3929fda9ebef98a181cc928a5dfc2b0d35df8b220afba130cd4a596a4dbddbf3fe8d2bc WHIRLPOOL 3d8552d2dc660953714f49674e8af2319eade0fd33c705ee253c2ea215cf4e5c3e6b7088c7087060ea7751508c74769b5b64d9e88bc22ea1d7ad0e8680a616e5
@@ -9,23 +10,17 @@ DIST gzip-1.5.tar.xz 720956 SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89c
 DIST gzip-1.6.tar.xz 725084 SHA256 37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847 SHA512 06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01 WHIRLPOOL 7c639d9a57d5f9a820972275c7813ccd76df7a87ad68b00668696aec251b84fd7efb1129205e8a7cd51e40706b718ce3ce71dc9aa6626acf074bcea6f0fe5c39
 EBUILD gzip-1.4.ebuild 1357 SHA256 95b40f0a4f6432d4d748a014d61c2ee0310ca0003d357fb6d9b1b183153582b2 SHA512 8a5188aaf64c57401bb218ba690c12a9a491d9e80719573a18a42f5306a42ac60777e7fbee366ec4e394b58e4d5a7bbe3f81d2a4cea7bf2ad7dd238b0bc52f98 WHIRLPOOL ef461eba586c8a45b1827d4244efab3872d7521f0a3449ad6e1a250c3538abf2309329937f6a12d254f71eb6512b9b1b98330536fae4a9f4056f060b766fba66
 EBUILD gzip-1.5.ebuild 1276 SHA256 8e82f50fce8d297f27d82eacc607fb5a936226c6b811a7e32fcd679f7519d5d9 SHA512 6fd7c7b60fad35e14e2230b6c32764bae46e32d40f42c16048b68af818d68f3b2879227cbec4d07407982c6b1fe9cb4f331562f12d7e50c34df17d4406f4bf1c WHIRLPOOL 63717b6324dc699bb1e8cd1f2f40b7c939dae242ea57a73ba5c51b2e91242399d89500c3cfd2b41760ae17bc7fd3c88f5ff676860fa700112cb42d5c81fd4718
-EBUILD gzip-1.6.ebuild 1074 SHA256 cb3dce55001817452f2552c749f4400af1c0b4dbfa3bda2e15345327a74723d6 SHA512 e406bc79776d8a68211da9d59a0cf80318a566538e5153e22aeba0d20a50aa0a03f7ff32512da4529ccc857600fd19ee70f710cae55c03072584c8673843bdb7 WHIRLPOOL 2980c5387c0ae9a49a03f07781e8a07178b5ae3ee9a9123aed35945a69aa95078f5fcca71b283563fc1580760530dee2420fef48d0c229c63609c104598a47b3
-MISC ChangeLog 17419 SHA256 85245fd0c5878e31597817f0306b198cde6d0080f8b07afae213199886d9b8ca SHA512 baceac30624363db21eb6163e2887f60522019b81e04e16aede07824594068f6eedbe76d7026fcbc97e7a88b47b7ab8d64f61826fb093e51d763f0014debdca4 WHIRLPOOL a957de29998b1d9ad49a337400770e06241a7c28f654fefe52e1c8a525d4fe55110e1a4ef093687c8005a26472fd97ea5b343634a75df66043510670292f850d
+EBUILD gzip-1.6.ebuild 1345 SHA256 075e058e339d3b487fff2c19efbf8e2dff7c00dcfb1ceeaf83af741f1d12bbcf SHA512 b2749952b2ad7d78128090cc49a3ac3859f31e5375792b0b177817b24a2df6cf739b3eccee5a130cfb65de5f791fb349dc5c54a848d8bb6068a8befd0c131fc0 WHIRLPOOL 20c0f30ef32e24c27a3f209935584b4aa0c0f92f4168c1389f227dd3a0f7499f68b67b7f80de07221160345e81aec7bbbe59518b749f703af6e0a1cbec65fbcf
+MISC ChangeLog 17558 SHA256 3635048ed014c66538ee42201da0fc9427dd19dcc33b6a3fc309c334a1a64dec SHA512 79939449f5bc9848af28946fc880e253ea6d57735d93fae614887af22b2ad5f8e7104bf75f5139425e9d263f6dfe364bbf9515af74ea2d0986645b745d2b146b WHIRLPOOL 16a3d14b6b38ad9aec4f63a15e3e90a891ebbadcad0affb0d977ae1800817519b1a4cbdc604353e18e6641e1b37fece1a6fae54110e696a44c908f986c4721bd
 MISC metadata.xml 332 SHA256 04a052a90b1c0efb1f799fbbada1e3f9360fa215347ec9ec77e808af0fbbb8af SHA512 111506a79b87e69343b240bf513c236cb2532f063a0ae53e75b9704998e24beed17e724761264c24526ae2dc48a8ee9afe9e6f9059288dab84c8cbe3efc61246 WHIRLPOOL 422bfc388e85988b60126ab97fb98d8fa85b843a73c02cc03b8cb6bf8ec1f636678235426de5c4a9b695900e8fd5710b8aebe0f8eda27633035590eb5658946d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2dZWAAoJEPGu1DbS6WIAK6MP/jQroLZmJyCe5zstPB55e3iy
-YBejZeLf4kF505bmP5Hjduh1DvRoetfHqZXDaxq+5ezBDF6SErPbSKPflvErWjmh
-I1Qg4S1rqGTgPl61WfFvDU/FXxRbIRzcrlYqpZmhmmighY9Egjnri2uCgXGY3Abx
-+fH1YGb27wQp7Hn48QvOw5sTmrpNTWkxh0eao3OttYqI247rfRVPtDt+5fFhrlhW
-HnH3vrNk3sZcoFgDWvAzpXhDr9RTI45d5/svHxx91BjRarN696SFdqrx0TDScu4m
-K0SZrR7IantiFTFofik2bC6FGVhkgVB367C4E4coZ0cWulx8gHOV0ho5E3Ir+zOi
-B/dF+CQwXoZPodBzprV8pRpdf/rqtKuPNQsCaAARg7AbYcaBOyUSTbX+lUCk0rPI
-D0/rkIExnle/v/70bHZxz1/2gpUq9GXZJQfWeGYEht5b/8Ibh2nZxo3dXttiA7YC
-V6M+NZhzoFgK+cZiYGqPmhiiKHsZuMYp12Sh4cPcycJmnF+fiaA9DqPHDRigSYJA
-8bwAFW8UpqQOPKHsoPfHse8hwBr1LI64I0tJMHECbLV+pypV/epL2GbM8oX/OAIO
-saqvpvVE1vq4LRAEXVeP4qoBsYjRcqOCEqRok9oeXs4Jm+jCb4hxHAuHNzwJqivP
-ymD9m/olsan0S6SX+wKd
-=LF2F
+iQEcBAEBCAAGBQJUpFIqAAoJEOeBhlrCAAWGgf0H/iuUGpjMplgOQkpeBDTSvRkw
+nujob6engoQ9zkj97FkxBcts5KySMZGVPPyCXeDkpFbLJGwKC7IPMYDucSbVRWrE
+j5OQCdWs8VsICM6fo/bOUp1bSl27B449/HkACW73zRz8vUOLOCuratrldjrl7X/I
+y0+NQZS/VaupHPCv0FglcvRZvaZxBJbpnJnIInDGV+NONOKP65vFLBLs1gFsfjge
+GdZ6cUcoKx6PzoAxMLKmZgPpJqLghAOOU5bmD8EugZoWIIwUNc2rLG+h7O39QZlH
+8gkThJGJOnaPIlnjlHJfv9sGmJ6AWBkPVQzc7fd9gM9pJbHGSTPu7scCBEDgL1E=
+=lG3N
 -----END PGP SIGNATURE-----
diff --git a/app-arch/gzip/files/gzip-1.4-asmv.patch b/app-arch/gzip/files/gzip-1.4-asmv.patch
new file mode 100644
index 000000000000..c87855018cff
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.4-asmv.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/show_bug.cgi?id=302773
+
+--- tailor.h.old	2010-01-29 11:13:02.000000000 +0000
++++ tailor.h	2010-01-29 13:18:15.000000000 +0000
+@@ -69,9 +69,6 @@
+ #  include <io.h>
+ #  define OS_CODE  0x00
+ #  define SET_BINARY_MODE(fd) setmode(fd, O_BINARY)
+-#  if !defined(NO_ASM) && !defined(ASMV)
+-#    define ASMV
+-#  endif
+ #else
+ #  define near
+ #endif
+@@ -182,7 +179,6 @@
+ #  define PATH_SEP2 ':'
+ #  define STDC_HEADERS
+ #  define OS_CODE  0x01
+-#  define ASMV
+ #  ifdef __GNUC__
+ #    define HAVE_DIRENT_H
+ #    define HAVE_FCNTL_H
+@@ -201,7 +197,6 @@
+ #endif
+ 
+ #if defined(ATARI) || defined(atarist)
+-#  define ASMV
+ #  define OS_CODE  0x05
+ #  ifdef TOSFS
+ #    define PATH_SEP2 '\\'
diff --git a/app-arch/gzip/gzip-1.6.ebuild b/app-arch/gzip/gzip-1.6.ebuild
index 3f7cfb4a621c..be85b743ec11 100644
--- a/app-arch/gzip/gzip-1.6.ebuild
+++ b/app-arch/gzip/gzip-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.2 2014/01/18 01:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.3 2014/12/31 19:44:39 ottxor Exp $
 
 EAPI="4"
 
@@ -14,11 +14,12 @@ SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
+	epatch "${FILESDIR}"/${PN}-1.4-asmv.patch
 }
 
 src_configure() {
@@ -36,5 +37,5 @@ src_install() {
 	# keep most things in /usr, just the fun stuff in /
 	dodir /bin
 	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
-	sed -i -e 's:/usr::' "${ED}"/bin/gunzip || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
 }