gentoo resync : 22.05.2018

15 files changed, 24 insertions, 534 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9fbcb5248e02..c7e4d79ecab3 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 317c1a84fd84..923c89d6021d 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,7 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
+DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
-EBUILD links-2.14-r1.ebuild 3264 BLAKE2B f47ac285982aadbdd609a44e614e3cd0f7ccc6373e98ce80c38e91118324b33390f37de4efdaedff7d30d9c8340f8502b685f7f076ca2fe9d3202bc44e111eed SHA512 10ab0e03e2acab05dfadbabb95e5f58493cc919166840e3f00f7bf141514dd06940f8e92e5f2e2020bac608df93fd0d1d80db7f1c2c08616e0670ec551abf85f
-EBUILD links-2.14.ebuild 3332 BLAKE2B e1aa4ff36c8765869b25a374ee8a854a8f34fa5235a29c2b1a6f18f212df87b82cc5906b71d378c60cd9f18ad1bfd584b99908bbbdfb238f246c9b8ce03218de SHA512 b2f55df94ffda2db4bcab87115ae8caa92da6e993cc05e903b5675eef2ec6dfba711b3fd899f945a57800226c4fd479ed548c296a4d10d3640abc740970e02ba
+DIST links2_2.14-5.debian.tar.xz 15332 BLAKE2B 20c1d0f5a9eeac2f56bfc8d2e00f343ada5ac28e741fdb9635810f7e39563f0f052f7be0492923c3caf6f000246639bf3ae19ebd5dfb3d8fdfe4e4655dd0bac8 SHA512 d8038515c29998be9510723cdaa2b961d65141fd0b0f863e2fac80f41009a100f0bd824acd97735d089c932c1b5a979f0ed523d773721485b4418ec44df38872
+EBUILD links-2.14-r1.ebuild 3263 BLAKE2B 56181a50978854ccc5971cea6d5bf14679190670b9dd38b5ebfc3740bdc7255fd356c7cc39206156e6aa6a547815da2de8cc6bc75aff4971f3291707bd71c396 SHA512 d8275e5f3acd8020dc8c633dc0821b76c4ca5323f64c12c905ed690de7683d1e1f9b8457290776922baca3a7f6f0ba033204ad54d1189d4756592122e56864d0
+EBUILD links-2.16.ebuild 3274 BLAKE2B 9f581eb2186c4ed5a0807b7620af67cde5362548cd2c887abd3d99fbf77a932a36fe3a48844185943f807d5892ce70237e3e8751ef4dadaa89c31fb5ac1c8772 SHA512 4aee5abcd8d78fecdbe64842d9010858640c2feefe644d7eeb7a9037aedb6f92dca6066d2606b0c140f505d2343971758f70d4052d27dc350010dd80d8aaa1b4
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
index cee4173a3de7..3dc37e4b23c4 100644
--- a/www-client/links/links-2.14-r1.ebuild
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/links/links-2.14.ebuild b/www-client/links/links-2.16.ebuild
index 441b2bd680c4..fc5b0de6a65b 100644
--- a/www-client/links/links-2.14.ebuild
+++ b/www-client/links/links-2.16.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils fdo-mime
+inherit autotools desktop xdg
 
-DEBIAN_REVISION=2.10-2
+DEBIAN_REVISION=2.14-5
 
 DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
 HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+SRC_URI="
+	http://${PN}.twibright.com/download/${P}.tar.bz2
 	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
 
@@ -23,10 +24,6 @@ RDEPEND="
 	bzip2? (
 		app-arch/bzip2
 	)
-	directfb? (
-		${GRAPHICS_DEPEND}
-		dev-libs/DirectFB
-	)
 	fbcon? (
 		${GRAPHICS_DEPEND}
 	)
@@ -77,7 +74,7 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	if use unicode; then
 		pushd intl > /dev/null || die
