Version bump. Replace SHAREDIR as it does not mean /usr/share.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 40 insertions, 15 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index cc403c0957ad..e0aa7d8698bf 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2012/12/10 21:03:47 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.48 2013/06/04 01:37:39 jer Exp $
+
+*xsnap-1.5.11 (04 Jun 2013)
+
+  04 Jun 2013; Jeroen Roovers <jer@gentoo.org> -xsnap-1.5.9.ebuild,
+  +xsnap-1.5.11.ebuild, files/xsnap-1.5.10-prefix.patch:
+  Version bump. Replace SHAREDIR as it does not mean /usr/share.
 
   10 Dec 2012; Julian Ospald <hasufell@gentoo.org> -xsnap-1.5.6.ebuild,
   -files/xsnap-1.5.6-gentoo.patch, xsnap-1.5.9.ebuild, xsnap-1.5.10.ebuild:
diff --git a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
index 638dc12d208f..ac4f96f3fd75 100644
--- a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
+++ b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
@@ -19,8 +19,8 @@ Subject: Fix installation of xsnap on gentoo-prefix.
  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)\"
++LOCALEDIR = /usr/share/locale
++	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
  
 -#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
 +#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
diff --git a/x11-misc/xsnap/xsnap-1.5.9.ebuild b/x11-misc/xsnap/xsnap-1.5.11.ebuild
index 7b39939421e5..3e6bc322606a 100644
--- a/x11-misc/xsnap/xsnap-1.5.9.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.9.ebuild,v 1.3 2012/12/10 21:03:47 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.11.ebuild,v 1.1 2013/06/04 01:37:39 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE=""
 
 COMMON_DEPEND="
@@ -21,15 +21,34 @@ COMMON_DEPEND="
 	x11-libs/libXft
 	x11-libs/libXpm
 "
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+"
+DEPEND="
+	${COMMON_DEPEND}
 	app-text/rman
-	x11-misc/imake"
+	dev-lang/perl
+	x11-misc/imake
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS Changelog README )
 
 src_prepare() {
+#	epatch "${FILESDIR}"/${P}-prefix.patch
+	sed -i \
+		-e 's|/usr/share/locale|$(LOCALEDIR)|g' \
+		-e 's|/usr/share/man/man1|$(MANDIR)|g' \
+		-e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \
+		-e '21s|.*|LOCALEDIR = /usr/share/locale|' \
+		Imakefile || die
+	sed -i \
+		-e '/^LOCALEDIR=/d' \
+		po/Makefile || die
+
 	xmkmf || die
+
 	sed -i \
 		-e '/ CC = /d' \
 		-e '/ LD = /d' \
@@ -45,6 +64,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install.man
-	dodoc README AUTHORS
+#	dodir /usr/share/man/man1
+	default
 }