gentoo resync : 22.05.2018

3 files changed, 0 insertions, 165 deletions

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
deleted file mode 100644
index 77e031488641..000000000000
--- a/www-client/uget/files/uget-1.10.4-gnutls-backport-fix.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-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
deleted file mode 100644
index 9482f1e4b84d..000000000000
--- a/www-client/uget/files/uget-1.10.4-linguas-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/uget-ar-hardcoded.patch b/www-client/uget/files/uget-ar-hardcoded.patch
deleted file mode 100644
index f9ce7bb2f1df..000000000000
--- a/www-client/uget/files/uget-ar-hardcoded.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.ac	2013-04-23 21:14:51.367980659 +0200
-+++ configure.ac	2013-04-23 21:19:23.096311763 +0200
-@@ -19,6 +19,9 @@
- ## Use library (static library)
- AC_PROG_RANLIB
- 
-+## Determine the archiver
-+AM_PROG_AR
-+
- ## Use libtool (share and static library) (add libtoolize to autogen.sh)
- # AC_PROG_LIBTOOL
- # LT_PREREQ([2.2.6])
-
-
---- uglib/Makefile.in	2013-04-23 21:14:51.405980565 +0200
-+++ uglib/Makefile.in	2013-04-23 21:17:22.358607880 +0200
-@@ -51,7 +51,7 @@
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
--AR = ar
-+AR = @AR@
- ARFLAGS = cru
- libuglib_a_AR = $(AR) $(ARFLAGS)
- libuglib_a_LIBADD =
-