gentoo new year resync : 01.01.2021

4 files changed, 30 insertions, 43 deletions

diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index 41ad790f7156..caca45835ef6 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,6 +1,7 @@
+AUX uget-2.2.1-fno-common.patch 144 BLAKE2B 107c0876bd4c4813836c7d6a4a87ac1f14eb03b2b0bc60af87346d25545eafb79899a781e195a6285d3c0856d026f0f169a71d4e3491fe709cfb3981a30eee31 SHA512 d92104b3ea8af9f66e09e2de78c7d12ea0b4655dabe1dcdd1f3bbdc0bc78eb2b4fb417430a3b16b7c13826d7fa467e634bb026289d6102d380c05e798d692309
 DIST uget-2.2.0.tar.gz 997012 BLAKE2B 4b6207edbb3e5871c5a8d179856920fa5985e65d9655c0d42e7ff9f1d34dfd6489bb1b75615e12432b5d5bbadb3be503bb605eb5256ba3566465ef4e07559466 SHA512 c3e7f0b7cc31df9d1a6c3717f65ad9b14c9e60acb756997b6f6b94f464257c7fb120be5e15bd1d871b89f6485160fb095bd120fb27abc81bd0ee29e57edde468
 DIST uget-2.2.1.tar.gz 1006697 BLAKE2B 2580cbcbe12d3001ada252a46358c4bc357fbe2ca4e3433e13ad95efb8e99d567a194db024eaf2ba58246a35937a5262be62aac4ee24272421f531dc72eeab20 SHA512 b76e5240e42cd0aa5bc47eb1a9cff0a0d8cdea87995455d72cf925923321f492200896ad904960e7f7462eb9655284f5b295b8a779b42223fe73a098a143576f
 EBUILD uget-2.2.0.ebuild 1329 BLAKE2B 6a8a0af373d4ec53f3af75f47b7613ca97fcc3918fc1f67f1beddd9f2335e143ac196ee275b9189395602b775f5d3cf67f8f03f7a83a72d25d8ee07aa7e34cb3 SHA512 cec68ef122b43196f367637e7dba47f7eca19f592ab820bd0204b429db43b3bc809a98b2eb3339d13a4eaed44242a7a24fa62667674999b3f08b3321bfd5b60a
-EBUILD uget-2.2.1.ebuild 1331 BLAKE2B ec2ee2368e11b9b35343ff3deac72eb17e0166f744f023091fa5dcc855a3b4eeb397871104fa56c7fd99817b78157b66c505c55f932bda13ef6168407b40a352 SHA512 9c0017826a0d7046566af7a514da2d0b4f1ebe859b61e59f794568169b96b1816d0f034c94789b4c3f3c39d97c0e55a99c2c60525bd9a7e3d4ec7975cb00dc0f
-EBUILD uget-9999.ebuild 1333 BLAKE2B 2432499a465f72076b3d0d61bf0ad4fcc1f91ee52e19cc92ba918eb81ef76d673b61d666fe0f40f6f019293638b13da70e6280e15498e5cc972a1cc19d483929 SHA512 204efea7e53166b1d25126cbd9b99dbeb3bb7e7be6488fb63dbc239fe9a876678efc1377c49277530d6a4e73de38dea7eb9f91877dd000fe5fecee689911cd2e
+EBUILD uget-2.2.1.ebuild 1202 BLAKE2B 4aea42e15ea85f3b253fddae3ceb7b4d3ee8ebd77d68bade00e2ac13e6aeee4b45b5f85cb5bf7601429ca2c98d4bd937b693f3b77cf84b73e3a76acb1b449630 SHA512 8bbc1a6bb8c071d0c5794c72e2ca9c35b4d9947a6c5e3be93038245eaaba5efe5703a3c779fadbe9da4b2fadcd8140400914c49e14fb04f142b1bca5ea66a692
+EBUILD uget-9999.ebuild 1128 BLAKE2B 690445c625407e1b8de293f8f405e9887825cd8072e0429bd6cbe2582660a90ce841450869576627bfebc5f0975fe19c211f3baf38c1d7f3571db23c2aa7e5df SHA512 9cfb2b8c9cd4361f2609aa02106748cc84bc24a7a5e4bdc8f9e52eb068c88451d6550fd5fdd17f6174742761383c606b69dd13631d1e7cb17f7e5942854823b1
 MISC metadata.xml 1122 BLAKE2B 09b2ce4fb6a0b65557c7e2564eb499f7da42fdfe2e48e046df182dd9b3418424391bf3011e69cee68534b568750f73e59a5886f46cfb0ac129d96426ce4d359e SHA512 7c4a793bfb36dedc7b07096f6ec3d82ee3196c350245c6d30bfab81b1ab56bc0934d62a3b1dd23972ede9eb4970bc9d9d605532d5305ba21c3d2f26fec526095
