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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA)

5 files changed, 268 insertions, 11 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/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)