Fix building with GTK+-2.12 wrt #194680.

(Portage version: 2.1.3.11)

4 files changed, 71 insertions, 5 deletions

diff --git a/media-libs/libexif-gtk/ChangeLog b/media-libs/libexif-gtk/ChangeLog
index 0cbce4ca0bf9..17e4a9d00730 100644
--- a/media-libs/libexif-gtk/ChangeLog
+++ b/media-libs/libexif-gtk/ChangeLog
@@ -1,16 +1,18 @@
 # ChangeLog for media-libs/libexif-gtk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif-gtk/ChangeLog,v 1.27 2007/04/06 19:37:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif-gtk/ChangeLog,v 1.28 2007/10/04 14:54:09 drac Exp $
+
+*libexif-gtk-0.3.5-r2 (04 Oct 2007)
+
+  04 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  +files/libexif-gtk-0.3.5-gtk212.patch, +libexif-gtk-0.3.5-r2.ebuild:
+  Fix building with GTK+-2.12 wrt #194680.
 
   06 Apr 2007; Samuli Suominen <drac@gentoo.org> -libexif-gtk-0.3.5.ebuild,
   libexif-gtk-0.3.5-r1.ebuild:
   Stable on Alpha after discussing it with wolf31o2. Remove old completely
   broken version. Bug 167729.
 
-  06 Apr 2007; Samuli Suominen <drac@gentoo.org> libexif-gtk-0.3.5.ebuild:
-  Remove KEYWORDS except alpha from this completely broken ebuild so nobody
-  installs it be accident.
-
   06 Apr 2007; Peter Weller <welp@gentoo.org> libexif-gtk-0.3.5-r1.ebuild:
   Stable on amd64 wrt bug 167729
 
diff --git a/media-libs/libexif-gtk/files/digest-libexif-gtk-0.3.5-r2 b/media-libs/libexif-gtk/files/digest-libexif-gtk-0.3.5-r2
new file mode 100644
index 000000000000..f5e9d38f142d
--- /dev/null
+++ b/media-libs/libexif-gtk/files/digest-libexif-gtk-0.3.5-r2
@@ -0,0 +1,3 @@
+MD5 66948ee60eccab75e1f485d4f3aabbf2 libexif-gtk-0.3.5.tar.gz 396534
+RMD160 ffc590722b071bd8dc7173d9cd0fb7e4cb32c6b7 libexif-gtk-0.3.5.tar.gz 396534
+SHA256 d9b58f2f8524520829b19b11c550a3eb97d33d273a8033a41ba7d305c144bff9 libexif-gtk-0.3.5.tar.gz 396534
diff --git a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch
new file mode 100644
index 000000000000..1d5e581d1624
--- /dev/null
+++ b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch
@@ -0,0 +1,24 @@
+diff -ur libexif-gtk-0.3.5.orig/gtk-extensions/Makefile.am libexif-gtk-0.3.5/gtk-extensions/Makefile.am
+--- libexif-gtk-0.3.5.orig/gtk-extensions/Makefile.am	2004-10-17 17:57:31.000000000 +0300
++++ libexif-gtk-0.3.5/gtk-extensions/Makefile.am	2007-10-04 17:39:01.000000000 +0300
+@@ -1,7 +1,6 @@
+ INCLUDES =				\
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/intl		\
+-	-DGTK_DISABLE_DEPRECATED	\
+ 	$(GTK_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libgtk-extensions.la
+diff -ur libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.am libexif-gtk-0.3.5/libexif-gtk/Makefile.am
+--- libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.am	2004-10-17 16:48:35.000000000 +0300
++++ libexif-gtk-0.3.5/libexif-gtk/Makefile.am	2007-10-04 17:39:32.000000000 +0300
+@@ -3,8 +3,7 @@
+ 	-I$(top_srcdir)/intl				\
+ 	-I$(top_srcdir)/gtk-extensions			\
+ 	$(LIBEXIF_GTK_CFLAGS)				\
+-	-DG_LOG_DOMAIN=\"libexif\"			\
+-	-DGTK_DISABLE_DEPRECATED
++	-DG_LOG_DOMAIN=\"libexif\"
+ 
+ lib_LTLIBRARIES = libexif-gtk.la
+ 
diff --git a/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild b/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
new file mode 100644
index 000000000000..71c6a807c6c8
--- /dev/null
+++ b/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild,v 1.1 2007/10/04 14:54:09 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="GTK+ frontend to the libexif library (parsing, editing, and saving EXIF data)"
+HOMEPAGE="http://libexif.sf.net"
+SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=media-libs/libexif-0.6.12"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-confcheck.patch
+	epatch "${FILESDIR}"/${P}-gtk212.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nls)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog
+}