gentoo resync : 19.03.2019

5 files changed, 7 insertions, 64 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 915fd48e9a6c..ba58a77b54ae 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 2a2179bbd2e6..08c8b29b5020 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,4 +1,3 @@
-AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b994dd279a1e5983e14f7786899f479042cc08a4bacbbf3677d46a9265863b59eb567cdabb433a67100f0ea6cbad12f90e0ba96fac6221d9c SHA512 167751a95d33f7a91a8a2cd70d444c31667ad30fa8f99b74f303f9edf699708511d0cdfa0830b07f08191ae4d1e4932cf3e350501e1ca809b255f0a1673d5406
 AUX xfce4-diskperf-plugin-2.6.1-sysmacros.patch 626 BLAKE2B 116648fa6b865abd4e9a1ec2f42cc6d3efb8c5f1380fdd197722a50206460573e3a4c6eeee61f3f1005962c36d1cbc8371112204c4745ab4c816a1c108f01d0a SHA512 d2e42cb9c5b430d20996ca912504bbce949c4153bff12f6be72ed6b73e891194ce2d1de0f3ed8e1cefca0d7740732a01e8dd38b522deb0b29ff6b35f32341626
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
 EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1058 BLAKE2B 32df565ba5cdebdd438d8278e26ddf1ac3ce5f9a50a93a4592d9ba5a7b3e7cda160ef8bbf5e5eacf3eee083d59de8be54dc68a897f4ebf910464afe85dc64493 SHA512 6b5a984d997d3bb6b48f2a4e172d465dc19434fbc836a7d9ac6212246c00a1f5ff890a5f737f47040026cc2dd949c3ef4a5a6fd0546bc828c2b2e81f479fc780
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch
deleted file mode 100644
index c0515f1558be..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Nico R. <n-roeser@gmx.net>
-Date: Sun, 28 Jan 2018 15:15:07 +0100
-Subject: [PATCH] work around glibc namespace pollution
-
----
- panel-plugin/devperf.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
-index 29bcb87..95d2f0e 100644
---- a/panel-plugin/devperf.c
-+++ b/panel-plugin/devperf.c
-@@ -69,7 +69,7 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf)
- 	iMinorNo = minor(p_iDevice);
-     struct timeval  oTimeStamp;
-     FILE           *pF;
--    unsigned int    major, minor, rsect, wsect, ruse, wuse, use;
-+    unsigned int    majorNo, minorNo, rsect, wsect, ruse, wuse, use;
-     int             running;
-     char            acStats[128];
-     int             c, n;
-@@ -80,10 +80,10 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf)
- 	return (-1);
-     }
-     while (1) {
--	n = fscanf (pF, "%u %u", &major, &minor);
-+	n = fscanf (pF, "%u %u", &majorNo, &minorNo);
- 	if (n != 2)
- 	    goto Error;
--	if ((major != iMajorNo) || (minor != iMinorNo)) {
-+	if ((majorNo != iMajorNo) || (minorNo != iMinorNo)) {
- 	    while ((c = fgetc (pF)) && (c != '\n'));	/* Goto next line */
- 	    continue;
- 	}
-@@ -126,7 +126,7 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf)
- 	iMinorNo = p_iDevice & 0xFF;
-     struct timeval  oTimeStamp;
-     FILE           *pF;
--    unsigned int    major, minor, rsect, wsect, ruse, wuse, use;
-+    unsigned int    majorNo, minorNo, rsect, wsect, ruse, wuse, use;
-     int             running;
-     int             c, n;
- 
-@@ -138,9 +138,9 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf)
-     while ((c = fgetc (pF)) && (c != '\n'));	/* Skip the header line */
-     while ((n = fscanf (pF,
- 			"%u %u %*u %*s %*u %*u %u %u %*u %*u %u %u %d %u %*u",
--			&major, &minor, &rsect, &ruse, &wsect,
-+			&majorNo, &minorNo, &rsect, &ruse, &wsect,
- 			&wuse, &running, &use)) == 8)
--	if ((major == iMajorNo) && (minor == iMinorNo)) {
-+	if ((majorNo == iMajorNo) && (minorNo == iMinorNo)) {
- 	    fclose (pF);
- 	    gettimeofday (&oTimeStamp, 0);
- 	    p_poPerf->timestamp_ns =
--- 
-2.16.1
-
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 6ed45abec67c..eb57c471738a 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,5 @@
-DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
 DIST xfce4-screenshooter-1.9.3.tar.bz2 502188 BLAKE2B 93b60422eb6cef23b4d1f29fca49370cead8f74c4ee27ea4abf2bb9b4fa006f1dd9e39ccc87c1d915a5e7cc902245caff4b7778b801436a1c25893f46e35f3fb SHA512 ba59fdca3900143a50b3b858986b1152d4574d302d2e041a5287933427a67f64542ca691c130030937344433ea893a1f082086f9c02a9edccaeedbdc0a2a50a2
-EBUILD xfce4-screenshooter-1.9.1.ebuild 1100 BLAKE2B ba25af07633cc8c2636029d83dd4a7b03b03b1da2635c2110481b52c4ae8681809de81f6c0c9949c722a20f9c0f43d4d6b36b8ba185058199d1ac8b1cf2390c4 SHA512 373707325c3cfc345ea5b34ea81bdbf29b1efa67968cf6e12ab3c825995ac17055b9773740e15be7207d4ef377e2f10ffd1562def72d31bca93434f7919d66a5
+DIST xfce4-screenshooter-1.9.4.tar.bz2 500260 BLAKE2B e9834e5fab730ee9f22aa18d3e5d68c32afab18a5b621f60c1511b1929fd00f552aa2b9a67f8408c83fced93fa4c28d0a6993081b5dcdd6004e8f61e1d283eff SHA512 9f7240aafe8662cc8a8e105602ba26b31ea212ab4e74f55a4a3c80acf06f0316fe5376430c91a6a0b8e43e85763ca6df6a8af5f64c142c1ca3cce2f8ec3c31f9
 EBUILD xfce4-screenshooter-1.9.3.ebuild 1118 BLAKE2B f9574ff232b9e90d200d7cc582a5fb7b11b5cf8770a29614e9d7e79f407d83aa72cd91fff3f98f04c9b71a91e5bc77ec57a89e39d599a12ae2f3b15da42880a1 SHA512 e52ee4cc5614e9c5e30739fb4cef250917268bfb2aca746c0b0f7272c21fcef50a67f68b81993c9b2b1134c127f2fec73509380cf1da58f886472a888f27e541
+EBUILD xfce4-screenshooter-1.9.4.ebuild 1143 BLAKE2B 717592d458d74b63cbfb41ce3e37b93a84ae9e2539442b7087543a94e7a0547b10ebb8c0e5868c9a877d650182c6888b32e7eaed72679e6495641903e9fa3803 SHA512 c4099ae9689fe3d8e49d758f95243459da0682a1ac433b66128b35ec1b2c4ab04e2fc175229f09fbe7854970e2bbfd4412c09071cf9cd08070766473ec6c362f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.4.ebuild
index 63f0862902af..745c13b46468 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ DESCRIPTION="Xfce4 screenshooter application and panel plugin"
 HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
@@ -27,7 +27,9 @@ RDEPEND=">=dev-libs/glib-2.16:=
 	>=xfce-base/libxfce4util-4.10:=
 	>=xfce-base/libxfce4ui-4.12:="
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
+	sys-apps/help2man
 	virtual/pkgconfig"
 
 src_configure() {