fix automagic dependencies, remove old revisions.

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64)

3 files changed, 17 insertions, 58 deletions

diff --git a/net-misc/gwget/ChangeLog b/net-misc/gwget/ChangeLog
index dded0d95d6cc..63029c43ecfa 100644
--- a/net-misc/gwget/ChangeLog
+++ b/net-misc/gwget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/gwget
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/ChangeLog,v 1.14 2008/01/25 20:16:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/ChangeLog,v 1.15 2008/08/04 21:11:20 eva Exp $
+
+  04 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> -gwget-0.6.ebuild,
+  gwget-0.99.ebuild:
+  fix automagic dependencies, remove old revisions.
 
   25 Jan 2008; Raúl Porcel <armin76@gentoo.org> gwget-0.99.ebuild:
   x86 stable
diff --git a/net-misc/gwget/gwget-0.6.ebuild b/net-misc/gwget/gwget-0.6.ebuild
deleted file mode 100644
index 68811f544807..000000000000
--- a/net-misc/gwget/gwget-0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/gwget-0.6.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
-
-inherit gnome2
-
-MY_P="gwget2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GTK2 WGet Frontend"
-HOMEPAGE="http://gwget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gwget/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE="nls"
-SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND=">=net-misc/wget-1.8
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libglade-2.0"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO"
-
-use nls \
-	&& G2CONF="${G2CONF} --with-included-gettext=no" \
-	|| G2CONF="${G2CONF} --disable-nls"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}/src
-	# the Makefile defines its own CFLAGS, and then
-	# doesnt use user-defined ones, so we need
-	# to change that
-	sed -i -e "s/^CFLAGS.*$//" Makefile.in
-
-}
-
-src_install() {
-
-	gnome2_src_install
-	# remove extra documentation, keeping /usr/share/doc
-	rm -rf ${D}/usr/doc
-
-}
diff --git a/net-misc/gwget/gwget-0.99.ebuild b/net-misc/gwget/gwget-0.99.ebuild
index 717a2abfb201..9670cba21978 100644
--- a/net-misc/gwget/gwget-0.99.ebuild
+++ b/net-misc/gwget/gwget-0.99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/gwget-0.99.ebuild,v 1.3 2008/01/25 20:16:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwget/gwget-0.99.ebuild,v 1.4 2008/08/04 21:11:20 eva Exp $
 
 inherit gnome2
 
@@ -10,8 +10,10 @@ HOMEPAGE="http://gnome.org/projects/gwget/"
 KEYWORDS="~amd64 ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="epiphany"
+IUSE="epiphany libnotify"
 
+# FIXME: dbus should be optional
+#        needs patching for linguas/intltool
 RDEPEND="net-misc/wget
 		 >=x11-libs/gtk+-2.6
 		 >=dev-libs/glib-2.4.0
@@ -19,7 +21,9 @@ RDEPEND="net-misc/wget
 		 >=gnome-base/libglade-2
 		 >=gnome-base/libbonobo-2
 		 >=gnome-base/libgnomeui-2
-		 epiphany? ( >=www-client/epiphany-1.4 )"
+		 >=dev-libs/dbus-glib-0.70
+		 epiphany? ( >=www-client/epiphany-1.4 )
+		 libnotify? ( >=x11-libs/libnotify-0.2.2 )"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		>=dev-util/intltool-0.29
@@ -29,12 +33,15 @@ DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
 USE_DESTDIR="1"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable epiphany epiphany-extension)"
+	G2CONF="${G2CONF}
+		$(use_enable epiphany epiphany-extension)
+		$(use_enable libnotify)
+		--disable-schemas-install"
 }
 
 src_install() {
 	gnome2_src_install
 
 	# remove /var/lib, which is created without any reason
-	rm -rf ${D}/var
+	rm -rf "${D}/var"
 }