public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/
Date: Sun, 10 Sep 2017 22:18:31 +0000 (UTC)	[thread overview]
Message-ID: <1505080914.43f5c510450633d249f596fcc4f74255df76bb73.asturm@gentoo> (raw)

commit:     43f5c510450633d249f596fcc4f74255df76bb73
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 21:52:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 22:01:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f5c510

net-misc/dhcpcd-ui: Drop USE=qt4, fix DEPENDs, switch to https

Simplify and clarify REQUIRED_USE.

Remove the last remaining reverse dependency of knotify:4 and also
get rid of deprecated kdelibs4 dep.

Gentoo-bug: 629018
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild | 49 ++++++++++++----------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
index 82d678f8c02..a89c1a8d701 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
@@ -3,53 +3,46 @@
 
 EAPI=6
 
-inherit qmake-utils systemd
+inherit systemd
 
 DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd-ui/"
-SRC_URI="http://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
+SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug gtk gtk3 qt4 libnotify"
+IUSE="debug gtk gtk3 libnotify"
 
 REQUIRED_USE="
-	?? ( gtk gtk3 qt4 )
-	gtk3? ( !gtk )
-	gtk? ( !gtk3 )"
+	?? ( gtk gtk3 )
+	libnotify? ( || ( gtk gtk3 ) )"
 
 DEPEND="
 	virtual/libintl
-	libnotify? (
-		gtk?  ( x11-libs/libnotify )
-		gtk3? ( x11-libs/libnotify )
-		qt4?  ( kde-frameworks/kdelibs:4 kde-apps/knotify:4 )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
 	)
-	gtk?  ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt4?  ( dev-qt/qtgui:4 )"
-
-RDEPEND="
-	>=net-misc/dhcpcd-6.4.4
-	qt4? ( dev-qt/qtsvg:4  )"
-
-pkg_setup() {
-	if use qt4 ; then
-		# This is required in case a user still has qt3 installed
-		export QTDIR="$(qt4_get_bindir)"
-	fi
-}
+	gtk3? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+	)
+	libnotify? ( x11-libs/libnotify )"
+
+RDEPEND="${DEPEND}
+	>=net-misc/dhcpcd-6.4.4"
 
 src_configure() {
 	local myeconfargs=(
+		--without-qt
 		$(use_enable debug)
 		$(usex gtk  '--with-gtk=gtk+-2.0 --with-icons' '')
 		$(usex gtk3 '--with-gtk=gtk+-3.0 --with-icons' '')
-		$(usex qt4 '--with-qt --with-icons' '--without-qt')
 		$(use_enable libnotify notification)
-		$(use gtk || use gtk3 || echo '--without-gtk')
-		$(use gtk || use gtk3 || use qt4 || echo '--without-icons')
+		$(use gtk || use gtk3 || echo '--without-icons --without-gtk')
 	)
 	econf "${myeconfargs[@]}"
 }


             reply	other threads:[~2017-09-10 22:18 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-10 22:18 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-14 16:33 [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/ Petr Vaněk
2023-12-24 17:21 Arthur Zamarin
2021-10-24  9:29 Sam James
2021-03-08 10:26 Sam James
2021-03-08 10:25 Sam James
2021-02-07 20:19 Andreas Sturmlechner
2021-01-15 17:42 Lars Wendler
2020-12-28 19:44 Lars Wendler
2020-08-06 10:21 Lars Wendler
2020-08-06 10:18 Lars Wendler
2020-07-05 13:44 Agostino Sarubbo
2020-07-05 13:36 Agostino Sarubbo
2020-07-02 15:02 Lars Wendler
2019-12-21 14:54 Lars Wendler
2018-08-16 17:25 Jonas Stein
2017-09-10 22:18 Andreas Sturmlechner
2017-02-12 15:44 Agostino Sarubbo
2017-02-04 15:21 Agostino Sarubbo
2016-12-26 17:19 Lars Wendler
2016-07-07 22:54 Yixun Lan
2016-03-23 12:14 Lars Wendler
2015-10-25 10:49 Mikle Kolyada
2015-10-19  9:27 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1505080914.43f5c510450633d249f596fcc4f74255df76bb73.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox