gentoo resync : 21.09.2018

5 files changed, 2 insertions, 127 deletions

diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
index f343ed4a46a0..96a1d6dac985 100644
--- a/x11-plugins/wmmisc/Manifest
+++ b/x11-plugins/wmmisc/Manifest
@@ -1,7 +1,3 @@
-AUX wmmisc-1.1-build.patch 1304 BLAKE2B a9e24d80d86d9e80b62dab8a517ae4be857736e70f9b9a68a7b8d6a90ff91c4797e869cdf9497094a8fc53e30f25efb65fc13cb33ae4398174de2c77c61780e7 SHA512 526ede38debd5cc64d846f98154d3484c40e12839197f4bb4694e95f43420be79f4225720973f44a2012401105f0f213296709808d79c952a5725e8b7d3c0e3f
 DIST wmmisc-1.2.tar.gz 96087 BLAKE2B f48c9dc9afee04de7d437143deb870083e90d01768510b68df2c0e213cfb7ab956696f88d0a76c23a1ff5e5dd5c1d8e5c4640b6766dd7a948d1ad292f2b144fc SHA512 d8ed7c06665c28fb98e2a555c8abfcb7da9e0ae517031d24dce171f8a93775565471176d9dc8905043ae408b23c2f101eaccc364ecd8fa4816d2b529f7922d68
-DIST wmmisc_1.1.orig.tar.gz 18032 BLAKE2B 2e1957bc9e6efd0e646dc1403eac125d06fb7176ed92617f9d3e767c85b3d347dbe60e61da90e2c11ba160ddca29db28049f39dc89ab9bc45cc0068c27192a82 SHA512 9f9e93df309902e97a5b42a674bb06767a1cfa524553d140e370060c01a398bfdafcebfc806daa4b4f42b1422932512d48e33ebce444011ad410a5b460592582
-EBUILD wmmisc-1.1-r1.ebuild 683 BLAKE2B e41bbcf9a15710c431ac0ac1a0a808899733a08b2c3d8074231e93e63268284b5274c530e485ad58315d309569fa20ca7be88271b56713c5c660240a3c2cbbf7 SHA512 c6f37ddf56c332105fe38a08ec48948506346adfbb3348dbe3306be48e134cbc841c3bdaddc012b5b93655459e25383d5b867586898ee897b617e68c1860da81
-EBUILD wmmisc-1.1.ebuild 755 BLAKE2B 4a368078298a8b67059350373a960ba463ea09d1feced4a20f8fa98b0a8314f0030c99feaccb2a2e8626aad4206fc74354620089f356a868e4e757308d658519 SHA512 311ac1f687a75557fdfd172dfde6ffff67f37619dc45df38907d62244e664a39faac23c62c5c2831cad36595d99c1293d16cdd61afb1d9f88193a3b2c0dcb93c
-EBUILD wmmisc-1.2.ebuild 444 BLAKE2B d24c5c1231226296fb0819f8f5843bdc7481700898813a71154721a035f883c16e0119e27e1d99b2169637dcdd86e72b9b7086d5adc0f1f4e9f3987086654fd7 SHA512 2e42e523b01c1b017bfea366d2ca53997770e167ccd096ac1c071cfdf5ebdc8283664adf26a19606a18266b762647e0c810b328d7a161d2fbfd88d3e9f5acc0c
+EBUILD wmmisc-1.2.ebuild 443 BLAKE2B 457c8a4b9565293b35ca3e18eaf8973d6fcbc719ae6b12d18da84c6ea9478ac79952978e1395ca4bf457892496afbbf481ef004d7600e0ff4a1c573dbb3f9ec9 SHA512 182354f805cec1b33b90f1b36c7d43a0ac37c66e9e58578f2fc44ec772976f47054731823cb4fe5b09a6679bee523538a16eb3cc60d74f16d4a7209b111beb1f
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch b/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
deleted file mode 100644
index 28979642dcbb..000000000000
--- a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur wmmisc-1.1.orig/src/general.mk wmmisc-1.1/src/general.mk
---- a/general.mk	2006-01-07 19:50:31.000000000 +0200
-+++ b/general.mk	2008-01-16 20:44:59.000000000 +0200
-@@ -16,7 +16,7 @@
- MANDIR      = $(PREFIX)/share/man
- # Set some destination locations.
- 
--CC          = gcc
-+CC         ?= gcc
- CXX         = g++
- # Set the compilers.
- 
-@@ -45,13 +45,7 @@
- # Set the assembler and flags.
- 
- LD          = ld
--LDFLAGS     = -lm
--ifeq ($(MODULAR_X),1)
--LDFLAGS    += $(shell pkg-config --libs x11 xpm xext)
--else
--LDFLAGS    += -L/usr/X11R6/lib -lX11 -lXpm -lXext
--endif
--LDFLAGS    += -Wl,-O1
-+LIBS        = -lm -lX11 -lXpm -lXext
- # Set the linker and flags.
- 
- AR          = ar
-@@ -64,7 +58,7 @@
- ifeq ($(MODULAR_X),1)
- INCLUDES    = $(shell pkg-config --cflags x11 xpm xext)
- else
--INCLUDES    = -I/usr/X11R6/include
-+INCLUDES    = -I/usr/include
- endif
- INCLUDES   += -I.
- # Set the include locations.
-diff -ur wmmisc-1.1.orig/src/Makefile wmmisc-1.1/src/Makefile
---- a/Makefile	2006-01-07 20:45:59.000000000 +0200
-+++ b/Makefile	2008-01-16 20:43:31.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- $(package): $(objects)
- 	rm -f $(package)
--	$(CC) $(CFLAGS) -o $(package) $(objects) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $(package) $(objects) $(LIBS)
- 
- wmgeneral.o: wmgeneral.c wmgeneral.h
- 	rm -f wmgeneral.o
diff --git a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
deleted file mode 100644
index dfcf13a8c09e..000000000000
--- a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
-HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/${P}/src"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{ChangeLog,README}
-}
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
deleted file mode 100644
index 5b4d2a91fae1..000000000000
--- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
-HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${P}/src
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{ChangeLog,README}
-}
diff --git a/x11-plugins/wmmisc/wmmisc-1.2.ebuild b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
index 7cedad2b173b..56b299d40804 100644
--- a/x11-plugins/wmmisc/wmmisc-1.2.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"