4 files changed, 124 insertions, 12 deletions
diff --git a/media-gfx/gliv/ChangeLog b/media-gfx/gliv/ChangeLog
index 1ebf4a16f808..9bdc81ee69bb 100644
--- a/media-gfx/gliv/ChangeLog
+++ b/media-gfx/gliv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gliv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.31 2009/11/25 22:18:55 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.32 2010/01/09 17:44:15 maekke Exp $
+
+  09 Jan 2010; Markus Meier <maekke@gentoo.org> gliv-1.9.6.ebuild,
+  +files/gliv-1.9.6-as-needed.patch:
+  fix building with forced --as-needed by Kacper Kowalik in bug #299464
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org> gliv-1.9.6.ebuild:
   amd64 stable, bug #286403
diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
index 790215724901..b49355c63b9c 100644
--- a/media-gfx/gliv/Manifest
+++ b/media-gfx/gliv/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gliv-1.9.6-as-needed.patch 2864 RMD160 a20295817d1c5bd5ada138e9155d4ec023a3ca23 SHA1 543110da0bf2865877fe77afd2c0d4cafea19a15 SHA256 7a2a5a4016c957f7f7ab21ac905c4b73d54c16c0e489e2daa34e2a759eb21ca3
 DIST gliv-1.9.6.tar.bz2 518971 RMD160 23424c5f96ee4c1f05fada5be6a60a9dcc2de781 SHA1 7c1b070eaf73d0884abddc19d287a7b938a5e4fe SHA256 aa0f3c780d5fca1eb393deaa5289c024bf3aba5b4f980fc90d4b444906534830
