Fix underlinking wrt #369389. Thanks to Diego Elio Pettenò for reporting and Ted Tanberry for the patch.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 40 insertions, 24 deletions

diff --git a/media-gfx/xzgv/ChangeLog b/media-gfx/xzgv/ChangeLog
index 8e42fa7d772c..feb7385da58f 100644
--- a/media-gfx/xzgv/ChangeLog
+++ b/media-gfx/xzgv/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for media-gfx/xzgv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.39 2012/05/05 07:00:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.40 2014/02/15 12:53:32 ssuominen Exp $
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> xzgv-0.9.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
 
   13 Apr 2011; Tim Harder <radhermit@gentoo.org> -xzgv-0.9.ebuild:
-  Remove old.
+  old
 
   11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> xzgv-0.9.1.ebuild:
   x86 stable wrt bug #358525
@@ -26,12 +26,12 @@
   29 Feb 2008; Brent Baude <ranger@gentoo.org> xzgv-0.9.ebuild:
   Marking xzgv-0.9 ~ppc64 for bug 211488
 
-  05 Nov 2007; Samuli Suominen <drac@gentoo.org> xzgv-0.9.ebuild:
-  Keyword ~amd64.
+  05 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> xzgv-0.9.ebuild:
+  Keyword ~amd64
 
 *xzgv-0.9 (27 Oct 2007)
 
-  27 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  27 Oct 2007; Samuli Suominen <ssuominen@gentoo.org>
   +files/xzgv-0.9-asneeded-and-cflags.patch, +xzgv-0.9.ebuild:
   Second initial commit for bug 196597. Has been rewritten using GTK+-2.0 by
   new maintainer so threating it as new ebuild wrt keywords.
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
index 0974eee7934a..874255460733 100644
--- a/media-gfx/xzgv/Manifest
+++ b/media-gfx/xzgv/Manifest
@@ -1,5 +1,19 @@
-AUX xzgv-0.9-asneeded-and-cflags.patch 1063 RMD160 f7babe38b9fed2cad8c864fcb03f9b3b091785b6 SHA1 ba2cc19493b0a3fb7ec5a26b43b7e9f0649d35e9 SHA256 dd7b2e9c9b90c397710d876a2de5ae6766cee7ee7022bed34bafc0d4bf04fb5f
-DIST xzgv-0.9.1.tar.gz 163419 RMD160 ed388a4def87bf4b0c063e8f2bb61568f8ab68c0 SHA1 f88df5cc709996806313db73a41d607b3c865827 SHA256 f0b25ecb138d3f53ddc436679f9f7da03b48b503aaad6f271944ff6db91804e6
-EBUILD xzgv-0.9.1.ebuild 795 RMD160 bcffe0d54bc1011aee4775ef9224c885f2d4e6ae SHA1 0047642051ad936f67ca683e2f34bdc6034deb85 SHA256 54b265356dfd6c5bdebeed66c7377c48bb688c51aeb4ff71f7ae8e0ce39b814e
-MISC ChangeLog 1413 RMD160 2595beb0c3e002ef1e3daabda8866b72bb9861c5 SHA1 b457a2fabeb0a65abbc8969255a683ad85f7b458 SHA256 3dba7328867dc42ca000b4d72790acb37e7f329eeb98604f33156299e54da08a
-MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xzgv-0.9-asneeded-and-cflags.patch 976 SHA256 8021010c76d56d5e1ee26285dd9e483ae9b50bcf02b4043aff8ada75bc27003e SHA512 05fa8d01d86e5a3e4be7c7226ce21e041f80e9ea8beeaf57f9e4624237b87e39447c07019e8b6530681ed8583c370737f50583941ed939195553ce81110742af WHIRLPOOL 9bbc8727231747d9147c62e339645421d98335aceb0fc4ac2648f5f8d51b817e9e59899fd4abeeb316d772fe86dcaecb5dff1aa8cf4ed4ec41bff229040bb9ce
+DIST xzgv-0.9.1.tar.gz 163419 SHA256 f0b25ecb138d3f53ddc436679f9f7da03b48b503aaad6f271944ff6db91804e6 SHA512 e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361 WHIRLPOOL 19d0cb71cb4313ee5d3e90c5ce4377a5e6a4b7471c30eb511926e06a6fe8410594ce3587bc499204000095731ff2d5aaa7295f91d9123e77a0beb5a02a0c34e4
+EBUILD xzgv-0.9.1.ebuild 781 SHA256 f113acbbe4927530496db0dd39de147a981788ce689df18a422b53b83c597f11 SHA512 c94ce99b0218b89301d36fdf868660e1cd1e2ea8a3e538d1cf1ce78e4fa67c600c25e66e66ff78d6e7ca60f3a19198f2a1e79fad17d0d8c8aabc5121e5283dde WHIRLPOOL fba06cc7a0a144e23222ea2fcb61a34846efa34be118c0b246136e3faa15323fd5b62a6931ef742d5890d88446db381a8f3fc6d2d238b37070e1cde1f7523e29
+MISC ChangeLog 1417 SHA256 3cdd76888ec8bfc04c8adda6dd5d6a892d504dc1892b26f5a453124c3fcddf8f SHA512 fd8f0e9866192b303fdbfc65fb792a34cfdfe8f31826546070404089a5a19720dd82bb92a29e0759bff3187de5c10e00baf4c3f56217cb5f7a5567ee2cc0fdb8 WHIRLPOOL 9b51a34d8eb001a846edd2e6de2bcb4feaeb990a66d2f0695932a9df2c1290c4da5d31f19633c60828cf65fb00d8faaf07325d2c9e1731e217ba8acd6d2b8fce
+MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS/2LsAAoJEEdUh39IaPFNzPUIAIJ2uLTcPOquI7jQw6jKiqFm
+hNSsinT4vm5o+DJ/wqSTFEZcbOD84f2k/TMusFFEj1LEeIGdJ4LZ9pKg+X1Y/Lix
+QF9Dp0+hL7qQgZFtMONAbtUu6NDy5f/9ScMAzh5cn1ksWp596wwhXqTKZrp3wRHJ
+jhX3QB0IGMgoKRVZubyXCKTjdwQoP/2xl9iZN9fgZIP3p3JBkO/uKCbVRZuHVOpT
+6Fbd6lTNP+w75ZQ3yukCuwP6YKns6nOAOGNEAnP7m36it7hoojpOaqxvN4c8+1B1
+RsnOVZJKymebNGBnqpUKFHuUFdt8s/5/5oABJrUqtQG6t0p414d65317KHta8WA=
+=EF2f
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
index 945986e45b7e..8b3c671dbf8a 100644
--- a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
+++ b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
@@ -1,6 +1,7 @@
-diff -ur xzgv-0.9.orig/config.mk xzgv-0.9/config.mk
---- xzgv-0.9.orig/config.mk	2007-08-12 13:14:42.000000000 +0300
-+++ xzgv-0.9/config.mk	2007-10-27 19:56:25.000000000 +0300
+http://bugs.gentoo.org/500692
+
+--- config.mk
++++ config.mk
 @@ -7,7 +7,7 @@
  # This is likely to be what you'll want for most systems:
  #
