version bump plus gtk2.4 fixes (#45510)

5 files changed, 96 insertions, 4 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 27a4a4685ad2..cde47b2a72b2 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.14 2004/02/16 08:53:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.15 2004/03/28 18:11:49 liquidx Exp $
+
+*gtkam-0.1.11 (28 Mar 2004)
+
+  28 Mar 2004; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.11.ebuild,
+  files/gtkam-0.1.11-gtk24.patch:
+  version bump plus gtk2.4 fixes (#45510)
 
   16 Feb 2004; Dylan Carlson <absinthe@gentoo.org> gtkam-0.1.10-r1.ebuild:
   added ~amd64 keyword.
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index f6a09994275f..0aa4a5039bff 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,7 +1,10 @@
-MD5 19281743d388f54a518e4b62811cc17f ChangeLog 2100
+MD5 3f0b0b23b9e5a452522ed091a1eeb999 gtkam-0.1.11.ebuild 1312
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 3d0da176f0d0f90ac8105726fe6ae85b ChangeLog 2275
 MD5 c6edc786e5fdd7655413b5a28e4fa3da gtkam-0.1.10-r1.ebuild 1270
 MD5 5ec214f82c8f68e09994091f89e11134 gtkam-0.1.10.ebuild 1286
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10 64
+MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
 MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 6113479df45c8e3a3818213705b5bc5a files/gtkam-0.1.11-gtk24.patch 1563
+MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10 64
 MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
diff --git a/media-gfx/gtkam/files/digest-gtkam-0.1.11 b/media-gfx/gtkam/files/digest-gtkam-0.1.11
new file mode 100644
index 000000000000..1a5d67070eeb
--- /dev/null
+++ b/media-gfx/gtkam/files/digest-gtkam-0.1.11
@@ -0,0 +1 @@
+MD5 084e90e73179e9cac6664fd1b30e86d8 gtkam-0.1.11.tar.gz 611388
diff --git a/media-gfx/gtkam/files/gtkam-0.1.11-gtk24.patch b/media-gfx/gtkam/files/gtkam-0.1.11-gtk24.patch
new file mode 100644
index 000000000000..22053d375473
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.1.11-gtk24.patch
@@ -0,0 +1,25 @@
+diff -ur gtkam-0.1.11/src/Makefile.am gtkam-0.1.11.new/src/Makefile.am
+--- gtkam-0.1.11/src/Makefile.am	2004-01-13 07:08:20.000000000 +0000
++++ gtkam-0.1.11.new/src/Makefile.am	2004-03-28 17:59:32.525130400 +0000
+@@ -7,7 +7,6 @@
+  -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\"	\
+  -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\"		\
+  -DAPP_DATADIR=\"$(datadir)/\"		\
+- -DGTK_DISABLE_DEPRECATED			\
+  $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS)	\
+  $(BONOBO_CFLAGS)				\
+  $(GTKAM_GIMP_CFLAGS)
+Only in gtkam-0.1.11.new/src: Makefile.am~
+diff -ur gtkam-0.1.11/src/Makefile.in gtkam-0.1.11.new/src/Makefile.in
+--- gtkam-0.1.11/src/Makefile.in	2004-03-06 22:36:27.000000000 +0000
++++ gtkam-0.1.11.new/src/Makefile.in	2004-03-28 17:59:28.246780808 +0000
+@@ -106,7 +106,7 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ 
+-INCLUDES =   -I$(top_srcdir)/intl				 -DIMAGE_DIR=\"$(datadir)/images/gtkam\" 	 -DGTKAM_LOCALEDIR=\"$(datadir)/locale\"	 -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\"	 -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\"		 -DAPP_DATADIR=\"$(datadir)/\"		 -DGTK_DISABLE_DEPRECATED			 $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS)	 $(BONOBO_CFLAGS)				 $(GTKAM_GIMP_CFLAGS)
++INCLUDES =   -I$(top_srcdir)/intl				 -DIMAGE_DIR=\"$(datadir)/images/gtkam\" 	 -DGTKAM_LOCALEDIR=\"$(datadir)/locale\"	 -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\"	 -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\"		 -DAPP_DATADIR=\"$(datadir)/\"		 			 $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS)	 $(BONOBO_CFLAGS)				 $(GTKAM_GIMP_CFLAGS)
+ 
+ 
+ noinst_LIBRARIES = libgtkam.a
+Only in gtkam-0.1.11.new/src: Makefile.in~
diff --git a/media-gfx/gtkam/gtkam-0.1.11.ebuild b/media-gfx/gtkam/gtkam-0.1.11.ebuild
new file mode 100644
index 000000000000..c153436c2bac
--- /dev/null
+++ b/media-gfx/gtkam/gtkam-0.1.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.11.ebuild,v 1.1 2004/03/28 18:11:49 liquidx Exp $
+
+IUSE="nls gnome jpeg"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A frontend for gPhoto 2"
+HOMEPAGE="http://gphoto.org/proj/gtkam"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=media-libs/libgphoto2-2.1.1-r2
+	gnome? ( >=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2 )
+	jpeg? ( media-libs/libexif-gtk
+		media-libs/libexif )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.1.10-norpm.patch
+	epatch ${FILESDIR}/${P}-gtk24.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	myconf="--with-rpmbuild=/bin/false --without-gimp"
+
+	use jpeg \
+		&& myconf="${myconf} --with-exif" \
+		|| myconf="${myconf} --without-exif"
+
+	use gnome \
+		&& myconf="${myconf} --with-gnome --with-bonobo" \
+		|| myconf="${myconf} --without-gnome --without-bonobo"
+
+	econf ${myconf} `use_enable nls` || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	rm -rf ${D}/usr/share/doc/gtkam
+	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
+}