version bump, live ebuild update, fixed bug #376203

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

5 files changed, 143 insertions, 53 deletions

diff --git a/www-client/uget/ChangeLog b/www-client/uget/ChangeLog
index c40cb1d75b9d..4343476abfdb 100644
--- a/www-client/uget/ChangeLog
+++ b/www-client/uget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uget
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.26 2011/05/19 21:01:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.27 2011/07/25 09:46:22 wired Exp $
+
+*uget-1.8.0 (25 Jul 2011)
+
+  25 Jul 2011; Alex Alexander <wired@gentoo.org> +uget-1.8.0.ebuild,
+  uget-9999.ebuild, metadata.xml:
+  version bump, live ebuild update, fixed bug #376203
 
 *uget-1.7.6 (19 May 2011)
 
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index be55888a5167..b2388058a168 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,32 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX uget-1.7.0-as-needed.patch 2035 RMD160 ec5541599911c2e243ffadf70f444fd8819fe767 SHA1 78e6c22ce0d338ea1510ef272f3b7b04d909fb52 SHA256 a9be97022b395e8e535f80c83cc3d604b5e7e2d3a1bb0826a412283ffd8312ff
 DIST uget-1.7.0.tar.gz 369034 RMD160 5ffad9a14fe7056c9a3f8685f40137618298d095 SHA1 91d55780b9f899d89ac842823f158cee74443a50 SHA256 79fea5f2c0b4ec9200732343e4e807cd2c31f24d3e6e0ddf87fcbf2b513ccec3
 DIST uget-1.7.3.tar.gz 399928 RMD160 cc590ca58840634d41d987a66e61af652a1dff29 SHA1 5c339d5a73fcf8dd0525038826954bde8db6e847 SHA256 3d297fb1a5a1b57a0a126f3682c38788e80903634236d54267b68e940e8ea0e5
 DIST uget-1.7.4.tar.gz 439877 RMD160 13e81f92a1e173b559e2729c914d8ff256e770b7 SHA1 f08bb13a9a61ff9df28726cf1f3d86309d89515b SHA256 49d16558b86b41a99875d5e4ffa967e7faa390713636a3f2701ff61661c5cc50
 DIST uget-1.7.6.tar.gz 426517 RMD160 e1f1192cf69bd8eaf90e5f1aa1f40f2b51c9ca48 SHA1 404fbb5282bc5f6a07540f81a2c9fa336abc3438 SHA256 10c29b43a292fb34870c8d631d291b962c16bdc84402611ea2ef95004aa92075
+DIST uget-1.8.0.tar.gz 426031 RMD160 afa475f6f9e6f6f9904b7d7bdfe5b1d17f6664b5 SHA1 4d271a34a7ee86d378e71f50720b68557bc6a017 SHA256 ee9e785990747af85da7701c5add4f1e31f3f404be56dbd9f495149c76b7a937
 EBUILD uget-1.7.0.ebuild 1564 RMD160 ee447d278c467100511e2102a6ee069ebf400d96 SHA1 c977f36e6786a0bbed4ba0d664b4be93855f4342 SHA256 56db612ecd5a1cdb0079931f084b9a3e849fb109ee4f6b4d76028a74074c9d39
 EBUILD uget-1.7.3.ebuild 1943 RMD160 cfde82c92e58e3381e56fa03d0111c248bec060d SHA1 6efb383cd042af5090651be72e0724b45ce98c08 SHA256 9d840e568094dca4a93cd24c6028cfbcd77ba9993547b1b8d6dde3260976e8a0
 EBUILD uget-1.7.4.ebuild 1943 RMD160 5f8a1bc2e8d285d9f70b0df36a497146e3103392 SHA1 5d9ca8c1246480e9a0f62f30efd72e2db981e704 SHA256 e1b647daf9fbe72fd4612a21d9590cacd003c4dd29ace50f150ae49564acfd2b
 EBUILD uget-1.7.6.ebuild 1943 RMD160 032f3720c515537e35d8a06800ae7483f7fbc8e8 SHA1 4a72800c51ad039a6da2e1b6f6e1a6ed9a7b98d2 SHA256 476202e28676b292001155596a42008ad85510a5de710e8635c61b2651eac3e6
-EBUILD uget-9999.ebuild 1262 RMD160 e1289f73ec4c717706dd006c565ec7b56ad021cf SHA1 0c54f89f3cc5cea2dcb5cea2b13e8fa5eaf2e8b3 SHA256 a003aa81b56e295430783849592e3598d61d57c67dcc84381acde2cc499b9456
-MISC ChangeLog 3803 RMD160 583dba141cb1e20564803d0aa431172a521ea526 SHA1 ae5811860fc741a3cb80afcaf526e896f15648e2 SHA256 b5110a92e608972791603cd38616f5701564b5fb6b534bb68f79bb194e0781d7
-MISC metadata.xml 777 RMD160 480324e6bd87d09b3c747ccaa7335a8dd6cb7e65 SHA1 3ee8e907386cb33ed35c8c254bdcc0cd86a58976 SHA256 cbcf8747e1ff01333f4cb31e1df509b54ca2781ed8c6c7836f876dacb2a9b8f3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJN1YWBAAoJEDZF8K7rm0r67ZgP/RYWZNJAf3UaSEUVspUT4GuE
-5i7pwmIy21LWvF6t5NMJ8RuKoog7IPfaXRvIEO3RKTXqZGPJICvlC2vskjT/1a+I
-EIW0jfWN3+56zd3sTs5ABdZ4PBtRNUECtgpPDhErO/zmnjRU1NQt/Fn3VrPyz4MH
-GHlCKmutu7ywcXm9mdlwwaqc/qG7CBzzEOCLtViM9q+L4D4kMXTnbFef+/YxHKRV
-ixpbBCioH1n2cZfcwqMnEdiY3YyWqzMNAThD8DDIkV0eMGeJ4laUvBoh/AMlySPF
-2rBR6YCQj/qECbmsj08JCDZmh91TJuMqSJh2kg2tVxjY+L/JvJrfQeznilX0gMtI
-Ouj6NgVzjdkm7aCRtivhvZIWbwJNy78GMCgTsuG/WkZjZxyGJvioG+zYllDjhz7X
-rfgP1tbfdaxyr/Z8jwa0Uig0NpsvBz5BT2FpuCRAqGbBqJyoboEinDFY7JwYN1I5
-SG3ssRBvh6AhCI0OSf7QcM+y7G15Uv2pektFJ5wTW+7TwxL3boavADT8VUBmvz9H
-XY7YjGorCQXEGwdZ0Avmk++Gnw5jAnKn/7hTZlX8iAq4DOI23uZyJ0YhvuPG+c/K
-AScQ3zHXIc1R5gdcQymxlkedVG/abe5FeiC3jlYApkIlSKg6YSHWd7dNPHRqE7yJ
-qMsjfca3UrJc2DjhB5e/
-=dZCw
------END PGP SIGNATURE-----
+EBUILD uget-1.8.0.ebuild 1786 RMD160 ce91eb03c0c7a2f99599a7d083b2021cc8e4a8a7 SHA1 35e4199758b6c4036db12d2baa052a7e2d5a8cae SHA256 e947ec5a855daf1aabc1e5f0edb61248c67d1e43437f80f22c96cdd45d45d6e5
+EBUILD uget-9999.ebuild 1981 RMD160 692b068e62368a2bbf2f7f930631106b03ffe1f6 SHA1 7aecec1c0cfb384df782179dcd08e20e03318d5a SHA256 f254d45b350663af000c01cada95f8e46ab5402aca5a70cd424a0a7618b1623b
+MISC ChangeLog 3988 RMD160 e606234b96b1a62fc6a35b949c7d06a818f59f00 SHA1 64f1bb7627f43a10a7e57fff8be2d1e27659b175 SHA256 21341c01f799d0cc045aa1cb97fb7f064b90fd6a909370d028a90f13d2ad9aff
+MISC metadata.xml 873 RMD160 d683aab0260eec7190805ac04d9f0cf360bf1602 SHA1 c6db6bdb1ffbac11c66ea45a6e90f50fbf9b7d4b SHA256 3cbceb5cd4cd757e3cc52b11e2295a52b9d072f693db2d4c38cc2dec78ed2938
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index 71272a32ebfd..98121dea5694 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>wired@gentoo.org</email>
-<name>Alex Alexander</name>
-</maintainer>
-<longdescription lang="en">
-Uget is a download manager. It allows you to classify URLs before downloading
-them, and allows you to import URLs from HTML files. Every category has an
-independent configuration that can be inherited by each download in that
-category.
-</longdescription>
-<use>
-	<flag name='aria2'>Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
-		You'll find the plugin in the app's settings.</flag>
-	<flag name='hide-temp-files'>Make temporary files that are used while downloading hidden.</flag>
-</use>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<longdescription lang="en">
+		Uget is a download manager. It allows you to classify URLs before downloading
+		them, and allows you to import URLs from HTML files. Every category has an
+		independent configuration that can be inherited by each download in that
+		category.
+	</longdescription>
+	<use>
+		<flag name='aria2'>Enable support for <pkg>net-misc/aria2</pkg> through xmlrpc.
+			You'll find the plugin in the app's settings.</flag>
+		<flag name='hide-temp-files'>Make temporary files that are used while downloading hidden.</flag>
+		<flag name='gtk3'>Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/uget/uget-1.8.0.ebuild b/www-client/uget/uget-1.8.0.ebuild
new file mode 100644
index 000000000000..e79e887e4898
--- /dev/null
+++ b/www-client/uget/uget-1.8.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-1.8.0.ebuild,v 1.1 2011/07/25 09:46:22 wired Exp $
+
+EAPI="4"
+
+inherit base
+
+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="aria2 +curl gstreamer gtk3 hide-temp-files libnotify nls"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.18:2
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+	)
+	curl? ( >=net-misc/curl-7.10 )
+	gstreamer? ( media-libs/gstreamer )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# add missing file, fix tests, bug #376203
+	echo "uglib/UgPlugin-aria2.c" >> po/POTFILES.in ||
+		die "echo in po/POTFILES.in failed"
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_with gtk3) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
+		  $(use_enable libnotify notify)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
+}
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
index f912037ee5bf..99f308244ba0 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2011 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.4 2011/05/19 20:53:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-9999.ebuild,v 1.5 2011/07/25 09:46:22 wired Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit autotools subversion
+inherit autotools git-2
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
 HOMEPAGE="http://urlget.sourceforge.net/"
 SRC_URI=""
 
