Version bump (bug #346767). Update to EAPI 4.

(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

4 files changed, 143 insertions, 1 deletions

diff --git a/media-gfx/gliv/ChangeLog b/media-gfx/gliv/ChangeLog
index 5ef054e73423..8ca7b1c1a21b 100644
--- a/media-gfx/gliv/ChangeLog
+++ b/media-gfx/gliv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gliv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.33 2011/03/12 10:11:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/ChangeLog,v 1.34 2011/05/24 22:36:34 radhermit Exp $
+
+*gliv-1.9.7 (24 May 2011)
+
+  24 May 2011; Tim Harder <radhermit@gentoo.org> +gliv-1.9.7.ebuild,
+  +files/gliv-1.9.7-as-needed.patch, +files/gliv-1.9.7-destdir.patch:
+  Version bump (bug #346767). Update to EAPI 4.
 
   12 Mar 2011; Tim Harder <radhermit@gentoo.org> gliv-1.9.6.ebuild:
   Use slot dep for gtk+ and remove unnecessary die for econf.
diff --git a/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch
new file mode 100644
index 000000000000..6998e5fd988d
--- /dev/null
+++ b/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch
@@ -0,0 +1,87 @@
+--- gliv-1.9.7.orig/configure.ac
++++ gliv-1.9.7/configure.ac
+@@ -17,18 +17,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"]
+@@ -128,35 +127,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])
+ 
+@@ -164,9 +150,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([ intl/Makefile
+  Makefile
+--- gliv-1.9.7.orig/src/Makefile.am
++++ gliv-1.9.7/src/Makefile.am
+@@ -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)\"
+ 
diff --git a/media-gfx/gliv/files/gliv-1.9.7-destdir.patch b/media-gfx/gliv/files/gliv-1.9.7-destdir.patch
new file mode 100644
index 000000000000..827c6adb10d8
--- /dev/null
+++ b/media-gfx/gliv/files/gliv-1.9.7-destdir.patch
@@ -0,0 +1,15 @@
+--- gliv-1.9.7/Makefile.am.orig
++++ gliv-1.9.7/Makefile.am
+@@ -31,9 +31,9 @@
+ 	@echo
+ 	@if desktop-file-install --help > /dev/null 2>&1; then              \
+ 	 echo "Installing the GLiv desktop file with desktop-file-install"; \
+-	 mkdir -p $(datadir)/{pixmaps,applications} || true;                \
+-	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                   \
+-	 desktop-file-install --vendor=gnome --dir=$(datadir)/applications  \
++	 mkdir -p $(DESTDIR)$(datadir)/{pixmaps,applications} || true;                \
++	 cp gliv.png $(DESTDIR)$(datadir)/pixmaps/gliv.png || true;                   \
++	 desktop-file-install --vendor=gnome --dir=$(DESTDIR)$(datadir)/applications  \
+                                              gliv.desktop || true;          \
+ 	else                                                                \
+ 	 echo "No desktop-file-install(1), skipping gliv.desktop";          \
diff --git a/media-gfx/gliv/gliv-1.9.7.ebuild b/media-gfx/gliv/gliv-1.9.7.ebuild
new file mode 100644
index 000000000000..31a7dcaf84ce
--- /dev/null
+++ b/media-gfx/gliv/gliv-1.9.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.9.7.ebuild,v 1.1 2011/05/24 22:36:34 radhermit Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="An image viewer that uses OpenGL"
+HOMEPAGE="http://guichaz.free.fr/gliv/"
+SRC_URI="http://guichaz.free.fr/gliv/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	virtual/opengl
+	>x11-libs/gtkglext-1.0.6"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/bison-1.875
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	 epatch "${FILESDIR}"/${P}-as-needed.patch \
+	 	"${FILESDIR}/${P}-destdir.patch"
+	 eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}