Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 2 insertions, 49 deletions

diff --git a/x11-themes/windowmaker-themes/Manifest b/x11-themes/windowmaker-themes/Manifest
index f632f6e7ea79..b01753991f88 100644
--- a/x11-themes/windowmaker-themes/Manifest
+++ b/x11-themes/windowmaker-themes/Manifest
@@ -69,9 +69,7 @@ DIST reddot.tar.gz 968069 BLAKE2B 9db8cb18f83f5cc43a59694039c325004ad482feb807d7
 DIST redslip.tar.gz 556420 BLAKE2B 86906f8820f81675cdfa8ef599bd56fd95fc21e67f75a101e688074279d5881e8d27aebf5cf77f4795ef2d87b2d6165b0644749f846bd2391f09249b07c221b2 SHA512 42f6948d497bf04ad1ff2480480aec3ac6b97bffce10bb68f872d58afb3db73001ccc975b790d9b551f3bbd64981a89067762ab03aeab1400d4783033fa88cde
 DIST thefuzzyhornet-default.tar.gz 43678 BLAKE2B 327e66c81af3f4b5f4c96141aa06534215de51ba5e120c4945cc3a62e259f730324c3d69c8ecb6df459a439ba6f197108a82263739f03f55f0a55ce4fa5d0e75 SHA512 fe22a2c551edc2ea640375290f3bef2edf0d8b552f46cf7bd055831eb01edef5e48ba911171360af9adc243fb09bce7976b08d0b69ef312fc94bb47948b69595
 DIST where-default-0.2.tar.gz 61648 BLAKE2B db8e4dc4b74c96aff7492ea8ec000bcda4d4bb92b2394c96ab4a3b14f5e78c17439ff810702a0ba02d63fca6936ae5c4cc828c8f5871d089b20840c5ebb897f7 SHA512 9c2367f07bcef3ef6233512b7adaf9111949ddd0cbd1825576fc80a89671b93a43a846787b0acf11648f71402a6a942ddbe0201adc7783be6e535471b0ee3e45
-DIST windowmaker-themes-0.1.tar.gz 16413142 BLAKE2B db65c3a15731a4526d8ce45c56ee7987a3f4c2e32a1020c35ccaae6c722aebda758d83fedbac375f7d42e989544295c57dc2ee8143dd0682ab3fe4d82992621c SHA512 2ecdd6155d9f62ed8e815c8c91e6f46114c1ff79bc4c1c79f383c2dfa55caa576f2c0c0010b469db7d851f4afa6fa196302b4ff5a7acb9d708f81f6708052b47
 DIST wmfrost.tar.gz 345302 BLAKE2B 3bd5fecbf815d9ba78d3e605522e65431ba8a89b7cf5573b3d540a7733d57d3f8bd29dfd8cf0fcd6f0ffbcbabf02e8a58af97ebc17da3b505b5532162f4d2692 SHA512 129d452b3fe907f914e61202e472a63a7d61de7eac54a5d7b9c826f4ba7fb93d6dd0a2c6910e765129c815235e04889d408e3ce3e5ef2970a7590dbf8f1c6b29
 DIST yondo.tar.gz 257438 BLAKE2B 746ae152b9812aa3fbff7fd81d58478415fef0a100f8d51df2a7215cf3290b086e3ee661674dffa37e40ccb3ac05acdf8976378457660896099bdf74344d8f90 SHA512 be93dfdf19ab9d24df747c7acae40996c88dd11df6c8d5f5dd8ebfe2ab1ba114eb531ee1668592501e37e4773abbc5a9b20d6b1adb58169293c945d76017bdbe
-EBUILD windowmaker-themes-0.1-r1.ebuild 1063 BLAKE2B 78b07311480140ec955a373912e36b96d0eff1fc18cfab77e9cd961f805a9bbda87dde6e4b3b3f8ad673bcb6979bb89585293db1bbf324ff358c94b0f4e769a3 SHA512 5fa6a39c7d4a964b35b5d25d6354d8d35d533db6927e5e66d90c2b9f75474e07e7d799fb8d314ea49c5872b90a957226d9c08fc57ffc850e769c2b9bc71c95c0
-EBUILD windowmaker-themes-0.1.ebuild 4029 BLAKE2B a973cc79ea3797f7aba7f5e16223d1d090053ae9dc5fde5ab90046167ff615efe3dc43a64c3f16d1980a1104835c46f21d0f9bc48961e3a16e50e33247e65360 SHA512 c3e16526f0b4b424f99f59e34743b354eec51e2a628cbd8b7a200ed2f3fca48f6a7eba39b69af9bc74b76203fb80d6fa7305a40d295c42cd9e7ed62dc2d3f312
+EBUILD windowmaker-themes-0.1.ebuild 4041 BLAKE2B 5e25f58b3a4bd07689bc185bebc1e09ac236133e0dcfd026b154f2c108ed2e257c773dba68d33a6c29da59aeefa282a3b41c487d006064eb35598bf5f44d072a SHA512 b469780681bfdaa470e5b9761ea93901dfa66bd7d34ae35b577e404c772cfe4f114e5dcea7674596b77a7d085baad9fcc504f2d4659c53cf2ad4b1d233bbd031
 MISC metadata.xml 253 BLAKE2B 3b0c2aef2a8a4a9d91417347a62b76bee2b27a774bee648874d8a4d20800ed78d3452f3c5289b6d47c6bd2188752b41ef94f0919cff5de8cc7d4aafa5bbcffe4 SHA512 2adb9b9e4859c6d1063e67c509015594eec484e91882e3a71b70ac031e02b6f01ab5a2ad4e1a12329c284b34f7d69b19e08b593a0dc3901e2470eabb3e8d3fb5
diff --git a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild b/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
deleted file mode 100644
index a6be1af95404..000000000000
--- a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Break themes up by author and into sub-dirs named after
-# the author
-
-DESCRIPTION="Collection of Window Maker themes"
-HOMEPAGE="http://www.windowmaker.org/"
-# Original site: http://gentoo.asleep.net/windowmaker-themes
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND=""
-RDEPEND="x11-wm/windowmaker"
-BDEPEND=""
-
-src_prepare() {
-	MY_OFFENSIVE="3white Anguish"
-	if ! use offensive ; then
-		for j in ${MY_OFFENSIVE} ; do
-			rm -rf ${MY_OFFENSIVE}.themed
-		done
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/share/WindowMaker/Themes
-	doins -r .
-}
-
-pkg_postinst() {
-	einfo "The Window Maker themes downloaded are by the following artists:"
-	einfo "A.Sleep - http://www.asleep.net/"
-	einfo "Largo   - http://largo.windowmaker.org/"
-	einfo "Hadess  - http://www.hadess.net/"
-	einfo "jenspen - http://themes.freshmeat.net/~jenspen/"
-}
diff --git a/x11-themes/windowmaker-themes/windowmaker-themes-0.1.ebuild b/x11-themes/windowmaker-themes/windowmaker-themes-0.1.ebuild
index fbf00b505b14..6b098d770bfa 100644
--- a/x11-themes/windowmaker-themes/windowmaker-themes-0.1.ebuild
+++ b/x11-themes/windowmaker-themes/windowmaker-themes-0.1.ebuild
@@ -95,7 +95,7 @@ IUSE="offensive"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86 ~amd64-fbsd"
 
 DEPEND=""
 RDEPEND="x11-wm/windowmaker"