gentoo resync : 28.04.2019

5 files changed, 18 insertions, 119 deletions

diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index c01ca7eee7c9..c2e0374c86e1 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,9 +1,5 @@
-DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
-DIST xfce4-sensors-plugin-1.3.90.tar.bz2 474322 BLAKE2B 3d3e4c08ea1e6c973b3dc274a64826e4cd1ff75ab9eda91a822eaf1caad7786364d2c5f35b36d3b5772d0f99e7c13349f69c23f98312cecdda1d73eb87b33839 SHA512 692bcaad876323627a882f5e6e535f547e8eff59676a0586c86496abe410d395fd4f049febcd9c8bd774eed9713d5e12e3f13d5eda91c888eb165fc7bcf8c294
 DIST xfce4-sensors-plugin-1.3.92.tar.bz2 477837 BLAKE2B e5399a3052b124c5391209c6ca6bc849467e09be3dac6b7a7d1c946f800e22dcfe84d245b6236cb56cdcea756c98d9bb70c1c945b597f13e49ff18455f4f4715 SHA512 a5b7d90683c993205323084431606cc6d13de88989e3636fba5c06bfa7ef52fbe6285e3bd7f8eb70683541b5c42727c8fbe7bf80e8832bcfb378de0e6d7d7b37
-EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1412 BLAKE2B 97e2eb9a00ce3b34606e023f917bc89f23fff70609327be9c9948f6990bf3c484a1cab8443f6b1399998c469e431530aae1210c00a84aa4a3549e8c8a59942c4 SHA512 b0e07260882350536c16d155c7918f54e060f2f815af62c18ef2c6ec45dc725157c5dd94f52a5d0fb595a9a691e794a72f1a28c56cdc9b93c6581b89b633f35a
-EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1523 BLAKE2B 05c809b077c321791d055d9916bb5130038a13f5f8ffa74537017114007bde76391ccd7f31745d498e7bb5529d6006eda3f3fcafc79839cf9fe546941a5b7d8c SHA512 a2ed8743ef0d44deb17aecc9e4a6dff35ea04b11866b86d67908c2c6a9a82e617ab365bbc31a1b9aae12cfc7b814fbfd3700974fb01aa54e39379a55c1606ea2
-EBUILD xfce4-sensors-plugin-1.3.90.ebuild 1526 BLAKE2B af233f6b7653dc989b0b91710442f3ea9ca5417b58265b4606de663e5456b10889cf45fb174c34d43d64f07004de542e773f978d244635db4ce0eadc691cd147 SHA512 5b860e0f2a3f23faa0ef7d08e1952dec7d360c3e2f00f911e3da9e3300656d9e1d4b03d4949dbdbf1b982c9cd629e365bd79fcb30cab7c65f8a39ec8215a4440
-EBUILD xfce4-sensors-plugin-1.3.92.ebuild 1526 BLAKE2B 36eec69409a79f60cdeb7f09ffe4ba6b03624f7bc972ada798aeb0d42a55db4f1ec578cad5be8c0b839847e47bace796c2865331fb8de6a0cb9aa39405b51f89 SHA512 ab0d50c331c53609d3454087c18f8659fc212313c785b2ccdc04563417303a3c79495579665032e561b7d842ea503365e42bb53f1018c88b64897138bbd739e5
+EBUILD xfce4-sensors-plugin-1.3.0-r1.ebuild 1594 BLAKE2B 2136e7c0a2f0840d417afa6c2fe61b094ed6570979cca15e79525d76d7efa6dbc3b47433dc12194db1bf6f7b1094d7120bdaa06b3f8a9483cc667f0aa198305a SHA512 9d7f190f6dd4b04041c8abec235ac6fa74d76fc7b3fcf0d677dbc915b830afb7a115617a1d22486537430b703c60c1fc2455059e032f0120994e2e2ddfe4c3fc
+EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1597 BLAKE2B 54fd372e7b1946af7e970f94add1c6222960331a4015b8b4db188eacc40a9450b02819f0d4d9071b21738ba3039bf50830ac175d756dfa003db25b846b9ece1e SHA512 e042d1e691bf7bf3afcb1fbda7215dc554a16a5fbc32a07635864740a9f48580482a98f028b843654efa008e0f7563619a785f6b2bb09de0cb052655cd1d6049
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
deleted file mode 100644
index 57eab8986b1c..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
-
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
-
-RDEPEND=">=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm_sensors libsensors)
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable video_cards_nvidia xnvctrl)
-		$(use_enable libnotify notification)
-		--disable-pathchecks
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install manualdir="${EPREFIX}/usr/share/man/man1"
-	einstalldocs
-}
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
index cb49206fd12f..b34896e279f6 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
@@ -19,7 +19,14 @@ REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
 RDEPEND=">=x11-libs/gtk+-3.20:3=
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
 	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
+	hddtemp? (
+		app-admin/hddtemp
+		|| (
+			net-analyzer/openbsd-netcat
+			net-analyzer/netcat
+			net-analyzer/gnu-netcat
+		)
+	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.90.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.90.ebuild
deleted file mode 100644
index 41cea6e16516..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.90.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
-
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
-
-RDEPEND=">=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm_sensors libsensors)
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable video_cards_nvidia xnvctrl)
-		$(use_enable libnotify notification)
-		--disable-pathchecks
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
index 5339ab77ed2a..e0f3cbc46371 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -19,7 +19,14 @@ REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
 RDEPEND=">=x11-libs/gtk+-3.20:3=
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
 	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
+	hddtemp? (
+		app-admin/hddtemp
+		|| (
+			net-analyzer/openbsd-netcat
+			net-analyzer/netcat
+			net-analyzer/gnu-netcat
+		)
+	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"