Version bump.

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

4 files changed, 87 insertions, 11 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/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}"
+}