gentoo resync : 18.08.2019

10 files changed, 34 insertions, 53 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 2390f18dd071..06a3ef363034 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/e16-epplets/Manifest b/x11-plugins/e16-epplets/Manifest
index 9c1d464d30d5..4ddc4143e8f4 100644
--- a/x11-plugins/e16-epplets/Manifest
+++ b/x11-plugins/e16-epplets/Manifest
@@ -1,3 +1,3 @@
 DIST e16-epplets-0.16.tar.xz 800796 BLAKE2B 70785fce2949bb5e3b0f950436e63246b576dc2dc13ac392e2d884f913e0f22e68b428b416e20807adfb47ca7a148bb3242efff6dbeac8c734ed645ff3f1c705 SHA512 2cc90dee741a50f54665078db6197d7736d5423419439e640d5170057b80111458dbf4b7c9a92898e96654b1af4a986e5cedb88a565616e70ed0fba6ec82cd9b
-EBUILD e16-epplets-0.16.ebuild 978 BLAKE2B 5bd2796dfccee27f17ed41d8a7cd18b17bcfcba3cb6cfe11276441881355de7af88ffc05b9f8359561f6abf8e79fda489e02b3d276dffd86ca494b23045a3fa1 SHA512 319df8d1e78a3c808d5edf6fd3bc47c64d6a0a9ad02f530d5fc4e1595242438fb581ffc5af1064e2eee505dfb1f72d4eb9a170b4b771acb051037e6320a9335c
+EBUILD e16-epplets-0.16.ebuild 984 BLAKE2B 16705c447142eaa2451ea200c68e437670a3e428806a5ca36c2c7f50dfff6c8d5ff16766c15e374590341f378786b0dbe1fd22f2900df93f8518901b31c24985 SHA512 08af97ab59bb281715aa008ae2424dd4e26a7c1058e96bb56d1cbefcf00f18b59caf021122a063897c578d3900a1beb8def645977341605dc943a8b354ebc831
 MISC metadata.xml 947 BLAKE2B e8ebeb56e1f7cfb9215352c5eabeb2fd75fd558f0ad0006ea7aea5ae7af8510a55727b9a0d31ac0b24d033f2b40091978c25ce931eac12eac944ef3cb7b1adb0 SHA512 64c6ffcab76449ec17c6d36994de2fb95468dfef6fb0d65811feb6a38cf1aa0d080353b782f57dffc6e3cb619d2bbbb847170a6c52578e7ad8e1d87e3f15a3d4
diff --git a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
index 130edb033503..680729e55145 100644
--- a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
+++ b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
@@ -18,7 +18,7 @@ BDEPEND="
 CDEPEND="
 	cdaudio? ( media-libs/libcdaudio )
 	libgtop? ( gnome-base/libgtop )
-	opengl? ( media-libs/glu media-libs/mesa )
+	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
 	>=media-libs/imlib2-1.2.0
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index 9e56f977bc4b..cb6d1af0ba60 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,7 +1,5 @@
-DIST vicious-2.1.3.tar.xz 39336 BLAKE2B 279ad85a5f6f1a9fdea303f982673746e6604955cae1c3b37625c5d5f21fcae2d39da38dbcd3176397e25ad0e6d562225bd78760820647955534e0164fb322fe SHA512 8b03fe4b770f0fcd52fad77a46145032a112cecbe27daa725054cb4c6307fb36727debb48243cd2d1becf2ad0fe3a2aaaa7495e0f041424ee9e45c2b107e7f7f
-DIST vicious-2.2.0.tar.gz 45247 BLAKE2B c3c3f87e5983784edb8742b4aa0534c65ee9c0564cd8f5a81e714b580971c174b9fc86ec0bb33b6aaa31bbca25a6d522d9cbaf8e96d710b17419176e19f3b0b7 SHA512 717c57b14870bb72a35c90c5356a807e2431d50f28be6e50abdbf17d39fea33c5b16ee14746726d238a80f9fe30c0ad1a6a98d6c9730e42437495656fed8cfbe
 DIST vicious-2.3.1.tar.gz 47484 BLAKE2B 2ef6e51507faf7477800091c738e65184439caba9b79004b53f3a479f1370ca64046bc1664c6b746d8ab71370b36f29095406439e2a8fab7524e6bb190350fb7 SHA512 9e89d36d708a7ccdff206451dfb98db8455a16f9d2254167a446af91fadc2103a5274442f38ddf1eb919da23480b6790639cdbbde4a08bffc1cf9221622064c9
-EBUILD vicious-2.1.3.ebuild 650 BLAKE2B 4d9c5f5c1da7d6546f3e418cee775f72b65e3d34e4dc0cb8421d06cbd062f17deb32545da5c500e4ba69b898bfe732316fde6b71eeccd312d9b9660cd441f5eb SHA512 7f46ee44b67567259fbd0ae9120b171096899593141ea408dafb1fc459168d7448d292912709502986f60fbe6eff7606d8351ef9592687b1303aaf03abb567e6
-EBUILD vicious-2.2.0.ebuild 672 BLAKE2B 917ca071a034e5eb946ab78a48af6045439527289c783d2ff7d20025533ddfb12f8904e3e4ca918079ad748ea1b92a62491357b9f156b3fb41025753e1c798e1 SHA512 d9f269b3a7d390d6aef6457c216402c1ebf8d4c58bc6e59e0eebee53bdc2170ee80ae5344bf64301e2ba902e78b2e09eea35279687c9761c5f9be36c253007d5
+DIST vicious-2.3.3.tar.gz 50564 BLAKE2B f472b9e1514c9f731734e6512496da6ebb516a190225035811333ca7a275509828b8b4078d72856b5a488eeaee612e3070406138f1abd9de61aaa0f01ca370b9 SHA512 2549fa168a8c8cebcb9ecf1eafbc7658213b6a5487839e8acbc2aaed18f0d0b8081550ee7beb93770ae7e600158e12b99b9e1c29af8a8807bb200cc1cdf75807
 EBUILD vicious-2.3.1.ebuild 670 BLAKE2B a96e57a97480303b302d1c387de5f9ee8d86173af0c1ccbc3b100a8292a6bbe0b0e679f930eb881b66d655640bf10b3d95052e468181d1baf31e68cda6a3ae4c SHA512 0a1ae727bca18f54e06a4df1cea575328a10604dc85046e1f1ec242eeb22e4d57544ecc2bc6c349b538b1cead65840f75a2797aa41ee70595a33f5c3810d13d0
+EBUILD vicious-2.3.3.ebuild 669 BLAKE2B aa05171e4521066dac77d884ef9ddc719bf2475a2932c6cd1da4ea9440bb41204f569785ca8e9034b31fdb5f3b5ffc1d8162ebb027d9ffb5355f69c59bfab5f6 SHA512 11cb386ea966f246e768cc0490b6406e67e018d2961f9607f845891a385f358ff58a012ffeabf2118c86377b8390b9c5e2cbe67202b40c950aa40edc29f86fa7
 MISC metadata.xml 383 BLAKE2B 91e0094887c3d3ea1e60d96006a87a6fc30fbb58ad329575ce323268a95e7c0d963981c2aa2a5fb10146912e8decc2939e92419a2084af4315e3ce18d3948dbd SHA512 106a9e2d26d2949596de091c1de5cf86d113fca6868b883292d3b254044b3321deefe6f671542b041d500714006ac0c78abf4c6b45eb94c3cb64b7b39144f22d
