gentoo resync : 18.11.2019

3 files changed, 2 insertions, 56 deletions

diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 061de44677b0..3378e2584088 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,5 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 226 BLAKE2B c290c4810d6cdb5c5ac577e1e55f15bf7a07c74198ee56cc05b43fa70a8d574b02c0fe476b94e079c93529140e6854136070031705a3cf92f3757badd21aee38 SHA512 fe60dfb3c79f3a513d07e3af17c7050cdbe0983e1887317f5ef2d2c7eb3c54431d6d9fec1469b918ac3461ca09cb4c73373b9affa00b43fb8412f464f4d5c3f4
 DIST jpeg2ps-1.9.tar.gz 67105 BLAKE2B 68df39df75525db872c683de7b0ed3e64317ea18a54d51fb478c3e51b26522a97081e6953e5ad92f7a6023829dc5fbc5e1e288f2041e76bdecf0b6ef035d1234 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c
-EBUILD jpeg2ps-1.9-r1.ebuild 1371 BLAKE2B cf5a6c2e0d106844be4eb85075dc0c250e3336300cacb1fe4be2d4778f22dcfa7b319f80fb8803a785b5b1ffe21cce378ca7b726aaf504aa24757d31030c1b2f SHA512 498ffae9f9fb9af19a6656709aa8fb088d21b4753d1de48f038ff9bd859ceec7a312552b8c6913368d1d0b1be63fde81f3a1257a6d6a70017bdfdf51b3c9aeb8
-EBUILD jpeg2ps-1.9-r2.ebuild 1270 BLAKE2B 16ef322c56cbd88b33ccb6e0e8ebd40167bf60789fb263bb569dfb703e7e9ab9f5c51d4e118719d85a490e019e4f9cdbfeb769c6d2a90e351a21286b98c20573 SHA512 be5f40adcd68a8fe8032b6a8d6142a08fc5a68004a9b3d55631aae8e18be1a6089757ee1bcda4a28323a939f827f590bd05d9c9f9c98f6e5c6e11fe84a87251b
+EBUILD jpeg2ps-1.9-r2.ebuild 1266 BLAKE2B c4db33c2e4545c6bfcf895230bceb9de3c3fd73be366900d9eed4d329433bdc8db36100b6a526b0c75060104f333d3a42d621310e236b23aceca4befa768066d SHA512 dccd7d490226819202ab3afbe763ca2f1b05e9e7eb760a46747de2b32394fc319a63c377c580eecbc0b60ab79a096b08f6878411c8aeb1a24b847d7e57fe3e60
 MISC metadata.xml 403 BLAKE2B 2b703ab8fef1b40bd3dcff805110fcb23498cb8c6e6d1909333f376ea0eef4fc77d3f23851bad95be5c1da9b410c9db93c710c6da393d56ab3b5d58acd32b7a6 SHA512 b832dc6fefb1d77e7003de986274b9a1292f301379ddc1cbb6a3d23d44e5a8b8e0489bb812da9379f4dbf8ff13d79c404665427c7c1e21bee0657ea22e3e72aa
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
deleted file mode 100644
index d3601094ce6f..000000000000
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
+++ /dev/null
@@ -1,53 +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="Converts JPEG images to Postscript using a wrapper"
-HOMEPAGE="http://www.pdflib.com/download/free-software/jpeg2ps/"
-SRC_URI="http://www.pdflib.com/products/more/jpeg2ps/${P}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="metric"
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	#bug 105561
-	epatch "${FILESDIR}"/${P}-include.diff
-}
-
-src_compile() {
-	pagesize=""
-	use metric && pagesize="-DA4"
-	emake CFLAGS="-c ${CFLAGS} ${pagesize}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	# The Makefile is hard-coded to install to /usr/local/ so we
-	# simply copy the files manually
-	dobin jpeg2ps || die "dobin failed"
-	doman jpeg2ps.1 || die "doman failed"
-	dodoc jpeg2ps.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog
-	if [ -z ${pagesize} ]; then
-		elog "By default, this installation of jpeg2ps will generate"
-		elog "letter size output.  You can force A4 output with"
-		elog "    jpeg2ps -p a4 file.jpg > file.ps"
-	else
-		elog "By default, this installation of jpeg2ps will generate"
-		elog "A4 size output.  You can force letter output with"
-		elog "    jpeg2ps -p letter file.jpg > file.ps"
-	fi
-	elog
-}
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
index 7d2bc418a0d0..9a25a5e30b7d 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://web.archive.org/web/20131003165952/http://www.pdflib.com/filead
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="metric"
 
 PATCHES=("${FILESDIR}"/${P}-include.diff)