-EBUILD gliv-1.9.6.ebuild 939 RMD160 7aa736df027a925e7b27badab86c9b0b92341b4c SHA1 a61f99a338440284452445929b6a8338ec1ba9fe SHA256 5d7c2da8abda33e2f84a68ea925427c6fefd773c4843eced057e2a86fc9d471c
-MISC ChangeLog 4295 RMD160 aa8c43608059cbf4ff75479a1eeaa7e35589af36 SHA1 d3682ef27bfcd0834dcc2a2e77242a3a1e0cc33c SHA256 e7902a92d2abfbd78c98143b4e197eb8f05366c0f885f6baa44062b5d36baa04
+EBUILD gliv-1.9.6.ebuild 1021 RMD160 13a69c823b0a7435d41539271915a2165a0ed06f SHA1 a8a983b2f61113d55dbe4fb04d8829b8e37feb39 SHA256 c6181f2ab10411f8b6a1f66bdb34fb25d7d2fc9e2e33d7ec1792afd43adb6f1b
+MISC ChangeLog 4472 RMD160 abc5cb532bdb01291822e3934a1caefb453ca67c SHA1 b20b53c55053818ec47fa967a11f3330a4da4345 SHA256 c82f85fe36b2dfacb3f805dd669a8aaf39ed085160f50605a9775f3841819bbc
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksNrWAACgkQkKaRLQcq0GLDKQCdGQSfDmdjqsiBBcuFcaCrvf3V
-ncAAn3zhOCKxuA0GMz9/B2cs7iuxAxJN
-=CDxc
+iEYEARECAAYFAktIwMgACgkQkKaRLQcq0GJ4kQCcCXdK5iOSPeGSfkIpe5/yruqo
++W8Anjz2ncHHLBpvijnfYgV5hJQrYzz7
+=kIcX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
new file mode 100644
index 000000000000..3128b99e4435
--- /dev/null
+++ b/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
@@ -0,0 +1,99 @@
+--- gliv-1.9.6.orig/configure.ac	2005-09-21 23:05:57.000000000 +0200
++++ gliv-1.9.6/configure.ac	2010-01-03 15:51:41.464539460 +0100
+@@ -16,18 +16,17 @@
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+-
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ # Default CFLAGS.
+-if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
+-  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
+-fi
+-CFLAGS="$CFLAGS -I${srcdir}/../lib"
++#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
++#  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
++#fi
++#CFLAGS="$CFLAGS -I${srcdir}/../lib"
+ 
+ # Checks for LFS flags, we may not handle big files, but it doesn't hurt.
+ AC_SYS_LARGEFILE
+ 
+-
+ AC_DEFUN([CHECK_MATH],
+          [OLD_CFLAGS="$CFLAGS"]
+          [CFLAGS="$CFLAGS -w"]
+@@ -127,35 +126,22 @@
+ 
+ # Checks for X.
+ AC_PATH_XTRA
+-CFLAGS="$X_CFLAGS $CFLAGS"
+-LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
+ 
+ # Checks for GtkGLExt.
+ PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
+-CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
+-LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
+ GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
+ 
+ # Checks for OpenGL.
+-AC_TRY_LINK([#include "GL/gl.h"],
+-            [glBegin(GL_QUADS);],
+-            [ogl="yes"],
+-            [ogl="no"])
+-
++AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
+ if test "x$ogl" = "xno"; then
+  AC_MSG_NOTICE([maybe libGL requires libpthread...])
+- OLD_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -lpthread"
+- AC_TRY_LINK([#include "GL/gl.h"],
+-             [glBegin(GL_QUADS);],
+-             [],
+-             AC_MSG_ERROR([cannot use -lGL]))
++ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
+ fi
+ 
+ # Checks for gtk.
+ AM_PATH_GTK_2_0([2.6.0], [
+   CFLAGS="$GTK_CFLAGS $CFLAGS"
+-  LDFLAGS="$GTK_LIBS $LDFLAGS"
++  LIBS="$LIBS $GTK_LIBS"
+   GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
+  ], [exit 1], [gthread])
+ 
+@@ -163,9 +149,6 @@
+ ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
+ AM_GNU_GETTEXT_VERSION
+ AM_GNU_GETTEXT
+-CFLAGS="$CFLAGS -I../${srcdir}/intl"
+-LIBS="$LIBS $LIBINTL"
+-
+ 
+ AC_CONFIG_FILES([
+  Makefile
+--- gliv-1.9.6.orig/src/Makefile.am	2006-11-18 15:21:13.000000000 +0100
++++ gliv-1.9.6/src/Makefile.am	2010-01-03 15:48:45.765539472 +0100
+@@ -64,6 +64,9 @@
+ gliv_LDADD =        -L../lib -lreplacements
+ endif
+ 
++gliv_CFLAGS = @GTKGLEXT_CFLAGS@
++gliv_LDADD  = @GTKGLEXT_LIBS@
++
+ AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
+               -DSYSCONFDIR=\"$(sysconfdir)\"
+ 
+--- gliv-1.9.6.orig/po/Makefile.in.in	2006-11-18 15:21:13.000000000 +0100
++++ gliv-1.9.6/po/Makefile.in.in	2010-01-03 16:05:43.860539403 +0100
+@@ -29,7 +29,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+
diff --git a/media-gfx/gliv/gliv-1.9.6.ebuild b/media-gfx/gliv/gliv-1.9.6.ebuild
index ea7e95f31084..b1ca37e5ebb0 100644
--- a/media-gfx/gliv/gliv-1.9.6.ebuild
+++ b/media-gfx/gliv/gliv-1.9.6.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.6.ebuild,v 1.7 2009/11/25 22:18:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.6.ebuild,v 1.8 2010/01/09 17:44:15 maekke Exp $
+
+EAPI=2
+
+inherit eutils autotools
 
 DESCRIPTION="An image viewer that uses OpenGL"
 HOMEPAGE="http://guichaz.free.fr/gliv/"
@@ -19,11 +23,15 @@ DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		>=sys-devel/bison-1.875"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	eautoreconf
+}
+
+src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable nls) || die
-	emake || die "emake failed"
 }
 
 src_install() {