version bump (#96879)

(Portage version: 2.0.51.22-r1)

6 files changed, 31 insertions, 23 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 6744c8b44c8f..3770a804e484 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2005/05/01 17:27:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.23 2005/06/24 15:15:54 liquidx Exp $
+
+*gtkam-0.1.12 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> -gtkam-0.1.10.ebuild,
+  gtkam-0.1.11.ebuild, +gtkam-0.1.12.ebuild:
+  version bump (#96879)
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   gtkam-0.1.10-r1.ebuild:
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index 8b114b6b2c5b..6b015daa6474 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,11 +1,13 @@
-MD5 a0758989db76932f98389a8dcd18430d gtkam-0.1.11.ebuild 1334
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 921c28d9ed3661596942bf868de7aa5b ChangeLog 3170
 MD5 e6d8afefe8f00f75d111dcf610487f8f gtkam-0.1.10-r1.ebuild 1302
 MD5 097d013ffdb2b8e28924a630c35230f3 gtkam-0.1.10.ebuild 1281
+MD5 6692b68d3cf4cfde141f153126b6d7ab gtkam-0.1.11.ebuild 1333
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f94d16a1b960588b3ddb9ffd5cbc3baf gtkam-0.1.12.ebuild 1297
+MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10 64
+MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
 MD5 2cee4a75ae4dbbcd3345e16c18018ade files/gtkam-0.1.10-gtk24.patch 976
 MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
-MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10 64
 MD5 6113479df45c8e3a3818213705b5bc5a files/gtkam-0.1.11-gtk24.patch 1563
-MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
-MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
+MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12 64
diff --git a/media-gfx/gtkam/files/digest-gtkam-0.1.10 b/media-gfx/gtkam/files/digest-gtkam-0.1.10
deleted file mode 100644
index b409c3182bbf..000000000000
--- a/media-gfx/gtkam/files/digest-gtkam-0.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84f539c6cb3b2c364bc190f9339b4f7d gtkam-0.1.10.tar.gz 392478
diff --git a/media-gfx/gtkam/files/digest-gtkam-0.1.12 b/media-gfx/gtkam/files/digest-gtkam-0.1.12
new file mode 100644
index 000000000000..33939bcb0b34
--- /dev/null
+++ b/media-gfx/gtkam/files/digest-gtkam-0.1.12
@@ -0,0 +1 @@
+MD5 622170d414718a5ae11487a6af1e47cd gtkam-0.1.12.tar.gz 611323
diff --git a/media-gfx/gtkam/gtkam-0.1.11.ebuild b/media-gfx/gtkam/gtkam-0.1.11.ebuild
index 7e562aa0c66c..6a92f16b2650 100644
--- a/media-gfx/gtkam/gtkam-0.1.11.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.11.ebuild,v 1.8 2004/07/14 17:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.11.ebuild,v 1.9 2005/06/24 15:15:54 liquidx Exp $
 
 inherit eutils gnome2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libgphoto2-2.1.4
diff --git a/media-gfx/gtkam/gtkam-0.1.10.ebuild b/media-gfx/gtkam/gtkam-0.1.12.ebuild
index 30d789142a73..1eb060e10a35 100644
--- a/media-gfx/gtkam/gtkam-0.1.10.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.10.ebuild,v 1.10 2004/07/14 17:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12.ebuild,v 1.1 2005/06/24 15:15:54 liquidx Exp $
 
-inherit eutils
+inherit eutils gnome2
 
-IUSE="nls gnome jpeg"
+IUSE="jpeg nls"
 
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/proj/gtkam"
@@ -12,15 +12,15 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 RDEPEND=">=x11-libs/gtk+-2
-	>=media-libs/libgphoto2-2.1.1-r2
-	gnome? ( gnome-base/bonobo-activation
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2 )
+	>=media-libs/libgphoto2-2.1.4
 	jpeg? ( media-libs/libexif-gtk
 		media-libs/libexif )"
+	# commenting per bug #36684
+	#gnome? ( >=gnome-base/libbonobo-2
+	#	>=gnome-base/libgnomeui-2 )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -30,7 +30,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-norpm.patch
+	epatch ${FILESDIR}/${PN}-0.1.10-norpm.patch
 }
 
 src_compile() {
@@ -43,9 +43,9 @@ src_compile() {
 		&& myconf="${myconf} --with-exif" \
 		|| myconf="${myconf} --without-exif"
 
-	use gnome \
-		&& myconf="${myconf} --with-gnome --with-bonobo" \
-		|| myconf="${myconf} --without-gnome --without-bonobo"
+	#use gnome \
+	#	&& myconf="${myconf} --with-gnome --with-bonobo" \
+	#	|| myconf="${myconf} --without-gnome --without-bonobo"
 
 	econf ${myconf} `use_enable nls` || die
 	emake || die