gentoo resync : 29.12.2022

2 files changed, 12 insertions, 15 deletions

diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 65b0681f5aa7..fcdfb9b3f39e 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,4 +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-r2.ebuild 1266 BLAKE2B c4db33c2e4545c6bfcf895230bceb9de3c3fd73be366900d9eed4d329433bdc8db36100b6a526b0c75060104f333d3a42d621310e236b23aceca4befa768066d SHA512 dccd7d490226819202ab3afbe763ca2f1b05e9e7eb760a46747de2b32394fc319a63c377c580eecbc0b60ab79a096b08f6878411c8aeb1a24b847d7e57fe3e60
+EBUILD jpeg2ps-1.9-r3.ebuild 1085 BLAKE2B 575b2e31506bd704c3ff9c0eb818c20de017ff848b29ac56ae726e317f14862cd0bf301b19ea628236bef9c6febc502d52a403405f4a507f5ee9fd755de8953e SHA512 f6735c73ad661716f8aa95f36d6e44d29c80996ba4ec54b5a289acbe1894331715efa5a073aea71c4e6e8a8afcbfb76daf79ad90656598e1c8a55b626e85a4e9
 MISC metadata.xml 284 BLAKE2B 4f3ebef5d4f1b4d77e8143a11d3c27313235279131a22882b223f6f03244ef60fba56df603f3e494853cfcfb95347e7e25450ababf4162df311b70de5bb4065e SHA512 b8cf447484032e9d62d706eb1507490ef65eb22e61125b003dbd4dd2bc19d7829edfe048ed28f049c44f584644bd938919461b72cb6a415f02214827db24fe8d
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
index 9a25a5e30b7d..430fe4f17edc 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Convert JPEG images to Postscript using a wrapper"
 HOMEPAGE="https://web.archive.org/web/20131003144811/http://www.pdflib.com/download/free-software/jpeg2ps/"
-SRC_URI="https://web.archive.org/web/20131003165952/http://www.pdflib.com/fileadmin/pdflib/products/more/${PN}/${P}.tar.gz"
+SRC_URI="https://distfiles.macports.org/${PN}/${P}.tar.gz"
 
-LICENSE="free-noncomm"
+LICENSE="jpeg2ps"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="metric"
+RESTRICT="mirror"
 
 PATCHES=("${FILESDIR}"/${P}-include.diff)
 
@@ -20,7 +21,7 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getCC)" \
-		CFLAGS="-c ${CFLAGS} $(usex metric "-DA4" "")" \
+		CFLAGS="-c ${CFLAGS} $(usev metric -DA4)" \
 		LDFLAGS="${LDFLAGS}"
 }
 
@@ -29,15 +30,11 @@ src_install() {
 	doman jpeg2ps.1
 	dodoc jpeg2ps.txt
 
-	if use metric; then
-		DOC_CONTENTS="By default, this installation of jpeg2ps will generate
-			A4 size output.  You can force letter output with
-			\n\tjpeg2ps -p letter file.jpg > file.ps"
-	else
-		DOC_CONTENTS="By default, this installation of jpeg2ps will generate
-			letter size output.  You can force A4 output with
-			\n\tjpeg2ps -p a4 file.jpg > file.ps"
-	fi
+	local size1=letter size2=A4
+	use metric && size1=A4 size2=letter
+	DOC_CONTENTS="By default, this installation of jpeg2ps will generate
+		${size1} size output. You can force ${size2} output with
+		\n\tjpeg2ps -p ${size2} file.jpg > file.ps"
 	readme.gentoo_create_doc
 }