cleanup

7 files changed, 14 insertions, 79 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 99cf61c0741c..2b755c11de3f 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.9 2003/06/10 22:38:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.10 2003/08/31 02:01:06 liquidx Exp $
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.10.ebuild,
+  gtkam-0.1.4.ebuild, gtkam-0.1.9.ebuild:
+  added pkgconfig deps and cleanup
 
   10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gtkam-0.1.10.ebuild:
   bump to stable x86
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index 7c057e6af15d..6da8cc334535 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,9 +1,5 @@
-MD5 34b61e5193305c178dde2dba8ef743bf ChangeLog 1486
-MD5 b169871109e992ae208b7ab0584689a7 gtkam-0.1.4.ebuild 678
-MD5 9209af589a9155a977b506edd43daf8b gtkam-0.1.9.ebuild 936
-MD5 d39dc920e703f6a02c3a7682147eb41a gtkam-0.1.10.ebuild 1259
+MD5 5f82117cdd814176e8e8fe1407b12aae ChangeLog 1635
+MD5 0b2595c20dab5cc1a72b4ab10fab205b gtkam-0.1.10.ebuild 1303
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 0c55eb7ec8a4af3f3efdee10a639e3ac files/digest-gtkam-0.1.4 63
-MD5 ecc463b67ca1c84a223144fd7bcb0396 files/digest-gtkam-0.1.9 63
-MD5 6eb68b631f3f91c3af9151bbe912dbe8 files/gtkam-0.1.10-norpm.patch 398
 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.4 b/media-gfx/gtkam/files/digest-gtkam-0.1.4
deleted file mode 100644
index 171d966323ef..000000000000
--- a/media-gfx/gtkam/files/digest-gtkam-0.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e21303d062f3bb5c3ff171a3a44df19 gtkam-0.1.4.tar.gz 349702
diff --git a/media-gfx/gtkam/files/digest-gtkam-0.1.9 b/media-gfx/gtkam/files/digest-gtkam-0.1.9
deleted file mode 100644
index c7bd319a8595..000000000000
--- a/media-gfx/gtkam/files/digest-gtkam-0.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 698aadc5122f1396cda5e44a522329d4 gtkam-0.1.9.tar.gz 332969
diff --git a/media-gfx/gtkam/gtkam-0.1.10.ebuild b/media-gfx/gtkam/gtkam-0.1.10.ebuild
index 15b092b0df09..ce24d1ebb134 100644
--- a/media-gfx/gtkam/gtkam-0.1.10.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.10.ebuild,v 1.3 2003/06/10 22:38:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.10.ebuild,v 1.4 2003/08/31 02:01:06 liquidx Exp $
 
 IUSE="nls gnome jpeg"
 
@@ -13,13 +13,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
 
-DEPEND=">=x11-libs/gtk+-2
+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 )
 	jpeg? ( media-libs/libexif-gtk
-		media-libs/libexif )
+		media-libs/libexif )"
+		
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/media-gfx/gtkam/gtkam-0.1.4.ebuild b/media-gfx/gtkam/gtkam-0.1.4.ebuild
deleted file mode 100644
index 99de2f03e3ac..000000000000
--- a/media-gfx/gtkam/gtkam-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2003 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.4.ebuild,v 1.4 2003/02/13 12:35:15 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A frontend for gPhoto 2"
-HOMEPAGE="http://gphoto.org/gphoto2/gtk.html"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r7
-	>=media-libs/gdk-pixbuf-0.17.0
-	>=media-gfx/gphoto2-2.0-r1"
-
-
-
-src_compile() {
-	econf --without-gimp || die
-	emake || die
-}
-
-src_install () {
-
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
-}
diff --git a/media-gfx/gtkam/gtkam-0.1.9.ebuild b/media-gfx/gtkam/gtkam-0.1.9.ebuild
deleted file mode 100644
index 21221a6d09e5..000000000000
--- a/media-gfx/gtkam/gtkam-0.1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 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.9.ebuild,v 1.8 2003/03/28 12:43:51 seemant Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A frontend for gPhoto 2"
-HOMEPAGE="http://gphoto.org/gphoto2/gtk.html"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-DEPEND=">=x11-libs/gtk+-2
-	>=media-gfx/gphoto2-2.1.0
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	# A Makefile hack to remove the spurious installation of
-	# documentation into /usr/doc/gtkam
-	cd ${S}
-	cp Makefile.in Makefile.in.orig
-	sed -e 's/install-data-am:.*/install-data-am:/g' Makefile.in.orig > Makefile.in
-	rm Makefile.in.orig
-
-	econf --without-gimp `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
-}