gentoo resync : 24.02.2018

3 files changed, 3 insertions, 57 deletions

diff --git a/media-gfx/peps/Manifest b/media-gfx/peps/Manifest
index 4c376c6a5d2b..55f892733d97 100644
--- a/media-gfx/peps/Manifest
+++ b/media-gfx/peps/Manifest
@@ -1,4 +1,3 @@
 DIST peps-2.0.tar.gz 55421 BLAKE2B 6d259fe66c0e0cb413d9d66ee4d495bb5957f3a233a5878bd4b6b12639d098191e58de9a8fc1f09c713ac74d6e13f589989b4482309e1757cf3c822907c0fa2f SHA512 38940b4288c688d7a5f2a71d260b0b0aafc849988bba6859244a7409b4b08a2d3c1b43adcc940c7af4ff9313b7203ea92858fc855ddf2864548566d78890d767
-EBUILD peps-2.0-r1.ebuild 1206 BLAKE2B 5387673d697e61fd0b3ecb4975e97b0edb880d2602b8b897a0c7037ed93398f5983a4d9b8cfeffd10e3ebde780ce410cf42084bf267e396258247649e00f7ebc SHA512 59bdc101e460fb1e05767b2b568ea4eddc7d4a521a7f38246ea3701d7d05d9fa0d0062e42c0183f28f9817baa594a8c0a12d037a0219194d0edfae0c10ea456a
-EBUILD peps-2.0.ebuild 1222 BLAKE2B 6a45671c0cacb460c10f1dc5d8af378c72e352e44ae6b17b7be8886d07dd4ec0458c5c8804660dae1870c9bf3eb2b66c9b0451640c55783ee0de5edec7c2b69c SHA512 c74dd4fca96d5764427321aa07804a086118f55207196e526eeb4d6f175f0ca8fcf2e6cd2a380eabd8d1e8820dcdd9146e03e1e7f56263f2e15591474c8cc303
+EBUILD peps-2.0-r1.ebuild 1204 BLAKE2B 8c13eb7e741ff4dc134c5c2ae715da53b2e0259d02021ce04f286b29d95fc0845f4290d1c80b549c037e5bd94861e298730630dc1b59a69b8f98175957433991 SHA512 a7d13c0426b308f27010384d5f54aff31940e9f942a26778c7bee607696b88617e7a55b1e2413db92d5c45cc337ecb1907bce310ec3ed2afede581ee71fd4dad
 MISC metadata.xml 512 BLAKE2B c69d2d5a0d510523cbc652a01e4e99bceef0946bb7ef836c931026af679bbf7ce32fa795b98d9c3d54eaf043186b9c96c87fa57c594504d011d8fbc093ee5393 SHA512 3ee45ee8181f04c3d1bd36170eb0ec59906c9c35962c78e5c21e656bdc240e39d6c788e7eb33189c1142a9098e6da3639ebc10063713332c49b32af4c4055ab5
diff --git a/media-gfx/peps/peps-2.0-r1.ebuild b/media-gfx/peps/peps-2.0-r1.ebuild
index 8b79fa61acf1..f094d7b5a1ca 100644
--- a/media-gfx/peps/peps-2.0-r1.ebuild
+++ b/media-gfx/peps/peps-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.peps.redprince.net/peps/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="app-text/ghostscript-gpl
diff --git a/media-gfx/peps/peps-2.0.ebuild b/media-gfx/peps/peps-2.0.ebuild
deleted file mode 100644
index e232d298ea69..000000000000
--- a/media-gfx/peps/peps-2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Preprocess and convert EPS files to bitmap with Ghostscript"
-HOMEPAGE="http://peps.redprince.net/peps/"
-SRC_URI="http://www.peps.redprince.net/peps/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-DEPEND="app-text/ghostscript-gpl
-	app-arch/gzip"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use X && ! grep -q x11gray4 <(gs -h 2>/dev/null); then
-		die "you need a ghostscript version with 'x11' and 'x11gray4' devices!"
-	fi
-}
-
-src_prepare() {
-	# adding <string.h> include
-	sed -i -e "s:^\(#include.*<unistd.h>.*\):\1\n#include <string.h>:" peps.c
-	# adding LDFLAGS to Makefile
-	sed -i -e "s:\( -o \): \${LDFLAGS}\1:g" Makefile
-}
-
-src_compile() {
-	local myopts="peps"
-	use X && myopts="${myopts} xpeps"
-	emake CC="$(tc-getCC)" ${myopts} || die "emake failed"
-}
-
-src_install() {
-	# manual install, because fixing dumb Makefile is more compilcated
-	dobin peps || die "install failed"
-	use X && dobin xpeps
-
-	doman peps.1
-	dodoc README
-
-	insinto /etc
-	doins peps.mime
-
-	# copy PDF so it won't be compressed
-	cp peps.pdf "${D}usr/share/doc/${PF}"
-}