gentoo resync : 15.09.2018

3 files changed, 2 insertions, 52 deletions

diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 61c7b2c9e486..5a7675809d76 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,6 +1,5 @@
 AUX pep-2.8-gentoo.patch 494 BLAKE2B 62beadd57cf83f21f92dc9597265f7ef672aa19e743fd256dc30afe84d57accb741dfde47d1a87dc4b14242432fdcb08fa169db7cace74524458f4ed4b900239 SHA512 5c214a7d6d86ff59f2edf9e77d480414d7a2dbc0ce5f9a96012c6e642f6c0918772558f46c0c2c5e3f6898c7e751438859bae5bb89a900e64e33f1dd53f390e7
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep28.zip 83969 BLAKE2B 76dd8867b04299a7d616a1487a4b7812349a076f51b2828e01b45ef4790d890436eed147b51c2591dec8936b339a19fad3bb41eeafca8cda8c9904afbd2107e0 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8
-EBUILD pep-2.8-r1.ebuild 1149 BLAKE2B cc4ab4bd998e1762e9c474af66ca3c578b425fffd4e5166f3840a57a26d6c9831fa1ec0263886493e04dadf515e7a8589fade40b1dfb815abed5083fe503df50 SHA512 b4f5ca5770d0127f20b4b2c6145fa68703c5751df0dfac7739046e823dfd3f5193ecef150804bf59282c1286903d113727f3f30460258d3fea1d9d1116caafe6
-EBUILD pep-2.8-r2.ebuild 1048 BLAKE2B 5f5dd164c759d67445167a01f12f62e75263735530bcb29409465b4f699f3e1b5fde9af17e12827351419e8f0d05cb6879316e642877052ee970f6e17c9281c0 SHA512 d42b409655b3a126f7486e5e68e7a89aeb3b47a120b03e81ebac581d44b711ad379a8077b66ba9ab3e4c76acd108348d728416ac64399cb6952ab7764e396e8c
+EBUILD pep-2.8-r2.ebuild 1045 BLAKE2B a99680e225ea84c3b8e0e03c0b3aafbc6d0ac9bc335e3344991887ea4df4341ff8407fe8941fa8875474f37dfec26eb213a71541c2d1a21747b571d30a5a1fb7 SHA512 c126852d6705b8a47e6d7536c99a5c513ff921a001f29f4a02801b9b05edd07caa7440b6ff19abdad872df122357bd641dffb877af6664ac8c8bc5b9bc7e7742
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/pep-2.8-r1.ebuild b/app-text/pep/pep-2.8-r1.ebuild
deleted file mode 100644
index 59b13dc23d46..000000000000
--- a/app-text/pep/pep-2.8-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="General purpose filter and file cleaning program"
-HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
-SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	# pep does not come with autconf so here's a patch to configure
-	# Makefile with the correct path
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-include.patch
-	# Darwin lacks stricmp and DIRCHAR
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile
-		append-flags "-Dunix" -DSTRICMP
-	fi
-}
-
-src_compile() {
-	# make man page too
-	make Doc/pep.1 || die "make man page failed"
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin pep || die "dobin failed"
-	doman Doc/pep.1 || die "doman failed"
-
-	insinto /usr/share/pep
-	doins Filters/* || die "doins failed"
-
-	dodoc aareadme.txt file_id.diz
-}
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index 8e25853adc30..a5320f2d7272 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
 
 DEPEND="app-arch/unzip"