Version bump.

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

5 files changed, 96 insertions, 17 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index e0aa7d8698bf..dba7195c6080 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xsnap
-# 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 $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.49 2014/05/12 17:21:09 jer Exp $
+
+*xsnap-1.5.15 (12 May 2014)
+
+  12 May 2014; Jeroen Roovers <jer@gentoo.org> xsnap-1.5.11.ebuild,
+  +xsnap-1.5.15.ebuild, +files/xsnap-1.5.15-root_name.patch:
+  Version bump.
 
 *xsnap-1.5.11 (04 Jun 2013)
 
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 8d75b31166d2..30606443d110 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX xsnap-1.5.10-prefix.patch 1301 SHA256 61504f3c0f08b27deb942d37a01c4e7cdb5f6534390ac9e03980e2edbde08288 SHA512 ed007a74951eec50b4cf832006e5b953b40b57770899ac870737b07eb86503e98d3416cb46efca099ca01c3a437c6e79b04f5f26ce4d907ed87ba02134cf4780 WHIRLPOOL 20c72703d9c86244fc6585d2390e64815f12c5f60a4a8722027b4df6e849b5e149fd8353b6fde503abd249c3c8cbb2d9207a2d2c89b9a4d03232dfc2d1c3f195
+AUX xsnap-1.5.15-root_name.patch 228 SHA256 bb970680732f81c9e50d4ce729556cfa60be75e39176f14e410c4d4c23bdb334 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1 WHIRLPOOL d65ecde00a441dc963563e7a68b0918d5faa7d26505664102f455b6dff6e086202f5122e04ba6de2cf2cd7dd81f11d75014d870adf02419a25b11c2664d7ef52
 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
+DIST xsnap-1.5.15.tar.bz2 46574 SHA256 e83cd5dc98fb682effd15db5a7423392236cf88f73fc98ca3972a2555c080fb9 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac WHIRLPOOL aeb8a26e92af4b6cb602d4d33293bca511c502443215b5cddb4f2185663481e3fd540df5d6ed73b6a640526e040129cb4c8698879f342faf38e03b173385d53c
 EBUILD xsnap-1.5.10.ebuild 1177 SHA256 2a8e2edb737627c51b08d4e70de2f8f3409a48a26b49407e6e7bfe24c8e44356 SHA512 66c4d542447f58acb929e0c720e16767d30054a33d07ef9b555433322c857116c11458f41804f517e81dcec6708b2d28edee297a94efe95ad5332c0518bdb7a3 WHIRLPOOL 2837d4b3a182bb786280a8d9e6a65ab37718a510e2fe3f017b32a33129b610be32f49bff97cdcf358e4b821faa88bc1e0a34943f0eaf5f33adca01557df849dc
