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

(Portage version: 2.2.0_alpha84-r1/cvs/Linux x86_64)

3 files changed, 51 insertions, 4 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/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' \