From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-misc/dhcpcd-ui/Manifest | 8 +-- net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild | 54 ---------------- net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild | 74 ++++++++++++++++++++++ net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild | 67 -------------------- .../dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch | 40 ++++++++---- net-misc/dhcpcd-ui/metadata.xml | 3 - 6 files changed, 104 insertions(+), 142 deletions(-) delete mode 100644 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild create mode 100644 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild delete mode 100644 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild (limited to 'net-misc/dhcpcd-ui') diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest index ef316f7e12b4..1719673f9441 100644 --- a/net-misc/dhcpcd-ui/Manifest +++ b/net-misc/dhcpcd-ui/Manifest @@ -1,6 +1,4 @@ -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 +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 -EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 BLAKE2B 4d8ddcf2828a6b7523861e74b29be68d1cbef7fbaeea01de7920ddf6d64206179f292626238639b74bfb34b83307b1989810aa6f35c7c978cb0798e8b919c30d SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526 -EBUILD dhcpcd-ui-0.7.7.ebuild 1265 BLAKE2B c8cdb6e44699e696a972539c92a6fe1d3135e1e9ccbf9632ce8326a9a5761974774dd2ae00f1450df1827706d660de357b7bec5601826c8b3d04f83c482213b2 SHA512 7374ae5adcd9daf488d46c995535d2c3fccb37d8574b42c99e6b83f490587139933004805322a9150afd9da6aa918b7da621ae8ef945761564970f9b79941698 -MISC metadata.xml 379 BLAKE2B f9018bb0bad0ae5539e4d49b96cc61303ebeed6506464b15180a50e186315cb5c4989e2092237abbec4002932b4468c80c621f0f053a8a01b502db873e7a198b SHA512 8ce600176afa1fb8ef3d6f17f22b2757bd719f6a12cb377ff909333a3cc4f3d9b0e563c9cd3f11ddcf4151e5362c4fa66825eec9e8ca0ca3180f170b9334d2bd +EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a +MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05 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 deleted file mode 100644 index a89c1a8d7012..000000000000 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug gtk gtk3 libnotify" - -REQUIRED_USE=" - ?? ( gtk gtk3 ) - libnotify? ( || ( gtk gtk3 ) )" - -DEPEND=" - virtual/libintl - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - 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' '') - $(use_enable libnotify notification) - $(use gtk || use gtk3 || echo '--without-icons --without-gtk') - ) - 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/dhcpcd-ui-0.7.7-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild new file mode 100644 index 000000000000..8cd78ad55b53 --- /dev/null +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild @@ -0,0 +1,74 @@ +# 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.7.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild deleted file mode 100644 index a92eeca9d77e..000000000000 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 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? ( - 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 -} 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 index ca7c284e428e..675b1edad4a9 100644 --- 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 @@ -1,25 +1,39 @@ -From 28eeb5e4a5d92ff913e3956550bff56f615c97df Mon Sep 17 00:00:00 2001 +From 988c171aa06bee85e393b28a482c894ccbbf8f58 Mon Sep 17 00:00:00 2001 From: Lars Wendler -Date: Sat, 21 Dec 2019 15:17:56 +0100 -Subject: [PATCH] Fix build against ncurses with separate tinfo lib +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 --- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) diff --git a/configure b/configure -index ed83221..bae1180 100755 +index ed83221..f77bde5 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" +@@ -472,6 +472,21 @@ EOF + LIB_CURSES=-lcurses fi rm -f _curses.c _curses ++ ++ #Check for -ltinfo requirement ++ cat <_curses.c ++#include ++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.24.1 +2.28.0 diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml index f3c463d88512..84adda2592e8 100644 --- a/net-misc/dhcpcd-ui/metadata.xml +++ b/net-misc/dhcpcd-ui/metadata.xml @@ -6,8 +6,5 @@ Build with x11-libs/gtk+ version 2 instead of version 3 - - Add support for x11-libs/gtk+ version 3 (The GIMP Toolkit) - -- cgit v1.2.3