updated live ebuild, removed old ones

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 17 insertions, 77 deletions

diff --git a/www-client/uget/ChangeLog b/www-client/uget/ChangeLog
index e7a87258a291..e69b4eb40882 100644
--- a/www-client/uget/ChangeLog
+++ b/www-client/uget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/uget
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.4 2010/01/08 15:23:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.5 2010/01/08 15:31:21 wired Exp $
+
+  08 Jan 2010; Alex Alexander <wired@gentoo.org> -uget-1.5.0.ebuild,
+  -uget-1.5.0.1.ebuild, uget-9999.ebuild:
+  updated live ebuild, removed old ones
 
 *uget-1.5.0.1-r1 (08 Jan 2010)
 
diff --git a/www-client/uget/uget-1.5.0.1.ebuild b/www-client/uget/uget-1.5.0.1.ebuild
deleted file mode 100644
index 235dc999ece4..000000000000
--- a/www-client/uget/uget-1.5.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-1.5.0.1.ebuild,v 1.1 2010/01/06 12:24:46 wired Exp $
-
-EAPI="2"
-
-DESCRIPTION="Download manager using gtk+ and libcurl"
-HOMEPAGE="http://urlget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND=">=net-misc/curl-7.10
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf $(use_enable nls) || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/www-client/uget/uget-1.5.0.ebuild b/www-client/uget/uget-1.5.0.ebuild
deleted file mode 100644
index 3eb12db7e303..000000000000
--- a/www-client/uget/uget-1.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-1.5.0.ebuild,v 1.1 2009/12/08 21:21:25 wired Exp $
-
-EAPI="2"
-
-DESCRIPTION="Download manager using gtk+ and libcurl"
-HOMEPAGE="http://urlget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND=">=net-misc/curl-7.10
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf $(use_enable nls) || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
index de7e47fee89e..92f2996e04eb 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-9999.ebuild,v 1.1 2010/01/06 12:53:09 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-9999.ebuild,v 1.2 2010/01/08 15:31:21 wired Exp $
 
 EAPI="2"
 
@@ -16,12 +16,16 @@ ESVN_PROJECT="uget"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="nls"
+IUSE="gstreamer libnotify nls"
 
-RDEPEND=">=net-misc/curl-7.10
-	>=x11-libs/gtk+-2.4
+RDEPEND="
+	dev-libs/libpcre
 	>=dev-libs/glib-2
-	dev-libs/libpcre"
+	>=net-misc/curl-7.10
+	>=x11-libs/gtk+-2.4
+	gstreamer? ( media-libs/gstreamer )
+	libnotify? ( x11-libs/libnotify )
+	"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
@@ -37,7 +41,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable nls) || die "econf failed"
+	econf $(use_enable nls) \
+		  $(use_enable gstreamer) \
+		  $(use_enable libnotify notify) || die "econf failed"
 }
 
 src_compile() {