adopt package, fix underlinking wrt #403031

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 189 insertions, 23 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/Manifest b/media-gfx/pornview/Manifest
index f5a6058b0907..786b20f8a14e 100644
--- a/media-gfx/pornview/Manifest
+++ b/media-gfx/pornview/Manifest
@@ -1,11 +1,27 @@
-AUX pornview-0.2.0_pre1-4.diff 1613 RMD160 ff0ee5a7c4abb9a8ab77fec31dba0af2cae4c56e SHA1 ab1f851e71cc66f05adecea4d34f9513c30809c3 SHA256 2880da98fde9caad8c422558d9f85b30eaa854a85444417e8336430b673fa121
-AUX pornview-0.2.0_pre1-desktop-entry.patch 442 RMD160 e88c992f7fc53c731cd7800c52192ca3a6d07df9 SHA1 70a36d18947a562950bf8c53fefd622da6adf875 SHA256 03a67f65a122afcded52dc3e539e77ba591879069b83274d928a5d995726cb04
-AUX pornview-0.2.0_pre1-fix-array-boundaries.patch 451 RMD160 f0279bc2161927250900ff94bd9b501c49c26fc1 SHA1 9f1a1c5a007873842c56a390efb4b2851ca23eda SHA256 637ff0de51e7de5fce5cac9b955a36a4431299b78841d0484b1e2304467ee865
-AUX pornview-0.2.0_pre1-fix-segfault-comment.patch 611 RMD160 61427c138a138a64dcc4f9a317329857090e1c69 SHA1 7ac45c921401cf3acdc2cadd8b5097f2b64be45c SHA256 97d35e9813fa2744dab1dc40f38f82b61c03ee6c8ee08767a66e9bb2dbdfae34
-AUX pornview-0.2.0_pre1-libpng15.patch 255 RMD160 cc0ae007a8532e66dba7759a72270ef54d1ac2ae SHA1 b5351331827d1045075d9b3ce74cda366e5217e2 SHA256 4e8f60ed36bfee0b5df51254872e2b24c356193a7e5979339dcbb9cc7200b2c1
-AUX pornview-0.2.0_pre1-new-gtk-object-system.diff 2320 RMD160 dda1df23ba548e5d8e75e8d80ef9d36becb9608c SHA1 b5650b0d60e81da6bcbd6df0e6bbddc1f9d35481 SHA256 3ee556ad01d27f3166deed82bd2b14c42ef61548ee8dfe75c8541b7177920b60
-AUX traypatch.diff 15710 RMD160 5cdc5e7ad329eeac0a9359b1e0536f28b0d146ea SHA1 09a2bb140c672e499d2267dca0524d5f07a6ba13 SHA256 828f175a4942b795b131e4aa56966b1261a4899beb2e8a2f22ca137e533fffd7
-DIST pornview-0.2.0pre1.tar.gz 608864 RMD160 03a9d01235fafbfb9825da43e79fbfb66a2ecbfa SHA1 3a26412affac6e211da928cc471a4b1bbc55b2a0 SHA256 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9
-EBUILD pornview-0.2.0_pre1-r2.ebuild 1522 RMD160 12d44bb925dcef2c9d24bfdee8ad002721aaabde SHA1 e52ea706c8960c49316e6fb6d9c456c32c5965b1 SHA256 ef0a1c5d95ab5b48d85f282837b22263be78a77735501b185eb8a642a5cf09e0
-MISC ChangeLog 6227 RMD160 41af5e43f37008e044f85bdb009017db811bb4a7 SHA1 618e893f0a9d2d55fd6f890d247c282487b96632 SHA256 00d85e19ba035571a066b3b77bd2c1d70429083bac5afe592dfcef0f4168805c
-MISC metadata.xml 213 RMD160 1d3424257b05a0dcfb1b2c66972031de85911079 SHA1 36203d9f7f7446e087507cff18a8b7bf60c6903c SHA256 b46ce029025fdefca9eb3187359fbe5a4d2b322d411b67bb51aa1c9feb9deb92
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pornview-0.2.0_pre1-4.diff 1613 SHA256 2880da98fde9caad8c422558d9f85b30eaa854a85444417e8336430b673fa121 SHA512 83e054a52628f8062d18e3742ac739ce206e4f0a542a80cdcde4b630451bed39c11d9d0a4c6cc9b1e8243696b730aed301c50e6548310624e37d3a307f4cb19e WHIRLPOOL 481ffc3805c4cdb201809a8c5d46566a19bebdf810a5af9946c711aaae47e4e4339271e881128f6a5c8d69d3d165aa0a9b489d90c90315d7bf9608aee3873262
+AUX pornview-0.2.0_pre1-autoconf.patch 3446 SHA256 36e6ef334d26e3f4b117f84be3687ed1311abafe4ecb079fa1172a34b10bc6ac SHA512 32e0c294c8abd1b2a779751c4e24ed89f5bd64a07aa46d731f4d8953f33872cb467a6c7aa4c5f7b8e4d5580ad242da383ea545b8ec044cb783427e7e14361b88 WHIRLPOOL cb02bbf65551288c8cc8fbb86594ef92a2f88b183e9ff0539a105de3075a2848db741ea4f4c84d12443c9f3282d883d97bd447d24cfff335712610d03fca7458
+AUX pornview-0.2.0_pre1-desktop-entry.patch 442 SHA256 03a67f65a122afcded52dc3e539e77ba591879069b83274d928a5d995726cb04 SHA512 000b1dfd3b2c7533cd01a3c9b35f3d980186c39542f1f8f7de6b51b989e312ad311ceb4d44f47d238f5689f3ab6f1fad645bb65f44036cded1a563554845c4c3 WHIRLPOOL 4feb87fcd5a7db739745b50485df20025d37d3285198fa5793a15ba359d0f5e02639380fdcedfc06413fc3e62daeb22253c7fb99ce708d4416c40956acc4f179
+AUX pornview-0.2.0_pre1-fix-array-boundaries.patch 451 SHA256 637ff0de51e7de5fce5cac9b955a36a4431299b78841d0484b1e2304467ee865 SHA512 592fa2aa7c554f5d45f733f96063615eadc8bafcea803c98157a21342258aa4ac3cc01e027bcd3decf70c40e13d3688ed86b08e0d4efa7869b65ae2922bd59e1 WHIRLPOOL a1ef596eaa7e2e3250be2f91bfd62aac45c225d8d471bbbd8cfc5a1e948cdbda1da3a1d323d2d6ec60edc654755cd1e1fca4c108a9de94437fa0a9dd30d60a40
+AUX pornview-0.2.0_pre1-fix-segfault-comment.patch 611 SHA256 97d35e9813fa2744dab1dc40f38f82b61c03ee6c8ee08767a66e9bb2dbdfae34 SHA512 1621b8fc32c81f4a2ab630bd7c857a993dddb9343b4dcb1fd056655cf34af0c2197154a5a31bd6bf8c9c1f574262de416a34fc70da4bb2e56e656d46199106b2 WHIRLPOOL 567b2c2fa9b836e0895aadb9be0c37fd4effba4ca2d4f78f81f470822c3bce1f2960ed53f975bab43d9d400d2db2951bbd58e593099ab9186f67ffb7eb9399e7
+AUX pornview-0.2.0_pre1-libpng15.patch 255 SHA256 4e8f60ed36bfee0b5df51254872e2b24c356193a7e5979339dcbb9cc7200b2c1 SHA512 d5598b54fd65849d69c6b22aeb78458110544e152e8970fbc13150736cbce8dc8321177feeed408e3e83704427ed9c946cbb909bf9d791a6ca32f76389892ff0 WHIRLPOOL 3e43a33376e838edf741ccb79393f42930f236c990abae091dd2bbe2fe260f8f4584e50f230c49c563b826e2de968ebbe47392ed46e7b75da5a608d5889676c6
+AUX pornview-0.2.0_pre1-new-gtk-object-system.diff 2320 SHA256 3ee556ad01d27f3166deed82bd2b14c42ef61548ee8dfe75c8541b7177920b60 SHA512 690cd3d18982bbd2dbbae72a58fca028ae17c6503b5bd28d5b976ed1d58d74c52004a5e0c0841a3d8271820160202efad24dbd1e203ad1584f2a203dbb24d816 WHIRLPOOL d1dc54aa31e89b8c0ef568421e177c0e61d01966d5ba7c610dbb1fdbfc07c1210d979256e7a07d2aac214cf1d4aa13541dd9c8410e83d5dbe2128bf22c7e381b
+AUX pornview-0.2.0_pre1-underlinking.patch 781 SHA256 016b71e1aef98312183c5cfb8e8e3f0109df0c39ea7256cfe50daf8adc44b6e0 SHA512 7d8ea0355480eca2b4da755cad0c6f48b14bcbcec313811ee694fecdc4c88473ad2653a8bfab82db1a87f49e79d4f1e074972d6ced2e9b03a3f397ad2a01dda6 WHIRLPOOL 30afa53162771c33f67ba8a638a6b38fe310c9a42d10c13eab6d0ad39ef0cbecfe0f6848a59793300a6137d8f0cc2a4d6c6f65be3f06cedd5ffe255b7a09cbbf
+AUX traypatch.diff 15710 SHA256 828f175a4942b795b131e4aa56966b1261a4899beb2e8a2f22ca137e533fffd7 SHA512 1d638275f152ad3bd8456712025bac2d933fbbf1b66a5177b3269eec76628153cb255f9c5bbcde8792b6702a5a17eb1e6c89e2278dc5d4c2d2b401a4266d26f0 WHIRLPOOL 25e7e1b00e6c54eb1b73a5ddaec82f391b6733d6028c99555a6c8b6ce2cdd5d1627fce2bd18c7f903b617a3990aeb9e27b84e7bf2e84089417154224be4b6293
+DIST pornview-0.2.0pre1.tar.gz 608864 SHA256 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9 SHA512 083fedbecb0148ccc244acb3ab3a63cd31e9baaa2bac6c4771485089b9e28f17ed7ee32c02d0b98fee315e84c3427639dd638df838d1d91d2df79ff6213ff2b8 WHIRLPOOL 55d9c0105ab3e3996f6dca0f8b39faab2a278240c05ea1c4dceade65726bee4707ee62120ddd30e7ac6299ff25bf54fa841ca810cf28fdf5fe4e870cc784067a
+EBUILD pornview-0.2.0_pre1-r2.ebuild 1682 SHA256 69f037ea4e159b88eb2577e0ee20b62eeb9a3fafe85e94a75483cfb1ba8744f6 SHA512 0d793413828a91044ff4f50aedd0339963570841e674d669214734f72827609d24699d3b4c27d5906ce9895e9bef9b7ad4d9f394371364ab4f7a3583eca0ea6c WHIRLPOOL 12be659e778c4549887c48f9016ce662d016879b48b7c0daa0f637d3f8562e79d2bf347eac8c31de41cbf6631ace75de689f37597e7f9eb6ba2e419d51533fef
+MISC ChangeLog 6466 SHA256 360c31938c573614a8aea233b82532b3f4f0b95f61f067b8935663080ab8a0e2 SHA512 0e142ebd7bcaefaf8171d4782a15be16550afd31888e98bb409fdf7b324a0433c037b6169f27d025fdef88a7a637afce4390927957d61452b38d2cacb277972d WHIRLPOOL bcfd6cdf6bad8957d8570b4766b4d9abdc399e223ee2d572b2c0688f3f998bcc7beab655f0aab547dd16b879f069b070d89ec20dd98703ba22592bd444476dfa
+MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQjaxkAAoJEFpvPKfnPDWzCPYIAKpGinQrWh8ZnWfv4aGGi3Hi
+3luuLJFzf9pqqSXhHj3o+xJrQWHWwH6+8Y89LFeazXnBYNSPM520JrhqCOCy1res
+MaYlWFcBd0G+oyBivA9U5RQMzbbnxDsI/0ZSV1D9rc9/eaPn1XVb8rvPR4UyR72X
+eva342q7MJgci9pi1mshlxkipezY8stgKHF97xTBGCQaRh17XfY8BRFrd9714Sk2
+UpZ9j2tFPdhjh4kWS1Fl3wh0joB9XPimtCRoa5QrvGczRUVZWVYWl48GvFICE9ZU
+oBVHJMvckhFy7WUlJWcDxuGyDXXlCrzo1XqVGY5ynrZCbDWGUyl6jp40+lmoTcM=
+=gxa6
+-----END PGP SIGNATURE-----
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)
 }