version bump (bug #500816). backported gnutls fix. proper LINGUAS support (bug #509760). live ebuild update.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

6 files changed, 287 insertions, 26 deletions

diff --git a/www-client/uget/ChangeLog b/www-client/uget/ChangeLog
index 8f887c4a0580..f73c06a998e3 100644
--- a/www-client/uget/ChangeLog
+++ b/www-client/uget/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/uget
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.41 2013/11/05 21:04:22 wired Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/ChangeLog,v 1.42 2014/05/08 03:05:13 wired Exp $
+
+*uget-1.10.4 (08 May 2014)
+
+  08 May 2014; Alex Alexander <wired@gentoo.org> +uget-1.10.4.ebuild,
+  uget-9999.ebuild, +files/uget-1.10.4-gnutls-backport-fix.patch,
+  +files/uget-1.10.4-linguas-fix.patch:
+  version bump (bug #500816). backported gnutls fix. proper LINGUAS support
+  (bug #509760). live ebuild update.
 
   05 Nov 2013; Alex Alexander <wired@gentoo.org> uget-1.8.0.ebuild,
   uget-1.10.3.ebuild, uget-1.10.3-r1.ebuild:
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index f8a4935e1a2d..2def70d8a1c0 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,29 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX uget-1.10.4-gnutls-backport-fix.patch 4590 SHA256 615cb22101aecbbb4963d81c958d2068701a4ebff2d1ef2bea279e42d6ed122c SHA512 88b94f01879d03c0d8778c1b6f3a6ed227df5c0cfd398b75e458e24e11dff0ca5de554cd01f4f54fa75cf16274f0506e419d868b1323afa493fe862c298c22c9 WHIRLPOOL 2745c399de85b524751963eab180d780b19fc11025b827d83453f104f0586fe2d8a64f440889eb89888fed2943532fce2e9a9b1a9341de41bf3bb3deca8da332
+AUX uget-1.10.4-linguas-fix.patch 1360 SHA256 df2ffa33d01125467125e60ae781b7890b70991a9b99cd6cd742df9391922470 SHA512 063636ed5185c2010ec33b0c60e3f896cf553911c795ce7ce54cb5424770bcc95eb35f7f1737df687b72350943ac5e310f5dc4a794493e937bfee0d0938bf6e5 WHIRLPOOL d699f42c76690d9e84513c84ca95993da57938a9eeebd1460b4d88f36e25c36691b514281e6542023e24702d5b9f0d4ef6a8d31e270426c0aa33e1631c5477bd
 AUX uget-ar-hardcoded.patch 641 SHA256 82d4312a3ffa84d520d24cd2af29f9a8a9cea6c19477c19ace4bba356bad17dd SHA512 efecb72a81a43da83b5cc92beaefcd02a931b32b076ae6d6fd17d75830cd2fad5be951d840822d0d1eb44ec789c21b46a0b1ac83955f492360896eb166a53e5f WHIRLPOOL 8b9aecd51b5bff310a1950ccc02a0adac05bbfdbc4ef604ba253ac0dcf694f3a68d441583a16eb45193e02d28e0a1c99cce2c514cce510b55ac5088f207ade27
 DIST uget-1.10.3.tar.gz 484395 SHA256 2ff3f51a2fc7b927777c81e002032a08f819c18d050b570cd6ca0be76a459324 SHA512 c939832ad2b635e5b1d1e448bf075c13362e3f69f708e6669ad435f6467b258441d5adef34cea176082fa107865c2edd3ceb54c5b9074f0d71f94496e4995a34 WHIRLPOOL 473ec38a4d922481ae50205cf8283d2b9ce259bfcc6f8ef964c5c69f9d6f860e872676e8327d45bca5efd4d22e34d699f9e2b43ac4a2cfdc7c6a8728cc2df640
+DIST uget-1.10.4.tar.gz 576147 SHA256 a25c5cc9af4e87a2c22206f376ffce70697ef743a902ecf028b50a586180a622 SHA512 013654ea6d06e8075bb216082dd85e7a4d1ed8510af4ecaf49c816dbf127f1adb157ca275a574f87900d7980cbe70e1e918fe54f0ceb4d0115da0ba07d4f2273 WHIRLPOOL dfb993029a9019e91a540c7ab98a2b708e726e902f0a13abb0bb52ace592f92b848a5233ff903fd4cbd5cb67fe0fe7c0c36c66704af79482cf40e3dbc5661212
 DIST uget-1.8.0.tar.gz 426031 SHA256 ee9e785990747af85da7701c5add4f1e31f3f404be56dbd9f495149c76b7a937 SHA512 c68c591b3c513c4829dfee735cbe8d4ee2c47aed0c5962002de9462c6c12b731e51756785e834aadaef1cb47182b9e560dd836d2e4861f053ec1f2f447c2c68d WHIRLPOOL 203ae0cbbb46440fdc6a551edb0ffd602bea27c7f9a1b185f2db80d19e04c79e22f158b3a6966354c23130592803253d5f63f143a4eecd841dadc9ed7c515c66
 EBUILD uget-1.10.3-r1.ebuild 2084 SHA256 0b3e556cc7bb6a5ebda8ed75503a7257729709216a7f7c6d61bfbb0a48ee5360 SHA512 988ad9d07627f5c6894131a77e0f48060b52262a97d238c1bb8c78f882bc8d280e12aa899b39297352e8cb3d8c9988c2dd7196193ff0ffcd25cdca139224dde1 WHIRLPOOL 2b336d818f02d4bd90cbccde928450d79de261d4da26be71deb97ecabbd9f773cbbb16cefb494268ca4c8602b8b9c443aedfa3558084e5f2e2f69fc7133ec76f
 EBUILD uget-1.10.3.ebuild 1905 SHA256 0a7acd6ad38f423149531cdc9abe3c2d0dfb0769cf0bca6d336499a69c9be42c SHA512 3adfb94455dee9d1653c744194db59d89fd840d0d7ba28309e7be5e229d9d31e9c4fd127a7371f1897b1042c3482c566a606cc302aacac8eaf3b9f69765f98f9 WHIRLPOOL ab779139f3aaa21de589913071f5c27a07685577a240acf5b941d554bb7541cde420c4cb1ae090f53c86820109d6200686c70e764521691c5801b0b70c3f021c
+EBUILD uget-1.10.4.ebuild 2446 SHA256 c4b2ed58802b412ae5037eecf2bdbe3c4574600756a97624e038b398c9930b7b SHA512 631f66b0e163ee108bb752323905c846ca85e6a4dd966a9a27db0f02814bd42e8611fa877aed94f87854bf0ba92ae0b628fe2294f8846d470d6bdc7603f0a04e WHIRLPOOL 02d1b86c9ac301e47528043f6db7e0b87abd317db5f132490bc6545a7754081c7902be70405871ba9be54556bbe7984d1a3275a7b0f0febbc2b2289357e15c44
 EBUILD uget-1.8.0.ebuild 1778 SHA256 7fff0059c3f352096590d3c21b1d8cec4ea5d7b8c9068de7165bc5809c627399 SHA512 8451a515ad1575377514f43bd473dadcc7db616cc1404db4898b8068575f3696265169b95d92b4c31c4ae6fb614e9d3904925456f3a251da08fd2d767dfb04fe WHIRLPOOL 28f5324b36b683c9f7e462ab03e65aa26912552d6eade30873a088af433dc7f084ff6082a3768bc7776bdbba28f0b843e6e1f0d5fcfa5a26cbc48e6a2c5f5d19
-EBUILD uget-9999.ebuild 1913 SHA256 b845fdc3fbf8a6a8dc78fd4149813d41ac2e78190cf6a64f27b294082c93e8d4 SHA512 593649cb482513e137a09732b4b105bb23b6a475cc47584c0452ad1f913613c53363d2f68b3f6a78be3bd71832d7bd6df4a84ae59b51a3da04f978112c3acbb2 WHIRLPOOL 3fe5153f3147a5da80d691a5ca33a0bfc35101037f6a85d34b6d7812ecc3008f44ea577ea56e5dd2a85ba6724a446a71c25af4778d753757adef7b5d2020c62c
-MISC ChangeLog 5970 SHA256 5e1192aa37d256fd6bb313ea477cd9e4857247f8fb68c6dd7da66aa087e576ac SHA512 78d3e5f9c2829bd2cde1f8624f88d2105a4ff5330fb19fc4beb78bc3aac7a5958242490579eed930606a6a41705c052dbae2974f8a6e0d2d24cbfb4240b2455a WHIRLPOOL 9c68048074596f129605a7f08795274268215cb747b1191b5ae39076a08518ad1a861d9af79c010b3fad80189579b857506a0ac0de7603cb9b567107e6b4858a
+EBUILD uget-9999.ebuild 2330 SHA256 7780d22df52d82f44ee4c5025019740ce091e1108cc4e3530a586d4a109f6412 SHA512 0477b54de1813409ab336578465848c28ca55ec1865ad591e252c687cd6b98d5e96e86984ebd9d358ad787fbd90bb9c1f47c2d9360d12e5e06b2f8ebafdfe940 WHIRLPOOL 708178085361935d5bbd009e79e7beea22ae720302f57ff258db53fedda6597a2c9eaecb24c05c0d8ab954f1e30ac0accfdd2f324840689be54e0e6ffd19cecc
+MISC ChangeLog 6288 SHA256 9f6a9c8dbce958265fb03dbbdf1d630bce83557b8c7e550a7cb30cca3ce3e319 SHA512 1522a8add8914363ac0dba5c40846872ec34e73c73f08e563beb9f3758ddf60b156a504647e81c975e4962a11620845b16a28cf727fedd437da89cb5f023399f WHIRLPOOL c8d0cb172abc04304bcc277c6ec85498370bd191328c19d1be1f8b4c2ade5d9966457aee5a3acd4c4afc7d0d6f0b091e3982fe21f45aa2babddb08d2a20d3b7e
 MISC metadata.xml 851 SHA256 169562d7f36aa26649984b238232fa179f6f44c84c9cd57cfa97f769f04b995d SHA512 59ea62fe9a8a024c9e7dac202bec114e700e261097f6b76fd147dc183360837f9e01becafd20bb3c6b425f8981cfdc7e90ecdb190d2b84f6d7bd7a8db79b4c80 WHIRLPOOL 9ddc25503e00dbf63d798ce93334759ee60ec70d81f2dc7ff0050f08e521376f9b73a01f944009bb11de8d3d60221fffe246f3f286cba697b2d9171a10d7bd5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSeV55AAoJEDZF8K7rm0r65gcP/R8EG4+t7ILZNjJ3EiJHmCai
-efBMLzYY4gEjYpIYc6LGnKw/IYSlQIffHXIlFTuk4SPNt24cgqCqp6T1ohK6RLQJ
-EODcBKDlzqr9IoC8uQdkxr9J//CpckV2hapyS+yGxnCrchmdBetb2OnagurIriZq
-z4wVl/6on5hD8qrE49Kw5oIzXBwZoqFxfCwHYP26kxk39Ylvfu7gEcG/wa744uD2
-Twjh10p8Vo3RtUHDdUXbx7ko1GaV3VKsn5JKimTFdw9bUdDyz4NlvJWEWKZFCHEo
-/Ocx6/ruKpJk+7ouaYqOfiqB/GVLS3fEdGAi/6RvnxWkggPm0+XC4xAwl6vI8yu/
-19xV61MVha3kXa0Sz5067keUnARsNfs76ZfRnOdNdCADl4zKOZVWlC9k8rKDVxaD
-t9BQ90x7rzyBa1/ztyoavyN+8D14KSidjsZF0wM4HWIzQOJpAuBbwqVPEzZnZULW
-lKjzQZhcDQO5I5wzPU/K/hPvpKsoonQAYk6QwhdSXSwbvdveOwtpYZERulEz9e5F
-udYKQyDixc0yDyqKW7He0A+ZgIl+NuLrVsk5BPmFneUMKHnIJM3yaj9ieEMCcd2X
-Jp/9LKuuRW03n5cshb1iU6/jW6+uYO4lW3lfmye6dd6ddVzuLJPy5tazXuU7xuMe
-ud8PbbiENbBtXEpYIivN
-=O/Os
+iQIcBAEBCAAGBQJTavRrAAoJEDZF8K7rm0r68OkP/Ar1mMYlxTroQoAqlvP5FqFB
+Wwthcd3xOHWoiEKJPCFC61kgBCEp3hQTcUD6uWWW1ikzBP0WChxnmXP29v5fAv0b
+z/6cth73UElx5ejXpXijd6Ll3TO22e7jupAqqJ9YfEyeJOg3pEZm/oYIundU7eXP
+rU2WkYxlKeKyq4wIVDCNSopcGh3oz9OH1b/csX+kZAl8qWwSR2YvMJzuUaWpCWEj
+vRCG+glVNPJtrK/MHQEo4cMzM289eKbU5GelAfc+bE12uadfcaei6gJ5ris3rmW2
+KWB0x6L8F5kWjoWbX4HnZaaago2Q96FEOQhmdKr9EYW7sDWQ+Goi8KUoYxLO7E08
+MEFIa/Qi6QsCGb71AVOTle47jVPQnVrVnLKXCjVBQDpeBlxfymhGmtjwkhvSMbqa
+MTKbJDbqSA7hVnbeHMwFfG8yQ+AynYjqZZyKZKkxKO2wAdsxqrCGDk2drrGI6Zng
+hnGyYD6pu/BXYTzKrFwwN8tEeuufLoXf68PXW8NN6IqvYWx16VGA3lIeMpakuVYm
+y/ZLEUmczee4AkLphJUlK+Apjls7e5ktUs6f2LUBS5GIeyhFHEuafEDtYlNgbLe9
+YbQMrDCMD+J55Fc/8S34oSsIw9f8jjGpcx+yYTdA3e265vkbTYcpdtRnL/dDVtIP
+BVsSjvIMPISm1QgeaobG
+=ip+M
 -----END PGP SIGNATURE-----
diff --git a/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch b/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch
new file mode 100644
index 000000000000..77e031488641
--- /dev/null
+++ b/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch
@@ -0,0 +1,125 @@
+diff -u -ru uget-1.10.4-orig/configure.ac uget-1.10.4/configure.ac
+--- uget-1.10.4-orig/configure.ac	2014-05-08 05:48:17.316939998 +0300
++++ uget-1.10.4/configure.ac	2014-05-08 05:48:34.668232311 +0300
+@@ -145,23 +145,45 @@
+ )
+ 
+ if test "x$plugin_curl" = "xyes"; then
+-    AC_DEFINE(HAVE_PLUGIN_CURL, 1, [Define to 1 to enable cURL plug-in.])
++	AC_DEFINE(HAVE_PLUGIN_CURL, 1, [Define to 1 to enable cURL plug-in.])
+ fi
+ 
+ ## ----------------
+ ## GnuTLS
+-AC_ARG_ENABLE(
++AC_ARG_WITH(
+ 	[gnutls],
+-	AC_HELP_STRING([--enable-gnutls], [Enable GnuTLS support.]),
+-	[enable_gnutls="$enableval"],
+-	[enable_gnutls="no"]
++	AC_HELP_STRING([--with-gnutls[=@<:@no/auto/yes@:>@]], [Enable GnuTLS support.]),
++	[with_gnutls="$withval"],
++	[with_gnutls="auto"]
+ )
+-if test "x$enable_gnutls" = "xyes"; then
+-  PKG_CHECK_MODULES(GNUTLS, gnutls)
+-  AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if gnutls support is required.])
+-  # for ArchLinux
+-  AC_SUBST(GNUTLS_CFLAGS)
+-  AC_SUBST(GNUTLS_LIBS)
++if test "x$with_gnutls" != "xno"; then
++#	AC_CHECK_HEADER(gcrypt.h, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_CFLAGS=""
++#		AC_SUBST(LIBGCRYPT_CFLAGS)
++#	fi
++#	AC_CHECK_HEADER(gcrypt/gcrypt.h, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_CFLAGS=""
++#		AC_SUBST(LIBGCRYPT_CFLAGS, [""])
++#	fi
++#	AC_CHECK_LIB(gcrypt, gcry_control, [USE_GNUTLS_GCRYPT=1], [USE_GNUTLS_GCRYPT=0])
++#	if test "$USE_GNUTLS_GCRYPT" = "1"; then
++#		LIBGCRYPT_LIBS="-lgcrypt"
++#		AC_SUBST(LIBGCRYPT_LIBS, ["-lgcrypt"])
++#	fi
++	AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config)
++	if test "x$LIBGCRYPT_CONFIG" = "x" ; then
++		if test "x$with_gnutls" = "xyes"; then
++			AC_MSG_ERROR(Unable to find libgcrypt-config, please install libgcrypt)
++		fi
++	else
++		LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++		LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++		AC_SUBST(LIBGCRYPT_CFLAGS)
++		AC_SUBST(LIBGCRYPT_LIBS)
++		AC_DEFINE(USE_GNUTLS, 1, [Define to 1 if gnutls support is required.])
++	fi
+ fi
+ 
+ ## -----------------
+@@ -188,7 +210,7 @@
+   PKG_CHECK_MODULES(LIBPWMD, [libpwmd-7.0 >= 7.0.0])
+   AC_DEFINE(HAVE_LIBPWMD, 1, [Define to 1 if libpwmd support is required.])
+ fi
+-AM_CONDITIONAL([WITH_LIBPWMD],  [test "x$enable_pwmd" = "xyes"])

++AM_CONDITIONAL([WITH_LIBPWMD],  [test "x$enable_pwmd" = "xyes"])
+ 
+ ## -----------------
+ ## HIDE_TEMPORARY_FILE
+diff -u -ru uget-1.10.4-orig/uget-gtk/Makefile.am uget-1.10.4/uget-gtk/Makefile.am
+--- uget-1.10.4-orig/uget-gtk/Makefile.am	2014-05-08 05:48:17.341936098 +0300
++++ uget-1.10.4/uget-gtk/Makefile.am	2014-05-08 05:48:34.668232311 +0300
+@@ -1,10 +1,14 @@
+ bin_PROGRAMS = uget-gtk
+ 
+-UGET_GTK_LIBS   = @GTK_LIBS@   @GIO_LIBS@   @GTHREAD_LIBS@   @CURL_LIBS@   @GNUTLS_LIBS@   @LIBNOTIFY_LIBS@   @APP_INDICATOR_LIBS@   @GSTREAMER_LIBS@   @LIBPWMD_LIBS@
++UGET_GTK_LIBS   = @GTK_LIBS@  @GIO_LIBS@  @GTHREAD_LIBS@  \
++	@CURL_LIBS@  @LIBGCRYPT_LIBS@  \
++	@LIBNOTIFY_LIBS@  @APP_INDICATOR_LIBS@  @GSTREAMER_LIBS@  @LIBPWMD_LIBS@
+ 
+ # set the include path found by configure
+ uget_gtk_CPPFLAGS = -DDATADIR='"$(datadir)"' -I$(top_srcdir)/uglib -I$(top_srcdir)/uget-gtk
+-uget_gtk_CFLAGS   = @LFS_CFLAGS@  @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @GNUTLS_CFLAGS@ @LIBNOTIFY_CFLAGS@ @APP_INDICATOR_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
++uget_gtk_CFLAGS   = @LFS_CFLAGS@  @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@  \
++	@CURL_CFLAGS@ @LIBGCRYPT_CFLAGS@  \
++	@LIBNOTIFY_CFLAGS@ @APP_INDICATOR_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
+ uget_gtk_LDFLAGS  = @LFS_LDFLAGS@
+ uget_gtk_LDADD    = $(top_builddir)/uglib/libuglib.a $(UGET_GTK_LIBS)
+ 
+diff -u -ru uget-1.10.4-orig/uget-gtk/UgApp-gtk-main.c uget-1.10.4/uget-gtk/UgApp-gtk-main.c
+--- uget-1.10.4-orig/uget-gtk/UgApp-gtk-main.c	2014-05-08 05:48:17.341936098 +0300
++++ uget-1.10.4/uget-gtk/UgApp-gtk-main.c	2014-05-08 05:48:43.267889859 +0300
+@@ -113,17 +113,17 @@
+ #include <UgApp-gtk.h>
+ 
+ // GnuTLS
+-#ifdef HAVE_GNUTLS
++#ifdef USE_GNUTLS
+ #include <gcrypt.h>
+ #include <errno.h>
+ 
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ 
+-void init_gnutls_locks (void)
++void init_locks (void)
+ {
+-	gcry_control (GCRYCTL_SET_THREAD_CBS);
++	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+ }
+-#endif // HAVE_GNUTLS
++#endif // USE_GNUTLS
+ 
+ // GStreamer
+ #ifdef HAVE_GSTREAMER
+@@ -199,8 +199,8 @@
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-#ifdef HAVE_GNUTLS
+-	init_gnutls_locks ();
++#ifdef USE_GNUTLS
++	init_locks ();
+ #endif
+ 
+ 	string = ug_arg_find_version (argc, argv);
diff --git a/www-client/uget/files/uget-1.10.4-linguas-fix.patch b/www-client/uget/files/uget-1.10.4-linguas-fix.patch
new file mode 100644
index 000000000000..9482f1e4b84d
--- /dev/null
+++ b/www-client/uget/files/uget-1.10.4-linguas-fix.patch
@@ -0,0 +1,14 @@
+--- po/Makefile.in.in.old	2014-05-08 05:07:04.860525201 +0300
++++ po/Makefile.in.in	2014-05-08 05:29:13.404227684 +0300
+@@ -56,9 +56,9 @@
+ 
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+ 
+-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(PO_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+ 
+-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS=""; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+ 
+ POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+ 
diff --git a/www-client/uget/uget-1.10.4.ebuild b/www-client/uget/uget-1.10.4.ebuild
new file mode 100644
index 000000000000..8f3036cff8be
--- /dev/null
+++ b/www-client/uget/uget-1.10.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-1.10.4.ebuild,v 1.1 2014/05/08 03:05:13 wired Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+LANGUAGES="linguas_ar linguas_be linguas_bn_BD linguas_cs linguas_da linguas_de
+	linguas_es linguas_fr linguas_hu linguas_id linguas_it linguas_ka_GE linguas_pl
+	linguas_pt_BR linguas_ru linguas_tr linguas_uk linguas_vi linguas_zh_CN
+	linguas_zh_TW"
+
+IUSE="aria2 +curl gnutls gstreamer hide-temp-files libnotify nls ${LANGUAGES}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget"
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
+fi
+
+DESCRIPTION="Download manager using gtk+ and libcurl"
+HOMEPAGE="http://www.ugetdm.com"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+REQUIRED_USE="|| ( aria2 curl )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4:3
+	curl? ( >=net-misc/curl-7.10 )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	libnotify? ( x11-libs/libnotify )
+	"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-ar-hardcoded.patch
+	epatch "${FILESDIR}"/${P}-gnutls-backport-fix.patch
+	eautoreconf
+
+	if [[ ${PV} == *9999* ]]; then
+		intltoolize || die "intltoolize failed"
+		eautoreconf
+	fi
+
+	# fix LINGUAS not getting applied
+	epatch "${FILESDIR}"/${PN}-1.10.4-linguas-fix.patch
+}
+
+src_configure() {
+	econf $(use_enable nls) \
+		  $(use_enable curl plugin-curl) \
+		  $(use_enable aria2 plugin-aria2) \
+		  $(use_with gnutls) \
+		  $(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
+
+	if [[ ${PV} == *9999* ]]; then
+		dodoc AUTHORS ChangeLog README
+	else
+		dodoc AUTHORS ChangeLog NEWS README
+	fi
+}
+
+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 43867c2448a0..14ab60525c23 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -1,22 +1,30 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.8 2012/12/02 17:09:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uget/uget-9999.ebuild,v 1.9 2014/05/08 03:05:13 wired Exp $
 
-EAPI="4"
+EAPI="5"
+
+inherit autotools eutils
+
+LANGUAGES="linguas_ar linguas_be linguas_bn_BD linguas_cs linguas_da linguas_de
+	linguas_es linguas_fr linguas_hu linguas_id linguas_it linguas_ka_GE linguas_pl
+	linguas_pt_BR linguas_ru linguas_tr linguas_uk linguas_vi linguas_zh_CN
+	linguas_zh_TW"
+
+IUSE="aria2 +curl gnutls gstreamer hide-temp-files libnotify nls ${LANGUAGES}"
 
-IUSE="aria2 +curl gstreamer hide-temp-files libnotify nls"
 if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-2
+	inherit git-2
 	KEYWORDS=""
 	SRC_URI=""
-	EGIT_REPO_URI="git://urlget.git.sourceforge.net/gitroot/urlget/uget"
+	EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget"
 else
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 	SRC_URI="mirror://sourceforge/urlget/${P}.tar.gz"
 fi
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
-HOMEPAGE="http://urlget.sourceforge.net/"
+HOMEPAGE="http://www.ugetdm.com"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -28,6 +36,7 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.4:3
 	curl? ( >=net-misc/curl-7.10 )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
 	gstreamer? ( media-libs/gstreamer:0.10 )
 	libnotify? ( x11-libs/libnotify )
 	"
@@ -38,16 +47,19 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
 		intltoolize || die "intltoolize failed"
 		eautoreconf
 	fi
+
+	# fix LINGUAS not getting applied
+	epatch "${FILESDIR}"/${PN}-1.10.4-linguas-fix.patch
 }
 
 src_configure() {
 	econf $(use_enable nls) \
 		  $(use_enable curl plugin-curl) \
 		  $(use_enable aria2 plugin-aria2) \
+		  $(use_with gnutls) \
 		  $(use_enable gstreamer) \
 		  $(use_enable hide-temp-files hidden) \
 		  $(use_enable libnotify notify)