[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/, net-misc/dhcpcd-ui/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/, net-misc/dhcpcd-ui/files/

[Andreas Sturmlechner]

commit:     9191a1068f9100cdf32c833e195c3dc04c40da29
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 20:51:24 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 21:13:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9191a106

net-misc/dhcpcd-ui: Drop 0.7.7-r1

Closes: https://bugs.gentoo.org/769158
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-misc/dhcpcd-ui/Manifest                        |  1 -
 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild       | 74 ----------------------
 .../dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch    | 39 ------------
 net-misc/dhcpcd-ui/metadata.xml                    |  5 --
 4 files changed, 119 deletions(-)

diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 4c40350edfc..e8b0b7cd46d 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,2 +1 @@
-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

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 8cd78ad55b5..00000000000
--- 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/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 675b1edad4a..00000000000
--- 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 84adda2592e..7a38bb90096 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>