gentoo auto-resync : 19:09:2024 - 12:11:50

4 files changed, 77 insertions, 27 deletions

diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 83576df8cc0b..e3399aee26f9 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,6 +1,6 @@
 DIST pdfjam-3.10.tar.gz 121928 BLAKE2B 5ff82abba43becb2792ff9e6a13dd3458d4b884e9e2361d116c638bb8a396fd8ca833361dfbc981433ebf445cfa8bfe99bb5fc7f1a76a35361666b91acef934e SHA512 dd69d8e5f86bb4fcb8db0e71454fdb0f2dd75e222d68e8cf3870d9f318aa7e8ccf51f87977ad71ddba1d78569e358044b111b8014f88dddf86654dc5bc334e90
+DIST pdfjam-3.12.tar.gz 162802 BLAKE2B d22e78cdb1e0135b2d2a9d1269a7467417a2fd3f984e969434d59db82f94a6575ff12bf814c3f90081e8e08823d68577e43b243fb2f52160dffc9d425fc84f0e SHA512 c801f5dbfb2eebf185734d14974a00c3ca3b8edda349ed7d6e0017ac80136ea10cab7ab0dc77ec1a712f7e338c8c9e58d24d7b8b69a3b2116e0a6473fc0b1317
 DIST pdfjam-extra-20191118.tar.gz 15457 BLAKE2B 3d673ba68a1ee89cec7af0ec7d7fc61c8993b9ae328d3362a6bbbae47cbda2caa2e8f4ecd28424dd894c31d14754228b067389b61fa7845cfe5dfc0e2b5d9b8d SHA512 1d02abb9d81baf6edf3e51e2c7838df191a7a18b4b50518ee1ae3108020a274d7608570654ab540539d3717e51ef10f548c83c3480681bc20c9702280f694b8f
-DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 574 BLAKE2B 23c7fd848d7c3c67dbb2aa1ef4ce48c7828d897e9743c9de2c87d205378ebb7f3a4053e088c78d35f46ebbf0de188af344b056295c93f5684496d68adb5518a2 SHA512 1c1c40ebed6640b472869a132e3e1772c309b5329413b4bb8e7c35c8c4db320a6e683ad1b1f88b0fac1bc238e242a5dcb5a1ed6489a86340494232f549d12436
 EBUILD pdfjam-3.10-r1.ebuild 1194 BLAKE2B 83bf506cccd130d6e4c4c8df29b09b43c68e09ed2cf0b97cbf10bbe868c16256bb62a423237b9d8c69e937f361deedcb975506e637c703801bd9e0ccf02791c3 SHA512 853965b0685024e8f68fc621ed81091d883c2ff988d0e8a5be30f8fe6e880ed7a7ab3d719e7e9856a8fc9398c93f6714f283c1104f3b9ac8b199fb5280ecdc52
-MISC metadata.xml 469 BLAKE2B c5f8cba1558d58746f91337019ab4eebeb93ed31f6f6da2793f12920c0244cee950c198cda5b1a389e42a5dffcce43a7071be23997daf7eb98e455abcd23f275 SHA512 3f6904a801d58b785031126357f963a8c73b182b4afab144f2b365084c466e2ce0460a47aef5e8d49a160512575269f440363448cc839bcd5caeeff6ba751b56
+EBUILD pdfjam-3.12.ebuild 1197 BLAKE2B 31c63d22b6854102814e06db4565dbd9d977ed574ef80bc59e66f2e5761190a7d72834f755d8cf1bf93b3fd0a8d71688aaf6b29b2af28b4dc0fecc5082941033 SHA512 3fdf911ed17e90d8d92942076e80278c738e6fcbee3fdbcea5bc8910a3147fb54b3665f0e28a3546d5b5a1bfd18de0696c199a4a05e84b34e5e18d158a89e210
+MISC metadata.xml 1123 BLAKE2B e7fe11916783d7e957d70edf6f5d6b55b011bb68bf712c5df0b5d0ac608f95f9d056c01dd38255b9f46572807d56e8509e895b15314d6086f3cd91556cd226ef SHA512 2c9c0147882455fd4cb707210ba9aef65983ba5929c0ab6bf8441dee8543b6839c5c7221fd01996fe1fd71b619c1f760ea0ff16617761b73339107b8206d7f47
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
index af299c1e9b05..5eb32f27f1d8 100644
--- a/app-text/pdfjam/metadata.xml
+++ b/app-text/pdfjam/metadata.xml
@@ -8,6 +8,22 @@
 	<use>
 		<flag name="extra">Install unsupported wrapper scripts, for example pdf90, pdfnup, pdfjoin</flag>
 	</use>
+	<longdescription>
+		The pdfjam is a shell script providing a simple interface to much of
+		the functionality of the excellent pdfpages package (by Andreas
+		Matthias) for LaTeX.
+
+		It takes one or more PDF files (and/or JPG/PNG graphics files) as input,
+		and produces one or more PDF files as output. It is useful for joining
+		files together, selecting pages, reducing several source pages onto one
+		output page.
+		However, it does not preserve hyperlinks.
+
+		If you don't like this package upstream recommends:
+		- <pkg>app-text/pdftk</pkg> (Java based)
+		- PDFsam (Java based)
+		- PSPDFUtils (Python based, supports PostScript)
+	</longdescription>
 	<upstream>
 		<remote-id type="github">rrthomas/pdfjam</remote-id>
 	</upstream>
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
deleted file mode 100644
index 992ae1784eaa..000000000000
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/./}
-DESCRIPTION="pdfnup, pdfjoin and pdf90"
-HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
-SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-S="${WORKDIR}"/${PN}
-
-DEPEND="virtual/latex-base"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/*
-	dodoc PDFjam-README.html
-	doman man1/*
-}
diff --git a/app-text/pdfjam/pdfjam-3.12.ebuild b/app-text/pdfjam/pdfjam-3.12.ebuild
new file mode 100644
index 000000000000..084765c1de2c
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-3.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PDFJAM_EXTRAS_COMMIT=622e03add59db004144c0b41722a09b3b29d6d3e
+
+DESCRIPTION="Tool for manipulatiing PDF files"
+HOMEPAGE="https://github.com/rrthomas/pdfjam"
+SRC_URI="
+	https://github.com/rrthomas/pdfjam/releases/download/v${PV}/pdfjam-${PV}.tar.gz
+	extra? (
+		https://github.com/rrthomas/pdfjam-extras/archive/${PDFJAM_EXTRAS_COMMIT}.tar.gz
+			-> pdfjam-extra-20191118.tar.gz
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+IUSE="extra test"
+RESTRICT="!test? ( test )"
+
+DEPEND="virtual/latex-base"
+RDEPEND="
+	${DEPEND}
+	!<dev-texlive/texlive-binextra-2023_p69527-r4
+"
+BDEPEND="test? ( app-arch/unzip )"
+
+src_prepare() {
+	default
+	if use test; then
+		unzip tests.zip || die
+	fi
+}
+
+src_test() {
+	./tests/run.sh || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc README.md
+	doman man1/*
+
+	insinto usr/share/etc
+	doins pdfjam.conf
+
+	if use extra; then
+		cd ../pdfjam-extras-${PDFJAM_EXTRAS_COMMIT} || die
+
+		dobin bin/*
+		newdoc README.md README-extras.md
+		doman man1/*
+	fi
+}