gentoo (valentine's day) resync : 14.02.2021

4 files changed, 23 insertions, 37 deletions

diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index d68cb9a87b2b..db960adca4a1 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,7 +1,5 @@
-DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
-DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633fe31c1ab84ff368ea95ffd6e6f6bdd4d5bbb2b0b2cf1c2ddcddcba9e774f1870ee3c85735f54c832894e2093392042 SHA512 17960786b2197e4035b2c224cbeb8e6d14ca7690920a4366d3dcad8b19f890b52d5e95277372fe3011f3476a5be0c4f253eb4d3ee3b6a8df74e20468be124d8b
 DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
-EBUILD pdfarranger-1.3.1.ebuild 730 BLAKE2B ea73de82d730dab7cb9864fe4e3749cce489aae0e1a6552dec0ab1287f553b90323ddb341c522261ffb2d9d0727637c75136dc354922d0cf9ffca94e3d20c2e6 SHA512 22aa42ef5c814efd002f75de5c045c510f610d783c978df25a44ea4a53e203c17ed8a11adb42e7ebd8a7c00f4197682aeef0b0fad98082af9774c7b4bdb74b93
-EBUILD pdfarranger-1.5.3-r1.ebuild 1075 BLAKE2B 1bdc7c07c77a0226025c36ac205aef46eeb935cf065e9cd3044579b0c4ed235c01fbebca22f9d48310bf2c4502edffb53fad4bf44fa57508959fde0b6738ac09 SHA512 2098d1b380060c68632207c32f346a8e14cde2d96a46447af35aec3a3d3638b7c0b13ac3f99d17d3770399662b59b4822cc82b05d88f6a25d52cf7706fdbdc20
-EBUILD pdfarranger-1.6.2.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
+DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552
+EBUILD pdfarranger-1.6.2.ebuild 1210 BLAKE2B add4dbd20ef2ab4ae3adb5a897caf7518f1386d39f40e269091d1458e75c9dcb9e0fe7368930d93ab73d8addb83cca9cd35ecd3e0adbf3632b6c481df100a9ab SHA512 c339eee94ffd0f148929aadc8b8fe9cb8992de7d6fd63e5613357231bcae2f1b5b332ae07e0f6653e5392d9d2977a45c508c69422ea7adb88500cb1c57ce65c3
+EBUILD pdfarranger-1.7.0.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
deleted file mode 100644
index fd2ca31f7a2d..000000000000
--- a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
-HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
-SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	app-text/poppler[introspection,cairo]"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
index f3d0a8fa4fe9..0e0d68ad79c3 100644
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
index bfefbb31a48d..f3d0a8fa4fe9 100644
--- a/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 optfeature xdg-utils desktop
 
 DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
 HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
 SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+
+RDEPEND="
+	app-text/poppler[introspection,cairo]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
-	app-text/poppler[introspection,cairo]"
+"
 DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
 
 src_install() {
 	distutils-r1_src_install
-	insinto /usr/share/icons
-	doins -r data/icons/hicolor
+	for x in 16 32 48 256 scalable
+	do doicon -s ${x} data/icons/hicolor/${x}*/*
+	done
 }
 
 pkg_postinst() {
+	elog "Optional dependency:"
+	optfeature "image file import" media-gfx/img2pdf
+
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update