Mark 0.1.12 stable on amd64 x86. Add 0.1.12-r1 which re-enables gnome

support and fixes a doc error, thanks to Tobias Sager #61248
(Portage version: 2.0.51.22-r2)

6 files changed, 88 insertions, 19 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index f7d933a4fd4d..a57c99ab23dc 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.26 2005/08/26 21:46:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.27 2005/08/27 17:00:04 agriffis Exp $
+
+*gtkam-0.1.12-r1 (27 Aug 2005)
+
+  27 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/gtkam-0.1.12-helpdoc.patch, gtkam-0.1.12.ebuild,
+  +gtkam-0.1.12-r1.ebuild:
+  Mark 0.1.12 stable on amd64 x86. Add 0.1.12-r1 which re-enables gnome
+  support and fixes a doc error, thanks to Tobias Sager #61248
 
   26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtkam-0.1.12.ebuild:
   add ~alpha ~ia64
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index e5a9b7479174..068ec6601cb6 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 e6d8afefe8f00f75d111dcf610487f8f gtkam-0.1.10-r1.ebuild 1302
+MD5 d3e153654781d1ef0a761cca39cf2e5b gtkam-0.1.12.ebuild 1308
+MD5 3bd9f0ef8b3a06054c052936ccc14702 gtkam-0.1.12-r1.ebuild 1153
 MD5 47a8a0d22420b57489469f1b9397c367 gtkam-0.1.11.ebuild 1335
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 eb09e20c60f3b3ac237e8e91d6232157 ChangeLog 3653
-MD5 88536901a6b9652f77bad913bdafdc65 gtkam-0.1.12.ebuild 1310
-MD5 e6d8afefe8f00f75d111dcf610487f8f gtkam-0.1.10-r1.ebuild 1302
-MD5 6113479df45c8e3a3818213705b5bc5a files/gtkam-0.1.11-gtk24.patch 1563
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
 MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
 MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12 64
-MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
-MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 fa538ec70c797b9ea37efc0328c6703a files/gtkam-0.1.12-helpdoc.patch 788
 MD5 2cee4a75ae4dbbcd3345e16c18018ade files/gtkam-0.1.10-gtk24.patch 976
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDD42tBXaUFmZvwyMRAsqhAJ41zVNlqM5ZJ9dCPRo1tInhZHsJSgCgsa0u
-Gl0HZnksAS0Y7Bi5mtgxOQc=
-=HdPw
------END PGP SIGNATURE-----
+MD5 6113479df45c8e3a3818213705b5bc5a files/gtkam-0.1.11-gtk24.patch 1563
+MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12-r1 64
diff --git a/media-gfx/gtkam/files/digest-gtkam-0.1.12-r1 b/media-gfx/gtkam/files/digest-gtkam-0.1.12-r1
new file mode 100644
index 000000000000..33939bcb0b34
--- /dev/null
+++ b/media-gfx/gtkam/files/digest-gtkam-0.1.12-r1
@@ -0,0 +1 @@
+MD5 622170d414718a5ae11487a6af1e47cd gtkam-0.1.12.tar.gz 611323
diff --git a/media-gfx/gtkam/files/gtkam-0.1.12-helpdoc.patch b/media-gfx/gtkam/files/gtkam-0.1.12-helpdoc.patch
new file mode 100644
index 000000000000..6620e18cae83
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.1.12-helpdoc.patch
@@ -0,0 +1,20 @@
+--- gtkam-0.1.12/help/C/gtkam.xml	2004-04-27 12:38:53.000000000 +0200
++++ gtkam-0.1.12.new/help/C/gtkam.xml	2004-09-05 16:48:23.920881000 +0200
+@@ -183,7 +183,7 @@
+     		then press <keycap>Return</keycap>:</para>
+     		<para> 
+ 			<command>gtkam</command> 
+-			<!--FIXME comand line --switches -->
++			<!--FIXME comand line switches -->
+     		</para> 
+     		</listitem>
+     	</varlistentry>
+@@ -203,7 +203,7 @@
+ 		fileref="figures/gtkam_start_window.png" format="PNG"/> 
+ 	    </imageobject>
+ 	    <textobject> 
+-	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.
++	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.</phrase>
+ 	    </textobject> 
+ 	  </mediaobject> 
+ 	</screenshot> 
diff --git a/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild b/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild
new file mode 100644
index 000000000000..aa16057a3ac7
--- /dev/null
+++ b/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12-r1.ebuild,v 1.1 2005/08/27 17:00:04 agriffis Exp $
+
+inherit eutils gnome2
+
+IUSE="exif gnome nls"
+
+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="~alpha ~amd64 ~ia64 ~ppc ~x86"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=media-libs/libgphoto2-2.1.6
+	exif? ( media-libs/libexif-gtk media-libs/libexif )
+	gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 )"
+
+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}/${PN}-0.1.12-helpdoc.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_with exif) \
+		$(use_with gnome gnome) \
+		$(use_with gnome bonobo) \
+		--with-rpmbuild=/bin/false --without-gimp
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	rm -rf ${D}/usr/share/doc/gtkam
+	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
+}
diff --git a/media-gfx/gtkam/gtkam-0.1.12.ebuild b/media-gfx/gtkam/gtkam-0.1.12.ebuild
index 350911411533..86beab67c506 100644
--- a/media-gfx/gtkam/gtkam-0.1.12.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12.ebuild,v 1.3 2005/08/26 21:46:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12.ebuild,v 1.4 2005/08/27 17:00:04 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libgphoto2-2.1.6