-ESVN_REPO_URI="https://urlget.svn.sourceforge.net/svnroot/urlget/trunk"
-ESVN_PROJECT="uget"
+EGIT_REPO_URI="git://urlget.git.sourceforge.net/gitroot/urlget/uget"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="gstreamer libnotify nls"
+IUSE="aria2 +curl gstreamer gtk3 hide-temp-files libnotify nls"
+
+REQUIRED_USE="|| ( aria2 curl )"
 
 RDEPEND="
 	dev-libs/libpcre
 	>=dev-libs/glib-2:2
-	>=net-misc/curl-7.10
-	>=x11-libs/gtk+-2.4:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.18:2
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+	)
+	curl? ( >=net-misc/curl-7.10 )
 	gstreamer? ( media-libs/gstreamer )
 	libnotify? ( x11-libs/libnotify )
 	"
@@ -32,9 +38,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	for i in AUTHORS NEWS README ChangeLog;	do
-		[[ ! -f ${i} ]] && touch ${i}
-	done
+	# add missing file, fix tests, bug #376203
+	echo "uglib/UgPlugin-aria2.c" >> po/POTFILES.in ||
+		die "echo in po/POTFILES.in failed"
 
 	eautoreconf
 	intltoolize || die "intltoolize failed"
@@ -43,7 +49,11 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_enable nls) \
+		  $(use_with gtk3) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
 		  $(use_enable gstreamer) \
+		  $(use_enable hide-temp-files hidden) \
 		  $(use_enable libnotify notify) || die "econf failed"
 }
 
@@ -52,6 +62,21 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# the build system forgets this :p
+	dobin uget-cmd/uget-cmd || die "uget-cmd install failed"
+
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	if use aria2; then
+		echo
+		elog "You've enabled the aria2 USE flag, so the aria2 plug-in has been"
+		elog "built. This allows you to control a local or remote instance of aria2"
+		elog "through xmlrpc. To use aria2 locally you have to emerge"
+		elog "net-misc/aria2 with the xmlrpc USE enabled manually."
+		echo
+	fi
 }