@@ -108,11 +105,12 @@ src_configure() {
 		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
 	fi
 
-	if use X || use fbcon || use directfb || use svga || use livecd; then
+	if use X || use fbcon || use svga || use livecd; then
 		myconf+=' --enable-graphics'
 	fi
 
 	econf \
+		--without-directfb \
 		$(use_with ipv6) \
 		$(use_with ssl) \
 		$(use_with zlib) \
@@ -121,7 +119,6 @@ src_configure() {
 		$(use_with svga svgalib) \
 		$(use_with X x) \
 		$(use_with fbcon fb) \
-		$(use_with directfb) \
 		$(use_with libevent) \
 		$(use_with jpeg libjpeg) \
 		$(use_with tiff libtiff) \
@@ -146,10 +143,14 @@ src_install() {
 	use suid && fperms 4755 /usr/bin/links
 }
 
+pkg_preinst() {
+	use X && xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	use X && fdo-mime_desktop_database_update
+	use X && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	use X && fdo-mime_desktop_database_update
+	use X && xdg_pkg_postrm
 }
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 69bb6d2a55c3..961868dc7640 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_54.0.2949.0_amd64.deb 55600592 BLAKE2B da3dd24293d9023a70cde720863065a06b13d2dda9b0860091f8f90e52502aff7c363492143a30c0a150ad7e5a478292096d7b8c3eefc6b07d5c9bf1fbac5401 SHA512 85551b992e47dc1740c9ff5772e6c099fba190605f9c8aadfa885042f5fa8b655462811e1851e6a3bda17174a3552b0bb581ce77f76412b9013986672ba9d158
 DIST opera-developer_55.0.2955.0_amd64.deb 55216094 BLAKE2B 0682d750e6425f963364078d0f3198927d336b0b0089456755729a8edd88380feb9c2ae6319e49ae47c4b57d8128d7dd0a6ce4c24e39e550bec3ef3905322f72 SHA512 b410ae6f578e38e90785790b37f364dbe8843a4d40b700696195c87fe7e8098afc44a10aed362f8f2981b455107ec415b08d377a3e3f12f33fce46be8a547ee1
-EBUILD opera-developer-54.0.2949.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_55.0.2962.0_amd64.deb 55673058 BLAKE2B 724b7e70578a02cc52279c284a4cce940e642d2ec4ea91e8ea211eebfe82c78df9b459f62cbea166ed3fa4e3ab501dbee3abc27b1757ac100edf5056bf1e5280 SHA512 e1dfe39e692db1a40e4007298ed78359fd1079a0034b7eb58e7a71a1f4b2512bd69994e1ad3c95ee2232db835b54bdbbd23c9047ea4210ed226ade6dbb3ccbee
 EBUILD opera-developer-55.0.2955.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-55.0.2962.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-54.0.2949.0.ebuild b/www-client/opera-developer/opera-developer-55.0.2962.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-54.0.2949.0.ebuild
+++ b/www-client/opera-developer/opera-developer-55.0.2962.0.ebuild
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index d60ac8c30987..649282f3e032 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,14 +1,4 @@
-AUX uget-1.10.4-gnutls-backport-fix.patch 4590 BLAKE2B e8a694bef13b6ad569ee5c8e6b5ef8f06bfbaf3a6258d45ba42e9e7074dd58965e0fb0bd00945c425778203a235c30a75e8c9d91777284dbc30d4fa9154f3a5b SHA512 88b94f01879d03c0d8778c1b6f3a6ed227df5c0cfd398b75e458e24e11dff0ca5de554cd01f4f54fa75cf16274f0506e419d868b1323afa493fe862c298c22c9
-AUX uget-1.10.4-linguas-fix.patch 1360 BLAKE2B 27192815a432edacc4e9c8798378f62027d7450fea3ac6e22c4cec00608f46f45a09b671065865faa50d7eab6d73d2cb96956da94b460ee8a84c886a581c19e7 SHA512 063636ed5185c2010ec33b0c60e3f896cf553911c795ce7ce54cb5424770bcc95eb35f7f1737df687b72350943ac5e310f5dc4a794493e937bfee0d0938bf6e5
-AUX uget-ar-hardcoded.patch 641 BLAKE2B 52b5b1389e9af06a7608a0e8007e0ddc717d0ca6f424e58c726267a013bdcd35944eec58fd12bfeec86f4d1eea78090dafa5945ef076b2091ad280fbde9121c2 SHA512 efecb72a81a43da83b5cc92beaefcd02a931b32b076ae6d6fd17d75830cd2fad5be951d840822d0d1eb44ec789c21b46a0b1ac83955f492360896eb166a53e5f
-DIST uget-1.10.3.tar.gz 484395 BLAKE2B 53ef428559cae0d8a924c3ac75bec874cd39de0034e105dc34e9848c56906bc0f75482b023181a3567d17e82a92b128613b55b94e41a2f87a6bcb039c18151a3 SHA512 c939832ad2b635e5b1d1e448bf075c13362e3f69f708e6669ad435f6467b258441d5adef34cea176082fa107865c2edd3ceb54c5b9074f0d71f94496e4995a34
-DIST uget-1.10.4.tar.gz 576147 BLAKE2B 92c599d1ae23b6e457b08c457d1145856c1ba34ced958d1cd6b459a0878e07a91479dea5c1f5d5bf4af9cdcf29d98ca90ee6c26fa9e002bfbfd1df2a65f49a48 SHA512 013654ea6d06e8075bb216082dd85e7a4d1ed8510af4ecaf49c816dbf127f1adb157ca275a574f87900d7980cbe70e1e918fe54f0ceb4d0115da0ba07d4f2273
-DIST uget-1.8.0.tar.gz 426031 BLAKE2B ad4b5f664d62c2259a236ee7df7b3880092d957e91584370a39ba546ecba431271a12c3ec3e005db39aacfa6e2b409279befcf83fb6134f004f0f7ef8fec0cac SHA512 c68c591b3c513c4829dfee735cbe8d4ee2c47aed0c5962002de9462c6c12b731e51756785e834aadaef1cb47182b9e560dd836d2e4861f053ec1f2f447c2c68d
 DIST uget-2.2.0.tar.gz 997012 BLAKE2B 4b6207edbb3e5871c5a8d179856920fa5985e65d9655c0d42e7ff9f1d34dfd6489bb1b75615e12432b5d5bbadb3be503bb605eb5256ba3566465ef4e07559466 SHA512 c3e7f0b7cc31df9d1a6c3717f65ad9b14c9e60acb756997b6f6b94f464257c7fb120be5e15bd1d871b89f6485160fb095bd120fb27abc81bd0ee29e57edde468
-EBUILD uget-1.10.3-r1.ebuild 1956 BLAKE2B 8b1f518692fe09910cc1d953d801f9638efbd7a5bd07eaf112702ca3155c82a9c49905fb57e794397320485b2e6063ffe89bdb103ea0634ba60e195d6475541d SHA512 7c3ed3df0174b66f7781dcd9aeab88e13808cb314e0660c16eb00994ff536fd7da177fdc57789d538a8e30ab686b044faa2df7914d454db98abe2a3d049650f4
-EBUILD uget-1.10.3.ebuild 1780 BLAKE2B 0aa2e2eebbe60a57d70c2f98fcbaab766198ba3b84e7524d183e13470c602248f7606e5116abb38db38bf43a53d81aa841615359aa7213c7c1d5470d7b380c3a SHA512 2762bf8101c314467fd2a5fbc79e26d03ddcfe4d904822fd9d399b63e320ca2a663492605bea7c42e60f0189c1135dee4044b89cc397ea43c9e8a195885c490b
-EBUILD uget-1.10.4.ebuild 2074 BLAKE2B 68f4c31980dd19e85f9314f6f9f073e52018eb122b18ac805ad5c7ece041873d200b78b1a71e169e603cda0bb6cd2c50f28dfd9c3efc4bf7d54ba43593e9447a SHA512 737439fea25430a75d6c10645a34e7018949ca61e4383c1706f7ce7df00dccb3aec4315e573cade10072de092727c80891f7059b3dd79844c2cd8b2d9040e2d2
-EBUILD uget-1.8.0.ebuild 1671 BLAKE2B dc64dd3f8385b2cb12f896843eee7cc3cba276afb07ac831ebcabed0e6962f20960e1595ea99534f13c0d9e610a66c2bed5155b36d8bbec3ac185a0ef4ea6e3e SHA512 569c3b50bcfbc7db8a74997ae23d0259da8b7cc7513ea59cad6554f9de6ae1395655a02611d93db026ffdfcb37a6f6cf22eb13503e895f681823a5742e999aa7
 EBUILD uget-2.2.0.ebuild 1330 BLAKE2B de370b7bb55d93eb4b9f5510b1702e4b7e744764a4b2acf98546738c7e4c3caea55a61f194ca7b312313e24be3f4985ff62f05b8fe5e1d4ba29deb9640662e26 SHA512 6963df751210d0d709f467d19a057fd81a7d7d3ccff7905e70041bb03f1ee60ad28cd211cda97f50102fd743edfb5aada2a097ee2a0e8418b07ec9ac0abf1899
 EBUILD uget-9999.ebuild 1334 BLAKE2B 8f5a08bf87702eba4eebf1ab21eca032916ae0592d4294d412debf1564da531a6db54f95076bc39e17d20b53169f3a01bc12e9ff0d19821421f0f7fb4f086534 SHA512 aac62f6b77f2a010ad1c60f27279d094a53f78ea7822ef0678b300a5f0cb01eb8fb0c26f9dd8159b0d1f4665e3f35241a7848aa7c7d6a5ed5df2b906f58bea1c
-MISC metadata.xml 1295 BLAKE2B 671c18f9324ae048ceedeca7adf38fb8ee842a0b5df4f06cc1163d9d94c4c4ec5ca01a947406a3d9ef3f0823f2f7ec5e4fe19cae34f4c01b118362f201115991 SHA512 be3101757d2e3f69e4f066e3ee63e16d883a86c851d4de6e8975b40f21efa04eef98e3d9e87fdbaadbe779bfe92dbc384cdc682ce8a32e5946107ff2d33f8a82
+MISC metadata.xml 1122 BLAKE2B 09b2ce4fb6a0b65557c7e2564eb499f7da42fdfe2e48e046df182dd9b3418424391bf3011e69cee68534b568750f73e59a5886f46cfb0ac129d96426ce4d359e SHA512 7c4a793bfb36dedc7b07096f6ec3d82ee3196c350245c6d30bfab81b1ab56bc0934d62a3b1dd23972ede9eb4970bc9d9d605532d5305ba21c3d2f26fec526095
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 =
-
diff --git a/www-client/uget/metadata.xml b/www-client/uget/metadata.xml
index de4e8c078507..956185cc59a3 100644
--- a/www-client/uget/metadata.xml
+++ b/www-client/uget/metadata.xml
@@ -19,8 +19,6 @@
 		<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="control-socket">Enable JSON-RPC over unix domain socket</flag>
-		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
-		<flag name="hide-temp-files">Make temporary files that are used while downloading hidden.</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>net-libs/gnutls</pkg></flag>
 		<flag name="rss">Enable uGet feed messages</flag>
 	</use>
diff --git a/www-client/uget/uget-1.10.3-r1.ebuild b/www-client/uget/uget-1.10.3-r1.ebuild
deleted file mode 100644
index c489e167a6da..000000000000
--- a/www-client/uget/uget-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base autotools
-
-IUSE="aria2 +curl gstreamer hide-temp-files libnotify nls"
-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 )
-	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
-	eautoreconf
-
-	if [[ ${PV} == *9999* ]]; then
-		intltoolize || die "intltoolize failed"
-		eautoreconf
-	fi
-
-	# fix the .desktop file for QA
-	sed -i 's/Network;FileTransfer/Network;FileTransfer;/g' uget-gtk.desktop
-}
-
-src_configure() {
-	econf $(use_enable nls) \
-		  $(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
-
-	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-1.10.3.ebuild b/www-client/uget/uget-1.10.3.ebuild
deleted file mode 100644
index 65b3716630b8..000000000000
--- a/www-client/uget/uget-1.10.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-IUSE="aria2 +curl gstreamer hide-temp-files libnotify nls"
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-2
-	KEYWORDS=""
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget"
-else
-	KEYWORDS="amd64 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 )
-	gstreamer? ( media-libs/gstreamer:0.10 )
-	libnotify? ( x11-libs/libnotify )
-	"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-		intltoolize || die "intltoolize failed"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf $(use_enable nls) \
-		  $(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
-
-	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-1.10.4.ebuild b/www-client/uget/uget-1.10.4.ebuild
deleted file mode 100644
index 2c275fa113b4..000000000000
--- a/www-client/uget/uget-1.10.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-IUSE="aria2 +curl gnutls gstreamer hide-temp-files libnotify nls"
-
-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-1.8.0.ebuild b/www-client/uget/uget-1.8.0.ebuild
deleted file mode 100644
index 4e62684da6f5..000000000000
--- a/www-client/uget/uget-1.8.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-DESCRIPTION="Download manager using gtk+ and libcurl"
-HOMEPAGE="http://www.ugetdm.com"
-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:0.10 )
-	libnotify? ( x11-libs/libnotify )
-	"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/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
-}