Scrollkeeper is not optional for correct installation. Fixing libgphoto dependency.

Package-Manager: portage-2.1.5_rc8

3 files changed, 39 insertions, 19 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 6380ea4bef42..7c1f433b64b4 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gtkam
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.47 2007/05/08 14:17:47 dang Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.48 2008/05/13 10:55:09 eva Exp $
+
+  13 May 2008; Gilles Dartiguelongue <eva@gentoo.org> gtkam-0.1.14.ebuild:
+  Scrollkeeper is not optional for correct installation.
+  Fixing libgphoto dependency.
 
   08 May 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/gtkam-0.1.12-as-needed.patch, gtkam-0.1.12-r2.ebuild:
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index a1a97c26894c..989c29243c6a 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkam-0.1.10-norpm.patch 398 RMD160 0c096f4868c8e80c53a4f4fd1787cc9fcbc4d018 SHA1 964c9b893bc4fb9287352099f4f1c89c73d085e6 SHA256 451fea04162545c3815254966dd473d515fb780b8094a6baa181d4cbe1748431
 AUX gtkam-0.1.12-as-needed.patch 1670 RMD160 8cc7bb7a560338abba95e5a2142102af9aedf93d SHA1 f9889c4953f8d50b916cac5ff138a68fa0b55001 SHA256 10e6f7e10688c3307aade8cde06822ac5678821fd483068d2f269f34a7175a94
 AUX gtkam-0.1.12-desktop-image.patch 269 RMD160 8f1c30bb2e4444aadcdfb451bbafd44d501f5e53 SHA1 1a27b6d501582c9c8f5340f357fca886bcdf824d SHA256 cd4b261603721d5766cf679ceddc4f860ac34ac928701b0a690e12bd8a329f26
@@ -7,6 +10,13 @@ AUX gtkam.png 4418 RMD160 57fafbbb197c03fa9aaa204eeb655a102a7248bf SHA1 caa74f56
 DIST gtkam-0.1.12.tar.gz 611323 RMD160 5de91892970ec54d334ef3ac574c025e1bbd4f92 SHA1 d8ca0755d9dec48338fcfb0c7e97c90962b6d627 SHA256 162c2073a03e2db03a32b9fae847000ae9a5e58a4f1552e8c0fadc7ddc6d3822
 DIST gtkam-0.1.14.tar.gz 1301806 RMD160 7cab97cf3da2a87b23d854e615ac9be9d5d47ae6 SHA1 7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba SHA256 58316e0f1c8d179480384cb81098bfdcfb62cc00f21fe6a446c50261fef1c383
 EBUILD gtkam-0.1.12-r2.ebuild 1292 RMD160 5a175d82e387bfd1e60d2c7849aacd6f9b1a5241 SHA1 552b14b1c10beacb824b517c5790c9baa37481cb SHA256 10b7cc1fd20bc95bd99595f2528a7c4347325bb738c455e4a6d41eead26d7466
-EBUILD gtkam-0.1.14.ebuild 1321 RMD160 b48b0d057f72e93770882965572e0553e2dd76a5 SHA1 ba7d26e929b33752f5d96a3bd43081d9fc21b6af SHA256 b54a658d5df1f941345ba4c47fc0c7d150bd2907952f3f1c937226c1bf08221e
-MISC ChangeLog 6836 RMD160 68621f4a14e4abaa1547ba765ace675bd58897bc SHA1 e75c91ce1f80ae0f51f9d33d0550ab72438097ee SHA256 84081844146aeaf06c38e99454e1ab33b9636883a6a643ec85be9cf8573617c5
+EBUILD gtkam-0.1.14.ebuild 1364 RMD160 51b28064a52f9bcb031c923a6c1cb57ddf7fe531 SHA1 cc1f14897eb97042783c4709d13388a4bb15e98c SHA256 61c3e823766a32444615f05c1a80d1c12d17f081c3afeae5786d432e408f775d
+MISC ChangeLog 6999 RMD160 fb28d5c6239bf25c75bef3cc70cffc4059d40e64 SHA1 8fc1c1b193029e6c35705d3f9b923ffdac98506b SHA256 b8a76c0588c1eedec8ab4e282005ff28c4804b07bf96cc543fc4cff7c8240a67
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgpc7MACgkQ1fmVwcYIWAZ/bwCg6G5YjBzo5TV30LDEaMhXOu+Y
+xdIAn1suCbqT2Vyibm0yDym7GyGnhPWA
+=oBsO
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gtkam/gtkam-0.1.14.ebuild b/media-gfx/gtkam/gtkam-0.1.14.ebuild
index f4b5f398473a..3335c3cef00e 100644
--- a/media-gfx/gtkam/gtkam-0.1.14.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.14.ebuild,v 1.3 2007/01/31 19:01:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.14.ebuild,v 1.4 2008/05/13 10:55:09 eva Exp $
 
 inherit autotools eutils gnome2
 
@@ -11,28 +11,32 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc gimp gnome nls"
+IUSE="gimp gnome nls"
+
+# FIXME: why is exif not optional ?
 
 RDEPEND=">=x11-libs/gtk+-2.0
-	>=media-libs/libgphoto2-2.2.0
+	>media-libs/libgphoto2-2.2.0
 	>=media-libs/libexif-0.3.2
 	media-libs/libexif-gtk
 	gimp? ( >=media-gfx/gimp-2 )
-	gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 )"
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-text/scrollkeeper )
+	app-text/scrollkeeper
 	nls? ( >=sys-devel/gettext-0.14.1 )"
 
 DOCS="ABOUT-NLS AUTHORS MANUAL NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} \
-		$(use_enable doc scrollkeeper) \
-		$(use_with gimp) \
-		$(use_with gnome) \
-		$(use_with gnome bonobo) \
-		$(use_enable nls) \
+	G2CONF="${G2CONF}
+		$(use_with gimp)
+		$(use_with gnome)
+		$(use_with gnome bonobo)
+		$(use_enable nls)
+		--disable-scrollkeeper
 		--with-rpmbuild=/bin/false"
 }
 
@@ -40,14 +44,16 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# The icon in the tarball is busted, so overwrite it
-	cp ${FILESDIR}/${PN}.png ${S}/${PN}.png
+	cp "${FILESDIR}"/${PN}.png "${S}"/${PN}.png
+
+	# Fix --as-needed, bug #169661
+	epatch "${FILESDIR}/${PN}-0.1.14-as-needed.patch"
 
-	epatch ${FILESDIR}/${PN}-0.1.14-as-needed.patch
 	AT_M4DIR="m4m" eautomake
 }
 
 src_install() {
 	gnome2_src_install
 
-	rm -rf ${D}/usr/share/doc/gtkam
+	rm -rf "${D}"/usr/share/doc/gtkam
 }