adopt package, fix underlinking wrt #403031

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 162 insertions, 12 deletions

diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 329ae67623f8..c9834eb99f50 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pornview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.47 2012/05/05 07:00:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.48 2012/10/28 22:06:24 hasufell Exp $
+
+  28 Oct 2012; Julian Ospald <hasufell@gentoo.org>
+  pornview-0.2.0_pre1-r2.ebuild, +files/pornview-0.2.0_pre1-autoconf.patch,
+  +files/pornview-0.2.0_pre1-underlinking.patch, metadata.xml:
+  adopt package, fix underlinking wrt #403031
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> pornview-0.2.0_pre1-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch
new file mode 100644
index 000000000000..980f0366475c
--- /dev/null
+++ b/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch
@@ -0,0 +1,118 @@
+--- configure.in
++++ configure.in
+@@ -38,10 +38,6 @@
+ dnl ******************************
+ dnl required library version
+ dnl ******************************
+-GLIB_REQUIRED=1.2.10
+-GTK_REQUIRED=1.2.10
+-GDK_PIXBUF_REQUIRED=0.16.0
+-XINE_OLD_REQUIRED=0.9.9
+ XINE_REQUIRED=1.0.0
+ 
+ AC_SUBST(GLIB_REQUIRED)
+@@ -63,31 +59,20 @@
+ dnl ******************************
+ dnl Check for GTK
+ dnl ******************************
+-enable_gtk2=no
+-AC_ARG_WITH(gtk2,
+-   [  --with-gtk2             Use Gtk+-2.0 (experimental) [default=no]],
+-   [enable_gtk2="${withval}"], [enable_gtk2=no])
+-if test "$enable_gtk2" = yes; then
+-   AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+-   PKG_CHECK_MODULES(GTK, [
+-      glib-2.0 >= $GLIB2_REQUIRED
+-      gmodule-2.0 >= $GMODULE2_REQUIRED
+-      gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
+-      gtk+-2.0 >= $GTK2_REQUIRED
+-   ], ,[
+-      AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
+-   ])
+-   AC_SUBST(GTK_CFLAGS)
+-   AC_SUBST(GTK_LIBS)
+-   AC_DEFINE(USE_GTK2)
+-   AC_DEFINE(USE_NORMAL_PANED)
+-   AC_DEFINE(ENABLE_TREEVIEW)
+-else
+-   AM_PATH_GTK($GTK_REQUIRED, ,
+-      AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help))
+-   AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED, ,
+-     AC_MSG_ERROR(gdk-pixbuf 0.16.0 or higher is required))
+-fi
++AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
++PKG_CHECK_MODULES(GTK, [
++   glib-2.0 >= $GLIB2_REQUIRED
++   gmodule-2.0 >= $GMODULE2_REQUIRED
++   gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
++   gtk+-2.0 >= $GTK2_REQUIRED
++], ,[
++   AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
++])
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
++AC_DEFINE(USE_GTK2)
++AC_DEFINE(USE_NORMAL_PANED)
++AC_DEFINE(ENABLE_TREEVIEW)
+ 
+ enable_normal_paned=no
+ AC_ARG_WITH(normal-paned,
+@@ -158,45 +143,20 @@
+    [enable_xine=yes], [enable_xine="${enableval}"])
+ 
+ if test "$enable_xine" = no; then
+-AC_ARG_ENABLE(xine_old,
+-   [  --enable-xine-old       Enable Xine library 0.9.x for movie [default=no]],
+-   [enable_xine_old=yes], [enable_xine_old="${enableval}"])
+-
+-if test "$enable_xine_old" = no; then
+ AC_ARG_ENABLE(mplayer,
+    [  --enable-mplayer        Enable MPlayer for movie [default=no]],
+    [enable_mplayer=yes], [enable_mplayer="${enableval}"])
+ fi
+-fi
+ 
+ MOVIELIB_CFLAGS=""
+ MOVIELIB_LIBS=""
+ 
+ dnl ****************************
+-dnl Check for Xine library 0.9.x
+-dnl ****************************
+-if test "$enable_xine_old" = yes; then
+-   have_xine=no
+-   AM_PATH_XINE($XINE_OLD_REQUIRED,
+-      [have_xine=yes], [have_xine=no])
+-   if test "$have_xine" = yes; then
+-      MOVIELIB_CFLAGS=${XINE_CFLAGS}
+-      MOVIELIB_LIBS=${XINE_LIBS}
+-      AC_DEFINE(ENABLE_XINE_OLD)
+-      AC_DEFINE(ENABLE_MOVIE)
+-      movie_support="Xine 0.9.x"
+-   else
+-      AC_MSG_WARN(Did not find xine-lib installed)
+-      enable_xine=no;
+-   fi
+-fi
+-
+-dnl ****************************
+ dnl Check for Xine library
+ dnl ****************************
+ if test "$enable_xine" = yes; then
+    have_xine=no
+-   AM_PATH_XINE($XINE_REQUIRED,
++   PKG_CHECK_MODULES(XINE, libxine,
+       [have_xine=yes], [have_xine=no])
+    if test "$have_xine" = yes; then
+       MOVIELIB_CFLAGS=${XINE_CFLAGS}
+@@ -241,11 +201,6 @@
+ localedir="\${datadir}/locale"
+ AC_SUBST(localedir)
+ 
+-dnl *******************
+-dnl for libcharset
+-dnl *******************
+-AM_LIBCHARSET
+-
+ dnl ******************************
+ dnl enable/disable EXIF support
+ dnl ******************************
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch
new file mode 100644
index 000000000000..4dcf527657c3
--- /dev/null
+++ b/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Oct 28 20:22:14 UTC 2012
+Subject: build system
+
+	fix underlinking
+	https://bugs.gentoo.org/show_bug.cgi?id=403031
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -52,7 +52,7 @@
+ pornview_LDFLAGS = \
+ 	-export-dynamic
+ 
+-pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
+-	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) \
+-	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
+-	support/libsupport_utils.la $(LIBEXIF)
++pornview_LDADD = prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
++	support/libsupport_utils.la $(LIBEXIF) \
++	$(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
++	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS)
diff --git a/media-gfx/pornview/metadata.xml b/media-gfx/pornview/metadata.xml
index f031b496edeb..bfabcd0164b9 100644
--- a/media-gfx/pornview/metadata.xml
+++ b/media-gfx/pornview/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
 </pkgmetadata>
 
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
index 29954604c588..c5a6901b1d71 100644
--- a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
+++ b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.8 2012/05/05 07:00:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.9 2012/10/28 22:06:24 hasufell Exp $
 
 EAPI=3
-inherit eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies."
+DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
 HOMEPAGE="http://pornview.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
 
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 -hppa ppc x86"
 IUSE="exif nls"
 
-RDEPEND="media-libs/libpng
+RDEPEND="
+	media-libs/libpng:0
 	virtual/jpeg
-	exif? ( media-gfx/exiv2 )
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+	exif? ( media-gfx/exiv2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -32,19 +33,23 @@ src_prepare() {
 		"${FILESDIR}"/${P}-new-gtk-object-system.diff \
 		"${FILESDIR}"/${P}-fix-array-boundaries.patch \
 		"${FILESDIR}"/${P}-fix-segfault-comment.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-underlinking.patch \
+		"${FILESDIR}"/${P}-autoconf.patch
 
 	# $X_LIBS fails to bring in -lX11 and the build fails with undefined
 	# references with strict linker
 	sed -i -e 's:view_LDADD =:view_LDADD = -lX11 -lm:' src/Makefile.{am,in} || die
 	#Bug 325879
 	sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }
 
 src_configure() {
 	tc-export CC
 	econf \
-		--with-gtk2 \
 		$(use_enable exif) \
 		$(use_enable nls)
 }