diff --git a/www-client/uget/files/uget-2.2.1-fno-common.patch b/www-client/uget/files/uget-2.2.1-fno-common.patch
new file mode 100644
index 000000000000..8910c338e80f
--- /dev/null
+++ b/www-client/uget/files/uget-2.2.1-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/ui-gtk/UgtkBanner.h
++++ b/ui-gtk/UgtkBanner.h
+@@ -64,7 +64,7 @@
+ 		UgetRssFeed*    feed;
+ 		UgetRssItem*    item;
+ 	} rss;
+-} banner;
++};
diff --git a/www-client/uget/uget-2.2.1.ebuild b/www-client/uget/uget-2.2.1.ebuild
index 3608bf8baca1..de91193f2cd9 100644
--- a/www-client/uget/uget-2.2.1.ebuild
+++ b/www-client/uget/uget-2.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit xdg
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
 HOMEPAGE="http://www.ugetdm.com"
@@ -16,9 +16,9 @@ IUSE="aria2 appindicator control-socket +gnutls gstreamer libnotify nls openssl
 REQUIRED_USE="^^ ( gnutls openssl )"
 
 RDEPEND="
-	>=net-misc/curl-7.19.1
+	dev-libs/glib:2
 	dev-libs/libpcre
-	>=dev-libs/glib-2.32:2
+	net-misc/curl
 	>=x11-libs/gtk+-3.4:3
 	gnutls? (
 		net-libs/gnutls
@@ -28,13 +28,14 @@ RDEPEND="
 	appindicator? ( dev-libs/libappindicator:3 )
 	gstreamer? ( media-libs/gstreamer:1.0 )
 	libnotify? ( x11-libs/libnotify )
-	openssl? ( dev-libs/openssl:0 )
-	"
-DEPEND="${RDEPEND}
+	openssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
 	sys-devel/gettext
-	"
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
 	local myconf=(
@@ -50,13 +51,3 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
index a713a776b893..15ba6ecf8dde 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit gnome2-utils xdg-utils git-r3 autotools
+inherit autotools git-r3 xdg
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
 HOMEPAGE="http://www.ugetdm.com"
-SRC_URI=""
 EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="aria2 appindicator control-socket +gnutls gstreamer libnotify nls openssl rss"
 
 RDEPEND="
-	>=net-misc/curl-7.19.1
+	dev-libs/glib:2
 	dev-libs/libpcre
-	>=dev-libs/glib-2.32:2
+	net-misc/curl
 	>=x11-libs/gtk+-3.4:3
 	gnutls? (
 		net-libs/gnutls
@@ -27,16 +25,15 @@ RDEPEND="
 	aria2? ( net-misc/aria2[xmlrpc] )
 	appindicator? ( dev-libs/libappindicator:3 )
 	gstreamer? ( media-libs/gstreamer:1.0 )
-	libnotify? ( x11-libs/libnotify )
-	"
-DEPEND="${RDEPEND}
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
-	sys-devel/gettext
-	"
+	sys-devel/gettext"
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
 
@@ -55,13 +52,3 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}