media-gfx/inkscape: multiple bugfixes

- use the other tarball which include extensions - enable nls unconditionally to bypass the buildsystem's bug Closes: https://bugs.gentoo.org/722112 Closes: https://bugs.gentoo.org/699658 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada <[email protected]>
johu · Jun 6, 2020 · 6036090 · 6036090
1 parent 4e1adbf
commit 6036090
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
@@ -1,3 +1,3 @@
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
+DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
 DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89
-DIST inkscape-INKSCAPE_1_0.tar.gz 64306274 BLAKE2B 8bc4e2d156fad99b2b2a700bde29372dd56db6a1a9a8e825d46d214bbd18a1d29365510c16d51dbb2cad88f88fb10232f1bab403da4900beaa72de5d0f8726df SHA512 214c04c7f1d23dd0d296f4262743b2a206fe3b3df7abdb4bc4a4604a7f0caab2d7970d04b5795f121417d0e015e2d42d14be0b67438d752a81c4ad079b486f06
diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild → media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild → media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_")/${PN}-${PN^^}_$(ver_rs 1-2 "_").tar.gz"
+SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -98,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-S="${WORKDIR}"/${PN}-${PN^^}_$(ver_rs 1-2 "_")
+S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -118,6 +118,7 @@ src_configure() {
 	local mycmakeargs=(
 		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
 		-DENABLE_POPPLER=ON
+		-DWITH_NLS=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
@@ -132,14 +133,6 @@ src_configure() {
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
 	)
-	# We should also have,
-	#
-	#   -DWITH_NLS=$(usex nls)
-	#
-	# in this list, but it's broken upstream at the moment:
-	#
-	#  * https://bugs.gentoo.org/699658
-	#  * https://gitlab.com/inkscape/inkscape/issues/168
 
 	cmake_src_configure
 }
@@ -153,7 +146,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