Ebuild cleanups

Package-Manager: portage-2.1_pre3-r1

3 files changed, 19 insertions, 20 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 7ec593743a6a..11f5a66534fe 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.32 2006/01/07 20:39:58 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.33 2006/01/08 03:26:29 compnerd Exp $
+
+  08 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gtkam-0.1.12-r2.ebuild:
+  Fixing up scrollkeeper collisions by taking advantage of the GNOME-2 eclass
 
 *gtkam-0.1.12-r2 (07 Jan 2006)
 
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index c9dd7df2b4eb..c2f2737f6d83 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,4 +1,4 @@
-MD5 d87b34152d9bfdca13366d1e4c098be7 ChangeLog 4584
+MD5 b80c79ff7017fb612e1e73c4270da04f ChangeLog 4745
 MD5 a1c4a2f9990b3356ce169554c82dd2f6 files/digest-gtkam-0.1.10-r1 64
 MD5 d37596d611b2b5fe213cf911c5988211 files/digest-gtkam-0.1.11 64
 MD5 9895bd6e825868f9d33ec407108e7d50 files/digest-gtkam-0.1.12 64
@@ -12,6 +12,6 @@ MD5 fa538ec70c797b9ea37efc0328c6703a files/gtkam-0.1.12-helpdoc.patch 788
 MD5 e6d8afefe8f00f75d111dcf610487f8f gtkam-0.1.10-r1.ebuild 1302
 MD5 47a8a0d22420b57489469f1b9397c367 gtkam-0.1.11.ebuild 1335
 MD5 40928e4f954bd1b1991cfdfc79dd7b44 gtkam-0.1.12-r1.ebuild 1158
-MD5 91198bce2e4aeec8446ff493f12538a5 gtkam-0.1.12-r2.ebuild 1216
+MD5 07ba67d21648c04f638c4edb6d6a3271 gtkam-0.1.12-r2.ebuild 1181
 MD5 b9cf5355ba6178aae4261866e51374ea gtkam-0.1.12.ebuild 1305
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild b/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild
index 59235ea2ddce..937ac98152c3 100644
--- a/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild
@@ -1,48 +1,43 @@
 # Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/01/07 20:39:58 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.12-r2.ebuild,v 1.2 2006/01/08 03:26:29 compnerd 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"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="exif gnome nls"
 
 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 )"
 
+DOCS="ABOUT-NLS AUTHORS MANUAL NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable nls) $(use_enable exif) $(use_with gnome) \
+			$(use_with gnome bonobo) --with-rpmbuild=/bin/false --without-gimp"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch ${FILESDIR}/${PN}-0.1.10-norpm.patch
 	epatch ${FILESDIR}/${PN}-0.1.12-helpdoc.patch
 	epatch ${FILESDIR}/${PN}-0.1.12-desktop-image.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
+	gnome2_src_install
 	rm -rf ${D}/usr/share/doc/gtkam
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
 }