@@ -10,15 +11,16 @@ diff -ur xzgv-0.9.orig/config.mk xzgv-0.9/config.mk
  
  # Set the awk interpreter to use for a script used while compiling.
  # (This should be a `new' awk, such as gawk or mawk.)
-diff -ur xzgv-0.9.orig/src/Makefile xzgv-0.9/src/Makefile
---- xzgv-0.9.orig/src/Makefile	2007-08-14 01:39:16.000000000 +0300
-+++ xzgv-0.9/src/Makefile	2007-10-27 19:54:01.000000000 +0300
-@@ -10,7 +10,7 @@
+--- src/Makefile
++++ src/Makefile
+@@ -9,8 +9,8 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
  include ../config.mk
  
- CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
 -LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+LIBS=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` `pkg-config --cflags x11`
++LIBS=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` `pkg-config --libs x11` -lm
  
  all: xzgv
  
diff --git a/media-gfx/xzgv/xzgv-0.9.1.ebuild b/media-gfx/xzgv/xzgv-0.9.1.ebuild
index 2c1aa06009fb..a03cc6385b80 100644
--- a/media-gfx/xzgv/xzgv-0.9.1.ebuild
+++ b/media-gfx/xzgv/xzgv-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.9.1.ebuild,v 1.5 2012/05/05 07:00:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.9.1.ebuild,v 1.6 2014/02/15 12:53:32 ssuominen Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Fast and simple GTK+ image viewer"
@@ -24,11 +24,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die
-	emake -C doc CC=$(tc-getCC) || die
+	emake CC="$(tc-getCC)"
+	emake -C doc CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake PREFIX="${D}/usr" install || die
+	emake PREFIX="${D}/usr" install
 	dodoc AUTHORS NEWS README TODO
 }