added prefix support (bug #529564)

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

3 files changed, 36 insertions, 27 deletions

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index cc2a253582e6..09dad9a2f509 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xloadimage
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.65 2012/01/22 20:16:27 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.66 2014/12/05 22:20:11 ottxor Exp $
+
+  05 Dec 2014; Christoph Junghans <ottxor@gentoo.org> xloadimage-4.1-r11.ebuild:
+  added prefix support (bug #529564)
 
   22 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   xloadimage-4.1-r11.ebuild:
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 88482d577a32..7e9bab5e854e 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX xloadimage-4.1-bracket.patch 518 RMD160 848289d06a5cf1dcd3bab467885c4b30611ecdca SHA1 c298e654ecca9f7e869bef75130a7a4dd3f72ba8 SHA256 cc5289450dceb1794dcf99a230c7011d99fcd45e26dcc276a7de25dbd6f5867e
-AUX xloadimage-4.1-endif.patch 321 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f SHA1 4b3ed8fedb88c9ec9276a6bf2b48f372193f415c SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204
-AUX xloadimage-4.1-include-errno_h.patch 303 RMD160 a6125c8e94db89d348a4e358610bd195db044720 SHA1 94568ec6e2679c236b675754a49559f979e772e7 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a
-AUX xloadimage-4.1-ldflags_and_exit.patch 775 RMD160 d7b44f8658d2e58aedf26c25c4075683ea9ad1b0 SHA1 3f9bf0f027e793454a02fcd8df3cecf5c74e0912 SHA256 f2b80e39246e495a5118f27e815cb8100b9619184580d35696c512a0d81b55fb
-AUX xloadimage-4.1-libpng15.patch 747 RMD160 ff3bc212721c44a6ac4574557e34ed21896718b6 SHA1 daf773fb2cc6b40a962533e721e4407120cee1dc SHA256 c0d30c64354d4261c3218b23498ae41f43215b875688a4c0d1efc3c6c12736fa
-AUX xloadimage-4.1-unaligned-access.patch 1730 RMD160 31d77d46308db7e1a44e391922db385217227281 SHA1 0fd44ef9e54c59884575f589a97c20cec7ec7657 SHA256 35548e5242d32f66e7175c090af4b2df5ee6f20f51d7e7f83a9f430af568f6c9
-AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf7d2451d3d2c94678 SHA1 4ac943a7b4eb78d65577838b910628fa14fb84e6 SHA256 253064f5eebcd6c1c318b9637f1010657927b5f65be59581ef37523a50f3601e
-AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2 SHA1 4fa12fa375187f04f5f71dafe7b02b858273b050 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30
-DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 RMD160 57f09f43e96fea7c103cd283aaea35245a44071a SHA1 2b577a1c230a99201a2cb48ba4b5d122f34da3c7 SHA256 addfd04c0a5667bb9c3f4ae6a9da35a443776086e30b84b2c3afa5eac161144a
-DIST xloadimage.4.1.tar.gz 596021 RMD160 000271b40f58601cd1057b4e99c31a30da6e10af SHA1 0a8ee9b185702750706f68e4a34e086873f17690 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
-EBUILD xloadimage-4.1-r11.ebuild 2495 RMD160 8443c4a00c4fcb5ce2db1a87938d8dfb50f3e0b6 SHA1 219087b04eba9e39b4c2a3cc5dd8de47e0f299fa SHA256 adf8cac520f84c407b7536d9adfc336d659ece4b04d2351d8dbb417cc783d23a
-MISC ChangeLog 10065 RMD160 fa60457ff1ab76569124abe59b0f206e07bb9044 SHA1 046ce9ca22f00e83d421a26692c76ec559896bd2 SHA256 ad4817adef0a06be03bb3dadf02e692eb1d1c209dcdf446f8e297f76bf6f4a8e
-MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
+AUX xloadimage-4.1-bracket.patch 518 SHA256 cc5289450dceb1794dcf99a230c7011d99fcd45e26dcc276a7de25dbd6f5867e SHA512 f73b8077c7fe03ca688646f63df24c6dcecf21b1ebccf9983c7c6fb0332b371b17f835985ffccbe39fcb7bfd553a78df70c94d734930e35310a1b8ba0e30bf34 WHIRLPOOL 0351a6425f3f6f7981221811a7a244b23b0930bc59343321c6309ee7b3ea9eb2f8a51ab8194c55ee52eb4f166cb0c358334f98df456b547b47b68e3baf4d044e
+AUX xloadimage-4.1-endif.patch 321 SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204 SHA512 503fd3672ae22a468ae6ec71a62b3113dc3df2e5bed4b90b641320d954c563118eb53b8681ad38edaff5a87a385fb063592ac422c24c2150084e0171f4f17d25 WHIRLPOOL c9647a95daf02350877d0d8024fb2cbaa9ca3b07b01c09866d4816bb0651b12f0f5bcf8840eceff45e7982e218809c744c1d806e45993b05e01daeaf49ff3912
+AUX xloadimage-4.1-include-errno_h.patch 303 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a SHA512 208261855d1677a755e34b421bbb4f95cbbe1d9d494cb3c895e9f799a376f2162a3f8e08134b06029da5acd318c873c798bd2c64eaf0aaf1d0e2970a56f4ef2f WHIRLPOOL 842fb9b785ec6e748c1f14eb7e8893a511505170a26a17ee59f57cca6178a75d14e538b8bc556c354d29af02903de7e632d3bafaa398ced484bc28563946ef25
+AUX xloadimage-4.1-ldflags_and_exit.patch 775 SHA256 f2b80e39246e495a5118f27e815cb8100b9619184580d35696c512a0d81b55fb SHA512 724484e06868c818c6c66cfdca9b07972da6c6b7977da9dad4e05109506751641e211dd34a9afbf925fed712ed046764362856079dda11b628b32fe3f6813f59 WHIRLPOOL 184250574f7c521f2fc657ee39e3978b4fec9c7aa65686f8b2c157ad5008e01cc630c5f16e5d4005a70b3bae0a337b7f32979e18d4dad9a34dfb16f3cfa97b5a
+AUX xloadimage-4.1-libpng15.patch 747 SHA256 c0d30c64354d4261c3218b23498ae41f43215b875688a4c0d1efc3c6c12736fa SHA512 3a96676237388d9da6c05c654db33c862c02858d8e0b352461d25c5dd21128306ec7e492fbd6a20f6af6adb20070c9e9cfdd366803a747697f334955e11f5bb6 WHIRLPOOL 94a1cf48992629a362e81c9fcd2000ba3c6e835d0ab941a04f4832df2ce482079498692b69f2f10ff558e302c679bcc33845ba8095c22a66d389cf557813f424
+AUX xloadimage-4.1-unaligned-access.patch 1730 SHA256 35548e5242d32f66e7175c090af4b2df5ee6f20f51d7e7f83a9f430af568f6c9 SHA512 4861c805a4bca2cec81fa2e7de44838e8451f08a2e1d189cf9a27e1c078d1ae0403fda3ab9c8ad44187db4fd5078d088f755eef16fbe00d55c02e0c54a5be139 WHIRLPOOL 3eb1ece5e5b22bea1f1773d8a3223eb4cb6f8d99d007e193c7c4f10c57392199d0b786449d940c6c9274ac3cce3ab3a8384af6e9ff7b507039cbfce783fff24d
+AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 SHA256 253064f5eebcd6c1c318b9637f1010657927b5f65be59581ef37523a50f3601e SHA512 38e449e005d84a5e93c1a1ef71929a4002b9dfb94d1ad785714f572e4adb0313722620947c091dc5ea2a73fe5d01d321f21259be9ff0770052f5f5ad13c727d6 WHIRLPOOL df48e877ca3d58b3607ad803f519a8b40a872d17f08a2c14dbeeeb7a0db43a353b40a6a6af721219eaf18afd65d051dcbb9aa7ee91e5df3fc0c55325e1442060
+AUX xloadimage-gentoo.patch 8956 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b WHIRLPOOL 14265bae04c592f0ee5d497ac70c0e0e52ae0757bb203c5614d7e699c43a2985879a990023d3ba088106632822cc77e8c3f646f03844edeede7fa881aedbd096
+DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 SHA256 addfd04c0a5667bb9c3f4ae6a9da35a443776086e30b84b2c3afa5eac161144a SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 WHIRLPOOL 6141e5f38c1b8435375021181321658b86140f28189d2d31d93ea7d23b6f6c4cd62a428b946ca35428c00cb4fcc10015a0948cda1238926a530ee9f00744f0b9
+DIST xloadimage.4.1.tar.gz 596021 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 WHIRLPOOL 65ca85500a8171d95a56b5550951f6b64ad6176a48370ed41b6919cd92dde366235cf2df86fc093847102eccf6659aef1f747e32f02af97e90389cfbdc683a14
+EBUILD xloadimage-4.1-r11.ebuild 2687 SHA256 0cc16553296d9ab57ef33f1714b7aa46e049a319888b7b7237a54d60c04db959 SHA512 0f3515bff15622c2c9eca2150028a33b620830edf8fd3386eef6491698172d17e03ddf6885267704cd2f87ae66be0b392cc98927a6815c0de67b049746cbffd1 WHIRLPOOL bcad641b9e329f7a07138691304b63b4a334ef1164add558b0478271bf2c4cc2bc110ab8605cba21a41c2faa5c1470afc402942d8dfd1dae91b34ae2e7328397
+MISC ChangeLog 10181 SHA256 85217566a49975fa6f7799f1367a244b645fadbfb033225b8a21dce183a1482b SHA512 d0a5402497a501e63a91562a8d36e4aeb62874f1a5da7199e5cc85c638e5c29482bc40a0d6ee28649ab253e49327217184405c00a32cfe1ad5b0905f644baedc WHIRLPOOL 60b2eaf230dfbd702c1b9fbade06246e869e663c46b35645c56fe527c9e6a535ff674304b3d1dbad077f054035526fb543387d08de78d4409026da088e622e61
+MISC metadata.xml 163 SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 SHA512 ff4552bc5fce771795ba67e190fc9eb90ac70aaff219130e7ff9a36cde348cd4a771d8b61e158ce9390771d29e2e0ffe17618746ff1843b2af7322e0f21cdf2c WHIRLPOOL b0db778b8dab215f2790081db3d51586e43bbc790ab06f704ef4ddd6e83e90e53685d3483feff33ed1763945fca36e934e7813bff822713869d0d7f208678fb1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBAgAGBQJPHG4TAAoJEEdUh39IaPFNtSUH/1U8L92XRY2ZYagBzTBRoN2M
-PTn/OrRrG5vSTD86DZMj5EQ1AtrkUuz1EXx+ASIgPffx+/K/raOm9jypj87nBeBy
-TqZpq7cgBtm77v0KsxjkbdaH0KQeIsmsWxfx6tKwd3Xv+NEpF4QyvyhVvVbNIGKU
-EGlEgbn6YHoOumwydkCozfGpa3zLnU+Y0IQ+loOwXuI7qhiqNAN7pGGx5rBYOJdU
-CUpguVI3LyXKcaY7uv7l2Vpkt0j7jE59JxWFXcb+JKbExM15epyis7eQTidYY4Ff
-WOxmrmMNsY8uPD1FnKKbBT0dMCvaJYzI5ZQ6E7BKISXpF1Xgcg63IQpAGyd3gC4=
-=ttTO
+iQEcBAEBCAAGBQJUgi+iAAoJEOeBhlrCAAWG3JYH/RkWrmSANmhA8Ez227u/sX+f
+/YymNIq47gnNxIVyGmVpYM0+H3FatGOL3RqiX0cNrTubocyc3aWCgDsjKTQQTjW8
+R3ADD/C6Ds7XFSXD9aH6s+NopIBZ/bx5QQQMI+f7dsa2Vh2yYY6Z+OC9ccJW8FGt
+0qUustOIKcuwczRso5PUT6kfVMhYTV720rznS3y3GntTYtnLYMOL9GP6e1vW6vXn
+o/MlM4oyBQtWRq/YGta7cFw1w/MK8ZDuolIw6uvmR7GF7kyFlyAXBGEvntlCAKv/
+x9EemGauCJGXL0myw1IGKFMjh91vZojplFYTyCDl64dsJpxpR30ixBbBG83TTBo=
+=OwC4
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
index ba0238ed2df0..d264a8dc63e0 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.12 2012/01/22 20:16:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.13 2014/12/05 22:20:11 ottxor Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
@@ -46,6 +46,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-unaligned-access.patch
 	epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
 
+	sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in
+
 	epatch "${FILESDIR}"/${P}-libpng15.patch
 	sed -i \
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
@@ -69,6 +71,10 @@ src_configure() {
 		$(use_with tiff)
 }
 
+src_compile() {
+	emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage || die
+}
+
 src_install() {
 	dobin xloadimage uufilter || die