[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     947065b2b4c6b929a53337e10d3278740a311a3f
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Sun Dec 26 14:30:56 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 00:37:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947065b2

media-gfx/inkscape: bump to 1.1.1

add python 3.10 to 1.1.1 and live

Closes: https://bugs.gentoo.org/830007
Closes: https://github.com/gentoo/gentoo/pull/23529
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest                        |  1 +
 ...{inkscape-9999.ebuild => inkscape-1.1.1.ebuild} | 29 +++++++++-------------
 media-gfx/inkscape/inkscape-9999.ebuild            |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 56c86013d34f..40c08b757d57 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
+DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
similarity index 88%
copy from media-gfx/inkscape/inkscape-9999.ebuild
copy to media-gfx/inkscape/inkscape-1.1.1.ebuild
index c77a2bc64410..d9c335c12041 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
+
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell static-libs svg2 test visio wpg"
+openmp postscript readline spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -91,13 +91,11 @@ RDEPEND="${COMMON_DEPEND}
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
+DEPEND="${COMMON_DEPEND}"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${P}_2021-09-20_3bf5ae0d25"
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -106,6 +104,8 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.1-poppler-21.11.0.patch
+
 	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
 }
@@ -120,7 +120,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
@@ -139,10 +139,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_test() {
-	cmake_build -j1 check
-}
-
 src_install() {
 	cmake_src_install
 
@@ -152,7 +148,6 @@ src_install() {
 
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
-	# No extensions are present in beta1
 	local extdir="${ED}"/usr/share/${PN}/extensions
 
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index c77a2bc64410..62a44f8decb6 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3