Add support for gentoo-prefix by patching IMakefile (bug #406193). Add ~amd64-linux keyword: tested on ubuntu 10.04.3 LTS.

Package-Manager: portage-2.2.0_alpha84-r1/cvs/Linux x86_64

4 files changed, 74 insertions, 6 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index 9dbf7eed46cd..aa3f228b6bd2 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xsnap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.43 2012/02/23 17:20:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.44 2012/03/08 02:25:12 binki Exp $
+
+  08 Mar 2012; Nathan Phillip Brink <binki@gentoo.org> xsnap-1.5.10.ebuild,
+  +files/xsnap-1.5.10-prefix.patch:
+  Add support for gentoo-prefix by patching IMakefile (bug #406193). Add
+  ~amd64-linux keyword: tested on ubuntu 10.04.3 LTS.
 
   23 Feb 2012; Brent Baude <ranger@gentoo.org> xsnap-1.5.10.ebuild:
   Marking xsnap-1.5.10 ppc for bug 404897
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index b21300aa8bcf..39b699b486e8 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,9 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX xsnap-1.5.10-prefix.patch 1303 RMD160 b8a37cf22a6cb0f7ab9befab1ddf6c1bca32687b SHA1 760d5344034df5a98ebaf9130855c05f2b201357 SHA256 c76e44a8fe700aa298f3e719d3354ce39710609756307e1b50b2cc92179345a3
 AUX xsnap-1.5.6-gentoo.patch 715 RMD160 50093255dafd83ca6498f6c9530bc777ccd1dfa4 SHA1 e04514e4b5f12ddc12ecceb4f1daa916c5571456 SHA256 bdfc3a0740c4eb08729d1884fc7483b26d2489039f9fc2fd8c8958c897cbe50b
 DIST xsnap-1.5.10.tar.bz2 54172 RMD160 2f04b5fd2c542c21a59a3671dc7e6f6327ab3d3e SHA1 f4c30e1dfbcb89c81532e32c35a9d1bff37cd645 SHA256 6839586dd3bdcef8c4fcc1e11d52716fb6a92b3a1d7613801f880da3b5ce332f
 DIST xsnap-1.5.6.tar.bz2 28470 RMD160 c812b5a145f8dfdba743a9132ab531b89f724184 SHA1 2583946538d1a31f79a45cd7862c3eb1e3db4d14 SHA256 964d8a4551e5d383f816656ae239c660ce462156b7804a599af5deee9e5c616a
 DIST xsnap-1.5.9.tar.bz2 43697 RMD160 8939dffda182d467255023d76afcee391c9e6509 SHA1 7ae67c37868b31461b92171b64b4ab8d370834be SHA256 2aeadc0c494a781d62a06b95cfe1ab94e9d91e0647e156589810da4e7725e712
-EBUILD xsnap-1.5.10.ebuild 1121 RMD160 4631afd2b614ec47ceaf1ef273afa0ca871887cc SHA1 65e75cbaf1aed411859efcf950b583f054ac982b SHA256 265b6700dd2ef18cfbb38aa9778dfb49cb242ae1c26d0986a96335e795e0cfa6
+EBUILD xsnap-1.5.10.ebuild 1181 RMD160 4e0a4226b7fb9c2a082a251450f90c0fd5c6e01a SHA1 7bc33679545ff76a908997c15792c6b7f93238b6 SHA256 e93261d3688828f3841a12276604dc7db68062e5ded9280d5a37434043921606
 EBUILD xsnap-1.5.6.ebuild 1157 RMD160 d6d1d0107276c8a3729094936afb5f5bfe26d281 SHA1 8c8fe2b155544d0661e6943984d562b4d91da2e6 SHA256 91c33d75fad99c5257d45f9a0551661356d94c99f4de8dc46b877fcf64e69a2f
 EBUILD xsnap-1.5.9.ebuild 1104 RMD160 165352a0897cc8cd58b1527e501844e532e8df32 SHA1 a460c753ea6f079310af1024dbab163aa2ac9020 SHA256 0d234c69f559bcfc73f7428add1607ca7e4c045ba14898cace28649eb20c7e0b
-MISC ChangeLog 5950 RMD160 1205e017d5c3cc904c394b598c48e1e975e009fc SHA1 635cc5ec197a6108a98fced1009ad3fce1561c42 SHA256 7d16ca8a465d1b50758c390236cfe28b575abe6c631528248423c802480c47a2
+MISC ChangeLog 6189 RMD160 05a45e09c80f67cf6d55762a85542de22e081c64 SHA1 51f728d718e666801d9935f3074d3403f6aa07c9 SHA256 453104a4be035187399358376734d39be63f4693172c13637d9f83658a2676a0
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPWBiPAAoJEHQ6UuhrqBBQAGIP/0hewaE3OaW2W3id18nfk8VI
+wGmRuizKQCCirDxZUANk0zQqhnqut7Ogea1PsHaIken0a9BRXpUGE1KkYdv1jqmx
+lHL3IH0tMa0UDMg3AfRjPyiugTF9PuUIR6rn2eSWI9tIF2fNMXwxmnGSbMBkDTNY
+qQa2BcIi5WDTidMxLyRSAUANyep3hWx7PB8TUgHtawyBk36okIuAIcjEMeGRNnKR
+5eWKhv9kB7PU7M9lKkmXz7A0BnMq99tYCLLNwBH/sM5WRWgLFNIlYfZ4+CNxZLTo
+GfhpQztt8hYkFbwwbU4ya5v5+JLjZK3LsSbx5yOsYpacRw3Sk0+v6z80rZviA5Gq
+RpHh8t2VOXf+V4yvlUWoZiK1dCA2IsJVGQ+tdIwRjoehnIqQbL/oUKguDi/qKtSp
+i7Lnp75OlqWIulyupt8UvRrdXEJPbpHo1XuNXQQGGTY/MHfOA07gyBwuHmJzDmG8
+HV6PgmDIJKH+bqjnzU56CiYpLwqXdSa8qFvajpCwiXffYhXrE/r4XUYCbr07Pr6r
+vUn0UftoQkhIUF1tDZRja8WcMuLPMk88ZIwGp0DrXDRElo5t950E/Dy+hdPBv1Zi
+UJTl6BhAPkKejnje7E6eckKXIA54GMeCbTTXqNB+1rOKwzvLprfZyQ98d5AXTtg0
+NEN4FWR1loBMQ03UMfF/
+=2ulB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
new file mode 100644
index 000000000000..638dc12d208f
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
@@ -0,0 +1,40 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix installation of xsnap on gentoo-prefix.
+
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -19,7 +19,6 @@
+ #       along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
+ CATALOGS="fr"
+-LOCALEDIR=/usr/share/locale
+ 
+ all:
+ 	for cat in $(CATALOGS) ; do msgfmt -o $$cat.mo -v $$cat.po ; done
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -37,9 +37,10 @@
+ /* This is the right link order [Steff] */
+ LOCAL_LIBRARIES = -lz $(XPMLIB) $(XFTLIB) $(PNGLIB) $(JPEGLIB) $(XLIB)
+ 
+-	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
++LOCALEDIR = $(SHAREDIR)/locale
++	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEEDIR)\"
+ 
+-#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
++#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 
+ ComplexProgramTarget(xsnap)
+ 
+@@ -55,8 +56,8 @@
+ install::
+ 	cp -f xsnap-ocr $(DESTDIR)/$(BINDIR)
+ 	chmod a+rx $(DESTDIR)/$(BINDIR)/xsnap-ocr
+-	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/usr/share/man/man1
+-	cd po ; $(MAKE) install
++	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/$(MANDIR)
++	cd po ; $(MAKE) LOCALEDIR='$(LOCALEDIR)' install
+ 
+ clean::
+ 	cd po ; $(MAKE) clean
diff --git a/x11-misc/xsnap/xsnap-1.5.10.ebuild b/x11-misc/xsnap/xsnap-1.5.10.ebuild
index 0a5290a4b0bf..fc397ab1e9f2 100644
--- a/x11-misc/xsnap/xsnap-1.5.10.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.10.ebuild,v 1.3 2012/02/23 17:20:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.10.ebuild,v 1.4 2012/03/08 02:25:12 binki Exp $
 
 EAPI=4
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
 HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 COMMON_DEPEND="
@@ -32,6 +32,8 @@ DEPEND="${COMMON_DEPEND}
 DOCS=( AUTHORS Changelog README )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-prefix.patch
+
 	xmkmf || die
 	sed -i \
 		-e '/ CC = /d' \