-EBUILD xsnap-1.5.11.ebuild 1480 SHA256 dbeaa7f672768bf4cb80ead220b5ebc8fd665b15f6c4f2bc131f1b942d424fed SHA512 20be5e7f87acd83e8997985eb9c0f2fe4f478ab2a1f95e91999772e6510378ec004537f6032dc116f80053d74c60039a81c4bb116242c7b0868fce8a77201e67 WHIRLPOOL d6b609e0e23d7b9bf26b3d8fb420e2de5747643b1efa60af7519bfc89594bbf60e1be3ff12d4b08e159291f4d5984923987f159ae468e7628c38587b9ffb643d
-MISC ChangeLog 6835 SHA256 3a919adad1a4e77b1aafdad5da081b77593024d65d9f1f177e6b2bce91270051 SHA512 2c1df784609806b7769ea5209b1ee802650d9ee4d9ced6c9c42eedf49ce33132ce25970582c57d41ede69b552738855d31c16c16eb180d03f313df5444432c6c WHIRLPOOL a6ee7153b423e013796dfb0fd8d075a4e9f8067442f5802d5d30d52eedb768b3092b0cdfb636628cc407d51a6bf25e5a0ea79df3c9ea865d6dc358a36e04e38a
+EBUILD xsnap-1.5.11.ebuild 1376 SHA256 e3d727ced6996657e5bb9cd8369aa5871b8c44e492992aeaeaf26795a088dfa1 SHA512 0f679f406558a02b4b0a55cd3fdbb46a52b425932035f95e26fee3019fd490faccf1ac1c548ea38e415bfefb62a294678d04b98c7af6ae10b01331dcde0a0286 WHIRLPOOL 6deb39c5fa75e851a43a46f8b96de5e8802112e987a79f67a54ceea6cb3f6183d6ff5c2c4ebccd231ba643b825f5dfd55abff54b1e7232a3711fc422060c0dcc
+EBUILD xsnap-1.5.15.ebuild 1427 SHA256 d79e074d852986db4b722a643f01536aeca9f0f2554e560e86218ba1c2acf666 SHA512 8b418aeacc109d3ec209395aece2d66bd84463a6e8b014cb1eec8b49c2c0d18e968b760165c932bcc115ac344ed74eedb7445eeaf5a1e6c59fbd71dfacc9da29 WHIRLPOOL b6876b6b7353141d4efbae8a09bd8400a067cb22999ec2fadb33634b1e6b97e4a831c165b67cb8011cd5998775f537237e918b5f72aa8304576ce5b302ca941f
+MISC ChangeLog 7010 SHA256 ad5e37d98caf063ceb2f172feb9941d619b4240b10d183c14e25e0b2e7811b22 SHA512 b36221adc83b3a46da0f3af0234d7fb280b25ec5478665914d96db55ac2dd26c4c2f385fc121e359617fe229dcde8099a1d2645f16116aa650b90db84fe5c981 WHIRLPOOL 39aa08376e0b3fe1a216465abb173c93c3ce05069ef08862253892c3e1a851f890d42433ecc411f5d1d717509f26d18d74863f6cc52ce504040fff5ffc454bdb
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlGtROoACgkQVWmRsqeSphPaugCfUQzogW0hqM3ycrnB16lOAfha
-iHIAniK4M5WvwWM6Av3FHWV6YNaG8ruD
-=WWux
+iEYEAREIAAYFAlNxAwYACgkQVWmRsqeSphNzEQCfX9fJsANesoyaegI4/P83yPv5
+1HEAn1coDMTWle+uBTTcFwHHjHDnZzrM
+=dHPy
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch b/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch
new file mode 100644
index 000000000000..48076680f207
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch
@@ -0,0 +1,11 @@
+--- a/xsnap.c
++++ b/xsnap.c
+@@ -2254,7 +2254,7 @@
+ 	if (op_mode == 0)
+ 	    exitXsnap (NULL, NULL, snap_pixmap, copy_gc);
+ 
+-	if (!root_name)
++	if (*root_name == '\0')
+ 		strcpy(output_name, "(stdout)");
+ 
+ 	if (op_mode == 2) {
diff --git a/x11-misc/xsnap/xsnap-1.5.11.ebuild b/x11-misc/xsnap/xsnap-1.5.11.ebuild
index 3e6bc322606a..2d091c058441 100644
--- a/x11-misc/xsnap/xsnap-1.5.11.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.11.ebuild,v 1.1 2013/06/04 01:37:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.11.ebuild,v 1.2 2014/05/12 17:21:09 jer Exp $
 
 EAPI=5
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
 HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
@@ -36,7 +36,6 @@ DEPEND="
 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' \
@@ -62,8 +61,3 @@ src_compile() {
 	tc-export CC
 	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
 }
-
-src_install() {
-#	dodir /usr/share/man/man1
-	default
-}
diff --git a/x11-misc/xsnap/xsnap-1.5.15.ebuild b/x11-misc/xsnap/xsnap-1.5.15.ebuild
new file mode 100644
index 000000000000..9d1d3bdccd67
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.15.ebuild,v 1.1 2014/05/12 17:21:09 jer Exp $
+
+EAPI=5
+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/"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/libpng
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXpm
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/rman
+	dev-lang/perl
+	x11-misc/imake
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS Changelog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-root_name.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' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}