gentoo resync : 15.01.2020

4 files changed, 102 insertions, 2 deletions

diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 5d08af511c1c..c7923d6172c1 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,3 +1,6 @@
+AUX dhcpcd-ui-0.7.7-tinfo.patch 588 BLAKE2B 1f6ac41accd2643450721364e5fd907dfeb16981935643218804f94599b0d5c973202669a8eb5f8304f63037ff4be3f146f0f794564179c01574e02d0544d138 SHA512 be55e055ff66ca25bb24c2375a7cde3091a0bf90a4490e9f012a9563bdbfaff28f4e92ea0014c640d57fc296515dfd3d3757fac5fbe8b9f1985d97c23f3c9ce0
 DIST dhcpcd-ui-0.7.5.tar.bz2 209112 BLAKE2B 1eec904acefbc5059496419991b1d53c6715d56e611e09d7474879b4ae2741e61ce85bdd7ca32db42a8a890790d8784ee8904fa1228ab43488a88480f73dcd1c SHA512 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2
+DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
 EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 BLAKE2B 4d8ddcf2828a6b7523861e74b29be68d1cbef7fbaeea01de7920ddf6d64206179f292626238639b74bfb34b83307b1989810aa6f35c7c978cb0798e8b919c30d SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526
-MISC metadata.xml 271 BLAKE2B d35f3e181d7989e6fa9e9cd6923a47aaf9723824442648ce9cea821c560a290fd110b67d5440d095aa67d576cc984574993959fb0fc6069600e4935f13166b3d SHA512 f105166a6d7a278c725e881cd33a253058e0cc4d57d4bb616c09c90e557cc31824b94b41eef95d1241cb31aa0058f34fd95672051c93331244869b7d22433598
+EBUILD dhcpcd-ui-0.7.7.ebuild 1311 BLAKE2B 9ee8198fcb9b50cd813e0afed8f4efff1d3af91d02b8be6b998f11ffba75a6b6f9ed7036eaf84dc29f52e55b4a1cd37608ef1b39173f0a5092b91ea4bd9dd1f0 SHA512 dc7c0a5b1ee4ad0285a5561bce58cb6ba5723883e55947a61d0c9a86b195cad85378a952f82351e9c2906018a9f93b0c4bbee5b7ebff4154c3fb8507f4c412b1
+MISC metadata.xml 379 BLAKE2B f9018bb0bad0ae5539e4d49b96cc61303ebeed6506464b15180a50e186315cb5c4989e2092237abbec4002932b4468c80c621f0f053a8a01b502db873e7a198b SHA512 8ce600176afa1fb8ef3d6f17f22b2757bd719f6a12cb377ff909333a3cc4f3d9b0e563c9cd3f11ddcf4151e5362c4fa66825eec9e8ca0ca3180f170b9334d2bd
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild
new file mode 100644
index 000000000000..710c97f90b5e
--- /dev/null
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+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? (
+		gtk2? (
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf:2
+			x11-libs/gtk+:2
+		)
+		!gtk2? (
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf:2
+			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
+}
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
new file mode 100644
index 000000000000..ca7c284e428e
--- /dev/null
+++ b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
@@ -0,0 +1,25 @@
+From 28eeb5e4a5d92ff913e3956550bff56f615c97df Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 21 Dec 2019 15:17:56 +0100
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ed83221..bae1180 100755
+--- a/configure
++++ b/configure
+@@ -469,7 +469,7 @@ int main(void) {
+ }
+ EOF
+ 	if $XCC _curses.c -o _curses -lcurses 2>&3; then
+-		LIB_CURSES=-lcurses
++		LIB_CURSES="-lcurses -ltinfo"
+ 	fi
+ 	rm -f _curses.c _curses
+ fi
+-- 
+2.24.1
+
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index a2e2ed249ee7..f3c463d88512 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
+	<flag name="gtk2">
+		Build with <pkg>x11-libs/gtk+</pkg> version 2 instead of version 3
+	</flag>
 	<flag name="gtk3">
-		Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
+		Add support for <pkg>x11-libs/gtk+</pkg> version 3 (The GIMP Toolkit)
 	</flag>
 </use>
 </pkgmetadata>