diff --git a/x11-plugins/vicious/vicious-2.1.3.ebuild b/x11-plugins/vicious/vicious-2.1.3.ebuild
deleted file mode 100644
index 1436fc7b7b76..000000000000
--- a/x11-plugins/vicious/vicious-2.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="http://awesome.naquadah.org/wiki/Vicious"
-SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="contrib"
-
-DEPEND=""
-RDEPEND="x11-wm/awesome"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua
-	dodoc CHANGES README TODO
-
-	if use contrib; then
-		insinto /usr/share/awesome/lib/vicious/contrib
-		doins contrib/*.lua
-		newdoc contrib/README README.contrib
-	fi
-}
diff --git a/x11-plugins/vicious/vicious-2.2.0.ebuild b/x11-plugins/vicious/vicious-2.3.3.ebuild
index 601ea74cde5b..4934c0636f0d 100644
--- a/x11-plugins/vicious/vicious-2.2.0.ebuild
+++ b/x11-plugins/vicious/vicious-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index 9ab2389c51cd..c0f3926b9649 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1,4 +1,4 @@
 AUX wmmon+smp-1.0-list.patch 2916 BLAKE2B 112b15af9d697dff61fd9273526f88330b14a4882d2ed0346df318ffcf0eb53d2778a924fbcae9bb392375545dd4a2103283f129068a499e5bfc44c7186104af SHA512 6b0032f8c518f77cf7d221bf06900209018dca35a75998cb80bac636a8cd8a19f6aee3628acf75780bdfcd09aec454dd1a7e4670627524812040d829a6b0d7fd
-DIST wmmon+smp.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
-EBUILD wmmon+smp-1.0-r3.ebuild 840 BLAKE2B 958a62d5868c7549b16677532d30dcd5978dcd917431003810f356627ac60055fc139c98398ebaa8607b45c89fd3211acd1f0b021146c806bcc54deaf46477be SHA512 753e603c50bd469f77b5e3ed4a3e4fc5da4365ab83bf96cafa67d246efd519e42d41775391660b42c7328d59a3b6171cbaab081a5064312e317a51d13adec126
+DIST wmmon+smp-1.0.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
+EBUILD wmmon+smp-1.0-r3.ebuild 855 BLAKE2B 6451f4adbe2628e3debb5b2620abeed6c0516189ecd6f1590d19c56bc85610d28208340a1bd8c086bb865b177f378e679c6b5bb47617a04d3954f23b234fa57c SHA512 118367a32a7d31566bf3e74a8e2cb8013962ee30cb91fc47c94bc36a19a516c860178a26d6979e5d130b4a8ca51c0d38eedff88e85d03d83f923f0674646215d
 MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 45c4bc627777..8c90cc0ff0cb 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,10 +7,10 @@ inherit toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND="
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 73d23f6a6637..e68250b2e757 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1,4 +1,4 @@
 AUX wmswallow-0.6.1-format-security.patch 497 BLAKE2B 6ac2b96dcba5035b36a90fc9a34364cb472e8b59345d94ca765554065c3382fd1456bc0a45b4fd54beecce534cd9125c7079286c8aab659cfe32e129578533b4 SHA512 6761417ff8dfb000804bb86e2580fbe79b4f8aef21dbf5592e3ed24a097a028c955da72c51b4f3866401db78f81bdf09efc24b408829c125e20d3c409b11fc44
-DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
-EBUILD wmswallow-0.6.1-r1.ebuild 802 BLAKE2B bcc1c2a86066fe51c2892e94bdc20344b37ce80669f0daf8b802606afff4919c956f05feacd0b4a05c9f326459c29782bc065fad0889c3bebb4fd49de183b7b5 SHA512 6f329d967e4ff425ae5a15fcc594620629e4e173a32b6d688ccd6e386d3acb7358db97ff17820e08380fbb3a000f3cd9e3acf2b106f6490e808b23acee6b9c71
+DIST wmswallow-0.6.1.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
+EBUILD wmswallow-0.6.1-r1.ebuild 939 BLAKE2B 62cfba10220745896ede3902abbf47cecde53c229373302c60882cab987f42182c866a5bf401974a23518eaefe8d531d658e658827d9c2c886e0e2507b04a2ae SHA512 5e4385e79ca8f1ebfbb1d9fd94a8537006037831037e907c54b4f784d9fa43a70a5ff8fb30dc9aee3806a00bac435f7dc3f1cabe587176bee52f0ec1081e6fe9
 MISC metadata.xml 644 BLAKE2B 28bbab4a2d177905c74f92f8c57bbe7d046ebcfafff891856d7361ae8c2982271d9f146b5cf5306070e48958eb110aa6855d0187051bb6d33ae4fb0798cbf967 SHA512 fc8f033978bedc4b9d080bc5d99dcd4200988b9751946fb855f182279a16913999c7372f6acb445818fb7fe336176dccd971b3709ee83a691966f6a35643de34
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index d5ab7c82a729..5821727229a1 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -1,34 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A dock applet to make any application dockable"
 HOMEPAGE="https://www.dockapps.net/wmswallow"
-SRC_URI="https://www.dockapps.net/download/${PN}.tar.Z"
+SRC_URI="https://www.dockapps.net/download/${PN}.tar.Z -> ${P}.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/wmswallow
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
-	sed -e "s:\${OBJS} -o:\${OBJS} \${LDFLAGS} -o:" \
-		-e "/LIBS/s/-lXext/-lX11 \0/"\
-		-i Makefile || die
+	default
+
+	# the Makefile is a mess, just
+	# rely on implicit rules instead
+	rm Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext)
+	export LDLIBS="$($(tc-getPKG_CONFIG) --libs x11 xext)"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" xfree
+	emake wmswallow
 }
 
 src_install() {