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

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 48 insertions, 27 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/Manifest b/x11-misc/xsnap/Manifest
index bc77d2528910..8d75b31166d2 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xsnap-1.5.10-prefix.patch 1303 SHA256 c76e44a8fe700aa298f3e719d3354ce39710609756307e1b50b2cc92179345a3 SHA512 132eaf44b1bb6ea3c0b14534d8f370c9a9435e0d2bbfa2a00ff502afb1676c4035c5bd5efe1cf367b8285cfdf987c4463c3b79ae7adcc6bfe6d7e79850cb0eba WHIRLPOOL 8879bc5d61ed2486e59055391c39076bc46032520d9baf364862e815f585b93f36a78f1d105d6ec83d55f010c8112c912c2d37b47fd93315e586592c15c703fa
-DIST xsnap-1.5.10.tar.bz2 54172 SHA256 6839586dd3bdcef8c4fcc1e11d52716fb6a92b3a1d7613801f880da3b5ce332f
-DIST xsnap-1.5.9.tar.bz2 43697 SHA256 2aeadc0c494a781d62a06b95cfe1ab94e9d91e0647e156589810da4e7725e712
+AUX xsnap-1.5.10-prefix.patch 1301 SHA256 61504f3c0f08b27deb942d37a01c4e7cdb5f6534390ac9e03980e2edbde08288 SHA512 ed007a74951eec50b4cf832006e5b953b40b57770899ac870737b07eb86503e98d3416cb46efca099ca01c3a437c6e79b04f5f26ce4d907ed87ba02134cf4780 WHIRLPOOL 20c72703d9c86244fc6585d2390e64815f12c5f60a4a8722027b4df6e849b5e149fd8353b6fde503abd249c3c8cbb2d9207a2d2c89b9a4d03232dfc2d1c3f195
+DIST xsnap-1.5.10.tar.bz2 54172 SHA256 6839586dd3bdcef8c4fcc1e11d52716fb6a92b3a1d7613801f880da3b5ce332f SHA512 d82414d1d5a99eba692b32b30b434119b60567eb89b62b1ea3cb3dfbc9e71e2196ee6ca667a02bfdb8d27fd3ec6df3589fe97702fff9758d3139881b32697b55 WHIRLPOOL 6c7137f2544cf9cef566e5e269967d15562578c0010ba20db596b0581971142fe375c4f0b59a7fc6dcb6b3440e0e584eaf2784e7dfbcad3b67ae2f59f3c26706
+DIST xsnap-1.5.11.tar.bz2 46031 SHA256 9076bb1041921771e6d2bae374aa12296fe963897a9f2ad259b4922914b7c179 SHA512 41659d5e7608dfc16d020b3b4ac9452522922c0d0a0a240ce8fecf2aec35ed5d5f1ec01151204dc66eb24c68c29449e4ba2e8fe8f376de1089e8761f6c30513c WHIRLPOOL 343ae02b583d223ebefceeae2022665c9b4d703bc7a75d9526df7fc6e11d0f4f00d2cc2bcfc644dd3fbfbb1c07dcb3ac765307a922d9fd5d8fa68b1f5269003f
 EBUILD xsnap-1.5.10.ebuild 1177 SHA256 2a8e2edb737627c51b08d4e70de2f8f3409a48a26b49407e6e7bfe24c8e44356 SHA512 66c4d542447f58acb929e0c720e16767d30054a33d07ef9b555433322c857116c11458f41804f517e81dcec6708b2d28edee297a94efe95ad5332c0518bdb7a3 WHIRLPOOL 2837d4b3a182bb786280a8d9e6a65ab37718a510e2fe3f017b32a33129b610be32f49bff97cdcf358e4b821faa88bc1e0a34943f0eaf5f33adca01557df849dc
-EBUILD xsnap-1.5.9.ebuild 1103 SHA256 3a451e442aacd20675ab99a44e3b338c67abe203c15f4828b2d716b3e67cfc84 SHA512 54643871ab4180e581a49b1941a639f6acc337bddc027e861e85c7ac5bacac6a3010ab679c5bb0ff645c8cdf6700146f0ed1ef08d0f5dee70fc805995af1c497 WHIRLPOOL 0aca40f2be549396bdf5454e9c5c2122536cbdaf1f1bc43bb870e29149e1e6a42eaea47b0e8ed9a87154bf9604417317c47be3906f6232fce7d1786add0495a4
-MISC ChangeLog 6620 SHA256 620ce0b17f32f673c6893ad37618342cd99543631350c8a432e62ff6ed19d690 SHA512 9ee63f89826fbed2e18a7329941f4d1246a94f3850cf92bbb6338d8c97a133ee778386cccf1d3c92f8e7399a97eb62433cf824aeaaad4942b7c858df259d9b5c WHIRLPOOL 077e338a102c3b317dfa69dd2c9df17ecc12ae6c88751e70000202d5e06fa9342f6712b4ca00a99777fbd7184729430b535e2b69d52434b8c78c37a181d03473
+EBUILD xsnap-1.5.11.ebuild 1480 SHA256 dbeaa7f672768bf4cb80ead220b5ebc8fd665b15f6c4f2bc131f1b942d424fed SHA512 20be5e7f87acd83e8997985eb9c0f2fe4f478ab2a1f95e91999772e6510378ec004537f6032dc116f80053d74c60039a81c4bb116242c7b0868fce8a77201e67 WHIRLPOOL d6b609e0e23d7b9bf26b3d8fb420e2de5747643b1efa60af7519bfc89594bbf60e1be3ff12d4b08e159291f4d5984923987f159ae468e7628c38587b9ffb643d
+MISC ChangeLog 6835 SHA256 3a919adad1a4e77b1aafdad5da081b77593024d65d9f1f177e6b2bce91270051 SHA512 2c1df784609806b7769ea5209b1ee802650d9ee4d9ced6c9c42eedf49ce33132ce25970582c57d41ede69b552738855d31c16c16eb180d03f313df5444432c6c WHIRLPOOL a6ee7153b423e013796dfb0fd8d075a4e9f8067442f5802d5d30d52eedb768b3092b0cdfb636628cc407d51a6bf25e5a0ea79df3c9ea865d6dc358a36e04e38a
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxk48AAoJEFpvPKfnPDWzmRQH/2t6OuvDBPbCg0xteLQorh0z
-1I6i0dZ644R/6iPhgLZOFWebffjWtz9yVYqtbFl/VNB46r/pQVi8xSH6Woy8+v6h
-g9+yJC8NTOwoqpIoBqtmio0pZVoESQoyyn89giPBJeTbNRd70ICwUeVgSTt550pY
-IVz6UNXQZxrR6Qc87YW1BMcIwuNck6kGqtlq4uCtbTb3Z9Jx/9Tj61oUf8+Ln6V/
-6yPOn2xyIOscMeqNH2wxXxLpNs/cHmgOw2NMYfBT42joQvj8HKvMDxBvytVQJCus
-/lXc3XdWSjQgimQW2oRYnOFQ9kbiWMDoWeWBxrAKXI+1/mn7bZm13PxRryX2110=
-=YSML
+iEYEAREIAAYFAlGtROoACgkQVWmRsqeSphPaugCfUQzogW0hqM3ycrnB16lOAfha
+iHIAniK4M5WvwWM6Av3FHWV6YNaG8ruD
+=WWux
 -----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
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
 }