gentoo resync : 12.03.2021

5 files changed, 3 insertions, 124 deletions

diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 1b0fe7b1d8c7..aa5003793ef7 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,6 +1,3 @@
-AUX dhcpcd-ui-0.7.7-tinfo.patch 912 BLAKE2B 98d9797abc46573c3d83ca6d9d3c97746f9cabaad6a5c5f5e498a3ee3b90b440477552297c425dc75cc778b4071ab48eb730eeb99e235acedf59341170cd0dd8 SHA512 c803e61c2841834e6bcb01b5736dd04f432ee00f2aaeddf083c28df5864c5eea1ca7d1b5395671cca01e52243029d214d31ab4e5f330dc2992add4ac2cb30a72
-DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
 DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
-EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a
-EBUILD dhcpcd-ui-0.7.8.ebuild 1269 BLAKE2B 9d3b9877f5a35c65a2a6ca1461fe9a5bca4353ec5ec36db02f39b50fa69928f26bc5018efb3fcba8eabf6ca99653198daac4476837ea0df27c48dda3bd66f45d SHA512 182d54254e36eb0dad0228959ae23f1ca1a702e0a52c711df5829fdf3ee37d38e1efde139b0faa24854aa390f45ac07d26d0c6225ffe3121cb371b61246557c9
-MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05
+EBUILD dhcpcd-ui-0.7.8.ebuild 1267 BLAKE2B 2ee0d2a0f9d333f826c0d59e5b84abbce55c4e0a76b5efa98beba880e925282dc9c9851936b8efb04bd9c8815f4958317abf90265f1dc7314b7adf4adb5d1a5d SHA512 e099c7c854489d0213a5ed8431bf390d44b450a871366b0f969acd70a225fb0754b3369dcf3c2ba8472ca4df5e9ce179927c8245d8bea791c832930da34e9424
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild
deleted file mode 100644
index 8cd78ad55b53..000000000000
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd xdg
-
-DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
-SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gtk gtk2 libnotify ncurses qt5"
-
-REQUIRED_USE="libnotify? ( gtk )
-	qt5? ( !libnotify )"
-
-BDEPEND="
-	virtual/libintl
-"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		gtk2? (
-			x11-libs/gtk+:2
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-		)
-	)
-	libnotify? ( x11-libs/libnotify )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		media-libs/mesa
-	)
-"
-
-RDEPEND="${DEPEND}
-	>=net-misc/dhcpcd-6.4.4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.7-tinfo.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--without-qt
-		$(use_enable debug)
-		$(use_enable libnotify notification)
-		$(use_with gtk gtk $(usex gtk2 'gtk+-2.0' 'gtk+-3.0'))
-		$(use_with ncurses curses)
-		$(use_with qt5 qt)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
index c6399302fb9a..8df1568682ce 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug gtk libnotify ncurses qt5"
 
 REQUIRED_USE="libnotify? ( gtk )
diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
deleted file mode 100644
index 675b1edad4a9..000000000000
--- a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 988c171aa06bee85e393b28a482c894ccbbf8f58 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 10 Aug 2020 07:45:34 +0200
-Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/configure b/configure
-index ed83221..f77bde5 100755
---- a/configure
-+++ b/configure
-@@ -472,6 +472,21 @@ EOF
- 		LIB_CURSES=-lcurses
- 	fi
- 	rm -f _curses.c _curses
-+
-+	#Check for -ltinfo requirement
-+	cat <<EOF >_curses.c
-+#include <curses.h>
-+int main(void) {
-+	curs_set(1);
-+	return 0;
-+}
-+EOF
-+	if ! $XCC _curses.c -o _curses -lcurses 2>&3; then
-+		if $XCC _curses.c -o _curses -ltinfo 2>&3; then
-+			LIB_CURSES="$LIB_CURSES -ltinfo"
-+		fi
-+	fi
-+	rm -f _curses.c _curses
- fi
- if [ -n "$LIB_CURSES" ]; then
- 	echo "$LIB_CURSES"
--- 
-2.28.0
-
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 84adda2592e8..7a38bb900964 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-<use>
-	<flag name="gtk2">
-		Build with <pkg>x11-libs/gtk+</pkg> version 2 instead of version 3
-	</flag>
-</use>
 </pkgmetadata>