Version bump thanks to Jean-Pierre Demailly (bug #286053). Respect CC, LDFLAGS, CFLAGS. Use pkg-config.

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 92 insertions, 13 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index 56de5a56e407..6548c7d07b68 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xsnap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.32 2009/05/16 19:48:58 nelchael Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.33 2010/02/08 12:21:04 jer Exp $
+
+*xsnap-1.5.6 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> +xsnap-1.5.6.ebuild,
+  +files/xsnap-1.5.6-gentoo.patch:
+  Version bump thanks to Jean-Pierre Demailly (bug #286053). Respect CC,
+  LDFLAGS, CFLAGS. Use pkg-config.
 
 *xsnap-1.5.5 (16 May 2009)
 
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 723209b32039..55ed1cd9e4d8 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xsnap-1.5.6-gentoo.patch 715 RMD160 50093255dafd83ca6498f6c9530bc777ccd1dfa4 SHA1 e04514e4b5f12ddc12ecceb4f1daa916c5571456 SHA256 bdfc3a0740c4eb08729d1884fc7483b26d2489039f9fc2fd8c8958c897cbe50b
 DIST xsnap-1.5.2.tar.bz2 27629 RMD160 96f2d68f6a825155ace505b19f5072f5d4f4cf61 SHA1 cdbe9a31af498f8a3d2632768572a25f4e09b465 SHA256 cd426b2e88824648f2379051ad076e08f48091a53bbbb68607de466d46fdeecc
 DIST xsnap-1.5.5.tar.bz2 54433 RMD160 5465dbe31cb4c515a72797dfd97af532ac92396a SHA1 13be3a6ef96f5c806c459507d6052819c17d7165 SHA256 f9d067c2b9c13475c2148de540cd9fc919c7d120d1fc46710d2a3ffe214cbc06
+DIST xsnap-1.5.6.tar.bz2 28470 RMD160 c812b5a145f8dfdba743a9132ab531b89f724184 SHA1 2583946538d1a31f79a45cd7862c3eb1e3db4d14 SHA256 964d8a4551e5d383f816656ae239c660ce462156b7804a599af5deee9e5c616a
 EBUILD xsnap-1.5.2.ebuild 968 RMD160 e1a2cd38005a489de7ae8f86d910b1302b6e87d5 SHA1 8923558e021b693780253e9ab4ef99e5f901f4f1 SHA256 e75e927886765fec944a8a22d9fbcb5f64dde4fed2dca4ccd2b12dcc208f7631
 EBUILD xsnap-1.5.5.ebuild 995 RMD160 20aceb0f689dea28b15a764d9c34856fcb98d1f3 SHA1 5b3154deeefa38d7d84868e3ca05411ebdbd2764 SHA256 c5667be49447cd49f7f182bf32583ca5e21c028d055fd4e47ef8692d1a0e49b9
-MISC ChangeLog 4591 RMD160 e714c429420c50bac499c7b6e408feabe4339893 SHA1 2395084b8150945b6cabdf013d6c68b00bdad532 SHA256 07aefa64479456c9f3a1a58c20afeb49962d418d133917b2a8ae864ca00b0a88
+EBUILD xsnap-1.5.6.ebuild 1226 RMD160 9b8f664dbfbeb87ed170c57eada5a5843bcae5b8 SHA1 fac3ca572a0dead45d4247c41ae58a5df793f6af SHA256 e0072df2f5969e0db06852f134e0853c574d8e5493104e20c7195ec687659a96
+MISC ChangeLog 4826 RMD160 b9181193cfde84b93968c5f97fca322fd44bdc7e SHA1 9d8ac6efedd0049e4dc2ef39528961e658712ddb SHA256 f80a55858ad2f9035129518135f1420ce260196f0653f29f4d02d10974d49cfb
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoPGLAACgkQgo/w9rxVVVG0JwCeNKITJaoYYU+WIfLPYphaDLAJ
-8PMAoL8mBl00jXzeUA+g5RdDuUo66e56
-=Lgrs
------END PGP SIGNATURE-----
diff --git a/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch b/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch
new file mode 100644
index 000000000000..6e80e332a026
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.6-gentoo.patch
@@ -0,0 +1,29 @@
+--- xsnap-1.5.6/Imakefile.org	2009-09-23 08:51:44.000000000 +0200
++++ xsnap-1.5.6/Imakefile	2010-02-08 12:50:20.000000000 +0100
+@@ -1,6 +1,6 @@
+-   XPM_INCLUDES = -I/usr/X11R6/include/X11
+-         XPMLIB = -L/usr/X11R6/lib -lXpm
+-         PNGLIB = -lpng
++   XPM_INCLUDES = 
++         XPMLIB = $(shell pkg-config --libs xpm)
++         PNGLIB = $(shell pkg-config --libs libpng)
+         JPEGLIB = -ljpeg
+ /*
+    XPM_INCLUDES = -I/opt/xpm/include/X11
+@@ -25,13 +25,13 @@
+ ComplexProgramTarget(xsnap)
+ 
+ all::
+-	cd po ; make
++	cd po ; $(MAKE)
+ 
+ install::
+ 	cp -f xsnap_ocr $(DESTDIR)/$(BINDIR)
+-	cd po ; make install
++	cd po ; $(MAKE) install
+ 
+ clean::
+-	cd po ; make clean
++	cd po ; $(MAKE) clean
+ 	rm -f *stamp
+ 
diff --git a/x11-misc/xsnap/xsnap-1.5.6.ebuild b/x11-misc/xsnap/xsnap-1.5.6.ebuild
new file mode 100644
index 000000000000..a569c01f2564
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.5.6.ebuild,v 1.1 2010/02/08 12:21:04 jer Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	media-libs/libpng
+	media-libs/jpeg"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	app-text/rman
+	x11-misc/imake"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	xmkmf || die "xmkmf failed"
+	sed -i Makefile \
+		-e '/ CC = /d' \
+		-e '/ LD = /d' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		|| die "sed failed"
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install.man || die "make install.man failed"
+	dodoc README AUTHORS
+}