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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2015-12-06 21:55 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2015-12-06 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     cef53b6b037f5382b30dd2a8fb7a2f89d4a158d5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 20:19:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 21:55:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef53b6b

media-gfx/inkscape: Enable c++11 due to new libsigc++, #566318

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 166 +++++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
new file mode 100644
index 0000000..b4bc140
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+	|| (
+		( app-text/libwpg:0.3 dev-libs/librevenge )
+		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+	)
+"
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.28
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-cpp/glibmm-2.32
+	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		${WPG_DEPS}
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		${WPG_DEPS}
+	)
+	wpg? ( ${WPG_DEPS} )
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
+		"${FILESDIR}"/${PN}-0.48.4-epython.patch
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	# enable c++11 as needed for sigc++-2.6, #566318
+	# remove it when upstream solves the issue
+	# https://bugs.launchpad.net/inkscape/+bug/1488079
+	append-cxxflags -std=c++11
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-01-15  9:03 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2016-01-15  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9ff2bfc7c45de82ddce6af1efa467fbaee9a43ee
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:02:42 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:02:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff2bfc7

media-gfx/inkscape: amd64 stable wrt bug #568412

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index b4bc140..515fba6 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-01-17 17:02 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2016-01-17 17:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6e78e62246496505f1ec513b1961ffe89f9e81d2
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 17:00:19 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 17:00:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e78e622

media-gfx/inkscape: ppc stable wrt bug #568412

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index 515fba6..7ef19f8 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-01-23  8:00 Jeroen Roovers
  0 siblings, 0 replies; 182+ messages in thread
From: Jeroen Roovers @ 2016-01-23  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5ce5d5545ce078a05aa74c619a17a5cac9e95e0a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 07:58:40 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 08:00:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce5d554

media-gfx/inkscape: Stable for HPPA PPC64 (bug #568412).

Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index 7ef19f8..a4a4b12 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-01-30  9:40 Pacho Ramos
  0 siblings, 0 replies; 182+ messages in thread
From: Pacho Ramos @ 2016-01-30  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5fc1294390b406fe218a68bbad430ed765c086ef
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 09:34:10 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 09:34:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc12943

media-gfx/inkscape: x86 stable, bug #568412

Package-Manager: portage-2.2.26

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index a4a4b12..6a6c270 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-02-12 10:07 Justin Lecher
  0 siblings, 0 replies; 182+ messages in thread
From: Justin Lecher @ 2016-02-12 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     7e1cbdeedfb9d601f9cdff8b2a697b842d0af558
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 10:07:23 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 10:07:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1cbdee

media-gfx/inkscape: Add SLOT operator for gsl

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.48.5-r1.ebuild | 4 ++--
 media-gfx/inkscape/inkscape-0.91-r1.ebuild   | 4 ++--
 media-gfx/inkscape/inkscape-0.91.ebuild      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
index 3a82bb3..2933da2 100644
--- a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0
-	sci-libs/gsl
+	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10.7:2
 	>=x11-libs/pango-1.4.0

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index 6a6c270..5de54ca 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0
-	sci-libs/gsl
+	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10.7:2
 	>=x11-libs/pango-1.24

diff --git a/media-gfx/inkscape/inkscape-0.91.ebuild b/media-gfx/inkscape/inkscape-0.91.ebuild
index f8f1af2..29237cb 100644
--- a/media-gfx/inkscape/inkscape-0.91.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0
-	sci-libs/gsl
+	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/gtk+-2.10.7:2
 	>=x11-libs/pango-1.24


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-06-10 15:36 Andreas Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Hüttel @ 2016-06-10 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     f54d7704a637b2a0fe1704c9762af5111a68743b
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 15:33:28 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 15:33:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54d7704

media-gfx/inkscape: Add latex useflag for formula editing

Package-Manager: portage-2.3.0_rc1

 media-gfx/inkscape/inkscape-0.91-r2.ebuild | 171 +++++++++++++++++++++++++++++
 media-gfx/inkscape/metadata.xml            |   1 +
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-0.91-r2.ebuild b/media-gfx/inkscape/inkscape-0.91-r2.ebuild
new file mode 100644
index 0000000..29bf178
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+	|| (
+		( app-text/libwpg:0.3 dev-libs/librevenge )
+		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+	)
+"
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.28
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-cpp/glibmm-2.32
+	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		${WPG_DEPS}
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		${WPG_DEPS}
+	)
+	wpg? ( ${WPG_DEPS} )
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
+		"${FILESDIR}"/${PN}-0.48.4-epython.patch
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	# enable c++11 as needed for sigc++-2.6, #566318
+	# remove it when upstream solves the issue
+	# https://bugs.launchpad.net/inkscape/+bug/1488079
+	append-cxxflags -std=c++11
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 5dd77e6..490f07d 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="cdr">Enable support for CorelDRAW Diagrams</flag>
     <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
     <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
+    <flag name="latex">pull in dependencies for LaTeX formulas</flag>
     <flag name="visio">Enable support for Microsoft Visio Diagrams</flag>
     <flag name="wpg">Enable support for WordPerfect Graphics</flag>
   </use>


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-11-02 16:55 Michael Palimaka
  0 siblings, 0 replies; 182+ messages in thread
From: Michael Palimaka @ 2016-11-02 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     8870008c99d90d73e9e9d687f671cc52f8c3a6bd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 16:55:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 16:55:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8870008c

media-gfx/inkscape: amd64/x86 stable

Gentoo-bug: 596914

Package-Manager: portage-2.3.2

 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index e66b5ee..4941131 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2016-12-04 17:12 Michael Palimaka
  0 siblings, 0 replies; 182+ messages in thread
From: Michael Palimaka @ 2016-12-04 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     11f8aaeadc56e2e7655caec587c5314373ad3388
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 17:12:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 17:12:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f8aaea

media-gfx/inkscape: restore ~arm keyword

Gentoo-bug: 601560

Package-Manager: portage-2.3.2

 media-gfx/inkscape/inkscape-0.91-r2.ebuild | 2 +-
 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r2.ebuild b/media-gfx/inkscape/inkscape-0.91-r2.ebuild
index 29bf178..adfe18e 100644
--- a/media-gfx/inkscape/inkscape-0.91-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 4941131..b1aeae5 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-01-26 11:00 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2017-01-26 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b12ddcc6a34b730601d318cbc7681aaaf5bc8249
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:57:39 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 11:00:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12ddcc6

media-gfx/inkscape: ppc stable wrt bug #596914

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index b1aeae5..26a532f 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-02-18 12:35 Manuel Rüger
  0 siblings, 0 replies; 182+ messages in thread
From: Manuel Rüger @ 2017-02-18 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     9c2dc8de8a63ec0d5a69c63af513bb01b96b7536
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 12:35:24 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 12:35:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2dc8de

media-gfx/inkscape: Remove old

Package-Manager: portage-2.3.3

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 166 ----------------------------
 media-gfx/inkscape/inkscape-0.91-r2.ebuild | 171 -----------------------------
 media-gfx/inkscape/inkscape-0.91.ebuild    | 162 ---------------------------
 3 files changed, 499 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
deleted file mode 100644
index 5de54ca699..0000000000
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.28
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-cpp/glibmm-2.32
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		${WPG_DEPS}
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		${WPG_DEPS}
-	)
-	wpg? ( ${WPG_DEPS} )
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
-		"${FILESDIR}"/${PN}-0.48.4-epython.patch
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	# enable c++11 as needed for sigc++-2.6, #566318
-	# remove it when upstream solves the issue
-	# https://bugs.launchpad.net/inkscape/+bug/1488079
-	append-cxxflags -std=c++11
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}

diff --git a/media-gfx/inkscape/inkscape-0.91-r2.ebuild b/media-gfx/inkscape/inkscape-0.91-r2.ebuild
deleted file mode 100644
index adfe18e466..0000000000
--- a/media-gfx/inkscape/inkscape-0.91-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.28
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-cpp/glibmm-2.32
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		${WPG_DEPS}
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		${WPG_DEPS}
-	)
-	wpg? ( ${WPG_DEPS} )
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
-		"${FILESDIR}"/${PN}-0.48.4-epython.patch
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	# enable c++11 as needed for sigc++-2.6, #566318
-	# remove it when upstream solves the issue
-	# https://bugs.launchpad.net/inkscape/+bug/1488079
-	append-cxxflags -std=c++11
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}

diff --git a/media-gfx/inkscape/inkscape-0.91.ebuild b/media-gfx/inkscape/inkscape-0.91.ebuild
deleted file mode 100644
index 29237cbca6..0000000000
--- a/media-gfx/inkscape/inkscape-0.91.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.28
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-cpp/glibmm-2.32
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		${WPG_DEPS}
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		${WPG_DEPS}
-	)
-	wpg? ( ${WPG_DEPS} )
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
-		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
-		"${FILESDIR}"/${PN}-0.48.4-epython.patch
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-02-23 12:47 Michael Weber
  0 siblings, 0 replies; 182+ messages in thread
From: Michael Weber @ 2017-02-23 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f7a3132917510ffcd3453ae2f318b562e1e0e913
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 12:46:55 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 12:46:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a31329

media-gfx/inkscape: ppc64 stable (bug 596914).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 26a532f017..6c834aca71 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-05-12 18:54 Jeroen Roovers
  0 siblings, 0 replies; 182+ messages in thread
From: Jeroen Roovers @ 2017-05-12 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     bad163b52dbc240c6948a187d9fc9e4360ba973c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 18:54:20 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 12 18:54:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad163b5

media-gfx/inkscape: Stable for HPPA (bug #596914).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 4fb20095d5e..28d04316ed0 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-05-14 14:24 Andreas Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Hüttel @ 2017-05-14 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d60a530085406f53b9627dab0fa562f97ec03c5c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 14:24:31 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 14 14:24:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60a5300

media-gfx/inkscape: Add new dependencies, bug 618436, and drop keywords

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 173 +++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
new file mode 100644
index 00000000000..f2241b5c69e
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+	|| (
+		( app-text/libwpg:0.3 dev-libs/librevenge )
+		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+	)
+"
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.48
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		${WPG_DEPS}
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		${WPG_DEPS}
+	)
+	wpg? ( ${WPG_DEPS} )
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-05-14 20:54 Jeroen Roovers
  0 siblings, 0 replies; 182+ messages in thread
From: Jeroen Roovers @ 2017-05-14 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8eb70fe4eb380a66f1dda32717c6bfc2fb3dc6f7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 16:15:55 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 14 20:54:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb70fe4

media-gfx/inkscape: Mark ~hppa (bug #618436).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index f2241b5c69e..cb3b2a55026 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-05-26 18:37 Markus Meier
  0 siblings, 0 replies; 182+ messages in thread
From: Markus Meier @ 2017-05-26 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2496ccdd8be61b913ec62d2ea9596772816cae62
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 18:37:03 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri May 26 18:37:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2496ccdd

media-gfx/inkscape: add ~arm, bug #618436

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index cb3b2a55026..8276e75674e 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-08-02  6:31 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2017-08-02  6:31 UTC (permalink / raw
  To: gentoo-commits

commit:     225f23b188afef901bc87f0ab279368e5468ca65
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 30 22:19:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 06:31:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225f23b1

media-gfx/inkscape: Drop back to ~hppa

Stabilisation timeout.

Gentoo-bug: 606806

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 28d04316ed0..4fb20095d5e 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-08-08 22:26 Sergei Trofimovich
  0 siblings, 0 replies; 182+ messages in thread
From: Sergei Trofimovich @ 2017-08-08 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1b4ce41e72b9b6c081a11e8049f8e0873666c35d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 22:25:07 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 22:25:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b4ce41e

media-gfx/inkscape: keyworded 0.92.1-r1 for ppc, bug #618436

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 8276e75674e..77f03493702 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-08-09  8:47 Sergei Trofimovich
  0 siblings, 0 replies; 182+ messages in thread
From: Sergei Trofimovich @ 2017-08-09  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     331427013f814127d0f1659354cf3a7564eca297
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 08:47:01 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 08:47:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33142701

media-gfx/inkscape: keyworded 0.92.1-r1 for ppc64, bug #618436

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 77f03493702..6c730e1a732 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-08-31 12:16 Tim Harder
  0 siblings, 0 replies; 182+ messages in thread
From: Tim Harder @ 2017-08-31 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d214fdd6e89c78ee69243513f1943d8347b374d3
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 12:09:28 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 12:16:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d214fdd6

media-gfx/inkscape: update upstream metadata from sf to gitlab

 media-gfx/inkscape/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 490f07deb98..80bd107567a 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -14,6 +14,6 @@
     <flag name="wpg">Enable support for WordPerfect Graphics</flag>
   </use>
   <upstream>
-    <remote-id type="sourceforge">inkscape</remote-id>
+    <remote-id type="gitlab">inkscape/inkscape</remote-id>
   </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-08-31 12:16 Tim Harder
  0 siblings, 0 replies; 182+ messages in thread
From: Tim Harder @ 2017-08-31 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     91088cc00a148515ff5c2a363c3d20ef46c22883
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 12:07:43 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 12:16:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91088cc0

media-gfx/inkscape: update HOMEPAGE and use https

 media-gfx/inkscape/inkscape-0.91-r3.ebuild   | 2 +-
 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-0.92.1.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 4fb20095d5e..7bf58496145 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs pyth
 MY_P=${P/_/}
 
 DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
+HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 6c730e1a732..09084673b9c 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs pyth
 MY_P=${P/_/}
 
 DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
+HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"

diff --git a/media-gfx/inkscape/inkscape-0.92.1.ebuild b/media-gfx/inkscape/inkscape-0.92.1.ebuild
index 059f979c9c8..efd58af66c6 100644
--- a/media-gfx/inkscape/inkscape-0.92.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs pyth
 MY_P=${P/_/}
 
 DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
+HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-21 17:17 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-21 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     7dc43130073131cfc6b3162cc397cd8e77215a7c
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 17:16:40 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 17:16:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc43130

media-gfx/inkscape: >=dev-libs/boehm-gc-7.1

Fix minimum required version for the dependency dev-libs/boehm-gc.
This was already required by the configure script, so it does not
affect the stable status.
Closes: https://bugs.gentoo.org/602384
Package-Manager: Portage-2.3.15, Repoman-2.3.5

 media-gfx/inkscape/inkscape-0.91-r3.ebuild   | 2 +-
 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-0.92.1.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 7bf58496145..08ca114f2a4 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/boehm-gc-7.1
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 09084673b9c..6620793e9f1 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/boehm-gc-7.1
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20

diff --git a/media-gfx/inkscape/inkscape-0.92.1.ebuild b/media-gfx/inkscape/inkscape-0.92.1.ebuild
index efd58af66c6..c29c3017a54 100644
--- a/media-gfx/inkscape/inkscape-0.92.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/boehm-gc-7.1
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-22  9:19 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-22  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     13c2821ca5f72ad8014a07e51289e4e0c7593323
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 09:18:18 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 09:18:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c2821c

media-gfx/inkscape: Version bump 0.92.2 and ebuild fixes

Version bump to inkscape-0.92.2
Closes: https://bugs.gentoo.org/627536

Introduced >20kB patch for poppler-0.58.0 for this ebuild
Bug: https://bugs.gentoo.org/630482

Fixed invalid dependency on app-text/texlive in this ebuild
Bug: https://bugs.gentoo.org/625906

Also migrated from the obsolete 'fdo-mime' eclass to 'xdg-utils'

Removed eutils which was not needed here anymore since the EPAI=6 bump

Package-Manager: Portage-2.3.15, Repoman-2.3.5

 media-gfx/inkscape/Manifest               |   2 +
 media-gfx/inkscape/inkscape-0.92.2.ebuild | 177 ++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 48745de6172..fd58944c638 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,4 @@
 DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126
+DIST inkscape-0.92.1-poppler.patch 44142 SHA256 e6b35d9c9967d0b87170a2a6d39dc5e210dee0c37dd71bab6fa2cb5915a3a538 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab WHIRLPOOL 90d8ba0d2d54d4175fcbbf9236772dfcc0495083ae31a88bdf26055d9dc68025e268a0667d9be644b62f1aca4663e25ca5a407befb364f66fdef4a738e80c714
 DIST inkscape-0.92.1.tar.bz2 31222684 SHA256 257405bf802de125f17d123638093a37db02ebe334d243cf9b0d8903f7c89005 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0 WHIRLPOOL f8134aed9ddb174fda88e13c201cf9099604e9591228ec306feeabaeee859f657961370ba4d1420f51e5e520f3543d7d129577144d9221e52f638a9f0bf81493
+DIST inkscape-0.92.2.tar.bz2 31224100 SHA256 a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3 SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 WHIRLPOOL a654da639877824a6b7e4f894d3a5bf59cea2825d683527d90b1b4770852ce48db291156baf9ca0924d9fdba5cfcde9efb02a140124dacce67cd360743277019

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
new file mode 100644
index 00000000000..f91ae073ba5
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
+https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+	|| (
+		( app-text/libwpg:0.3 dev-libs/librevenge )
+		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+	)
+"
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.48
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		${WPG_DEPS}
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		${WPG_DEPS}
+	)
+	wpg? ( ${WPG_DEPS} )
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${DISTDIR}/${PN}-0.92.1-poppler.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-22 12:05 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-22 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     904ab924dcec2e330cb9ad5dcb75b9b502666c75
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 12:04:39 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 12:05:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904ab924

media-gfx/inkscape: Fix invalid latex dependency

Fix was possible without affects on the stable status.

Closes: https://bugs.gentoo.org/625906
Package-Manager: Portage-2.3.15, Repoman-2.3.5

 media-gfx/inkscape/Manifest                  | 6 +++---
 media-gfx/inkscape/inkscape-0.91-r3.ebuild   | 2 +-
 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-0.92.1.ebuild    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index fd58944c638..a5a152912f8 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,4 +1,4 @@
-DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126
-DIST inkscape-0.92.1-poppler.patch 44142 SHA256 e6b35d9c9967d0b87170a2a6d39dc5e210dee0c37dd71bab6fa2cb5915a3a538 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab WHIRLPOOL 90d8ba0d2d54d4175fcbbf9236772dfcc0495083ae31a88bdf26055d9dc68025e268a0667d9be644b62f1aca4663e25ca5a407befb364f66fdef4a738e80c714
+DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650d980ef455106d40ae17555d4792a532df493dab23dad2d3c7cdcc68f59391228bae76ebd30f03cf66cbb4fd0ae65 SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
+DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.1.tar.bz2 31222684 SHA256 257405bf802de125f17d123638093a37db02ebe334d243cf9b0d8903f7c89005 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0 WHIRLPOOL f8134aed9ddb174fda88e13c201cf9099604e9591228ec306feeabaeee859f657961370ba4d1420f51e5e520f3543d7d129577144d9221e52f638a9f0bf81493
-DIST inkscape-0.92.2.tar.bz2 31224100 SHA256 a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3 SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 WHIRLPOOL a654da639877824a6b7e4f894d3a5bf59cea2825d683527d90b1b4770852ce48db291156baf9ca0924d9fdba5cfcde9efb02a140124dacce67cd360743277019
+DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 08ca114f2a4..ad850ff0c14 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 6620793e9f1..24b21bd2bb4 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -81,7 +81,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "

diff --git a/media-gfx/inkscape/inkscape-0.92.1.ebuild b/media-gfx/inkscape/inkscape-0.92.1.ebuild
index c29c3017a54..600b7c71e30 100644
--- a/media-gfx/inkscape/inkscape-0.92.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1.ebuild
@@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-22 16:13 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-22 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     fc9bc51109c4f5a5693fadfdc5e8b95cebbd263f
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 15:41:59 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 16:13:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9bc511

media-gfx/inkscape: Drop old 0.92.1

Package-Manager: Portage-2.3.15, Repoman-2.3.5

 media-gfx/inkscape/inkscape-0.92.1.ebuild | 171 ------------------------------
 1 file changed, 171 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.1.ebuild b/media-gfx/inkscape/inkscape-0.92.1.ebuild
deleted file mode 100644
index 600b7c71e30..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.48
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		${WPG_DEPS}
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		${WPG_DEPS}
-	)
-	wpg? ( ${WPG_DEPS} )
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-22 16:13 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-22 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     19e4272f883ae13367669bbccca07b0debc35452
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 15:40:10 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 16:13:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e4272f

media-gfx/inkscape: Fixes fdo and deps 0.91-r4

This ebuild fixes the last stable version with the old SVG unit system.
http://wiki.inkscape.org/wiki/index.php/Units_In_Inkscape
This version should remain a while in the tree for compatibility.
Fixes: eutils, fdo-mime, broken dependencies.
Package-Manager: Portage-2.3.15, Repoman-2.3.5

 media-gfx/inkscape/inkscape-0.91-r4.ebuild | 179 +++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
new file mode 100644
index 00000000000..fa43b4e54d9
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.48
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${FILESDIR}/${PN}-0.91-fix-gtkmm-2.48.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	# enable c++11 as needed for sigc++-2.6, #566318
+	# remove it when upstream solves the issue
+	# https://bugs.launchpad.net/inkscape/+bug/1488079
+	append-cxxflags -std=c++11
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2017-11-23 12:46 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2017-11-23 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a81a3b085b209da75ec62419edb97065ed545397
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 12:45:35 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 12:45:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81a3b08

media-gfx/inkscape: Remove obsolete and broken dep

Remove obsolete and broken dependency on app-text/libwpd
this fixes in this ebuild
Bug: https://bugs.gentoo.org/638440
Package-Manager: Portage-2.3.16, Repoman-2.3.5

 media-gfx/inkscape/inkscape-0.92.2.ebuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index f91ae073ba5..6f8363666e0 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -22,12 +22,6 @@ IUSE+=" lcms nls spell static-libs visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	>=app-text/poppler-0.26.0:=[cairo]
@@ -52,7 +46,8 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.24
 	cdr? (
 		media-libs/libcdr
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
@@ -66,9 +61,13 @@ COMMON_DEPEND="
 	)
 	visio? (
 		media-libs/libvisio
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
-	wpg? ( ${WPG_DEPS} )
 "
 
 # These only use executables provided by these packages


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-01-15 10:52 Lars Wendler
  0 siblings, 0 replies; 182+ messages in thread
From: Lars Wendler @ 2018-01-15 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     480d0450a90ecea791e391e2a9d0148546e65653
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 10:49:36 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 10:49:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480d0450

media-gfx/inkscape: Added sub-slot dep for boehm-gc.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/inkscape/inkscape-0.91-r3.ebuild   | 4 ++--
 media-gfx/inkscape/inkscape-0.91-r4.ebuild   | 4 ++--
 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 4 ++--
 media-gfx/inkscape/inkscape-0.92.2.ebuild    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index ad850ff0c14..e66661ffc32 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20

diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
index fa43b4e54d9..26296f1bf53 100644
--- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20

diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 24b21bd2bb4..3a632ccb1ac 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 6f8363666e0..b64b94f2b34 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1
+	>=dev-libs/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-01-27 21:57 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2018-01-27 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     c13ebabcde79f32ae896c3f885589dbef7c537aa
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 21:56:58 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 21:57:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13ebabc

media-gfx/inkscape: amd64 stable wrt bug #643836

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/inkscape/inkscape-0.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 5aee47f5f69..2d1f741ddaf 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-03-12  6:17 Matt Turner
  0 siblings, 0 replies; 182+ messages in thread
From: Matt Turner @ 2018-03-12  6:17 UTC (permalink / raw
  To: gentoo-commits

commit:     09bf7e68dd03d532f42b86c28d5cae089f178694
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 05:54:00 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 06:17:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bf7e68

media-gfx/inkscape-0.92.2: ppc64 stable, bug 643836

 media-gfx/inkscape/inkscape-0.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 7d28a8ba918..be1c0511d2c 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-03-12  6:17 Matt Turner
  0 siblings, 0 replies; 182+ messages in thread
From: Matt Turner @ 2018-03-12  6:17 UTC (permalink / raw
  To: gentoo-commits

commit:     85980da07622b86704ba38aad562ab5e77f5203b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 05:53:58 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 06:17:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85980da0

media-gfx/inkscape-0.92.2: ppc stable, bug 643836

 media-gfx/inkscape/inkscape-0.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 2d1f741ddaf..7d28a8ba918 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-03-31  5:12 Tim Harder
  0 siblings, 0 replies; 182+ messages in thread
From: Tim Harder @ 2018-03-31  5:12 UTC (permalink / raw
  To: gentoo-commits

commit:     3473013a4354c9485032d7d12665f533d2d867cd
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 05:03:16 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 05:11:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3473013a

media-gfx/inkscape: version bump to 0.92.3

Closes: https://bugs.gentoo.org/651500

 media-gfx/inkscape/Manifest               |   1 +
 media-gfx/inkscape/inkscape-0.92.3.ebuild | 175 ++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e46b9f48433..f44a0ae2f97 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -2,3 +2,4 @@ DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650
 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.1.tar.bz2 31222684 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
+DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687

diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
new file mode 100644
index 00000000000..69b0c27405f
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
+https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.48
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		media-libs/libcdr
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		media-libs/libvisio
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable exif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		--enable-poppler-cairo \
+		$(use_enable wpg) \
+		$(use_enable visio) \
+		$(use_enable cdr) \
+		$(use_enable dbus dbusapi) \
+		$(use_enable imagemagick magick) \
+		$(use_with gnome gnome-vfs) \
+		$(use_with inkjar) \
+		$(use_with spell gtkspell) \
+		$(use_with spell aspell)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-10-27 21:12 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2018-10-27 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e297dba99b764ca313955c3d2673dbd435a72bf2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 20:45:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:11:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e297dba9

media-gfx/inkscape: Raise dev-cpp/glibmm min dep to 2.54.1

Thanks-to: Nick <nickAristocrates <AT> gmail.com>
Closes: https://bugs.gentoo.org/666324
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index ed69409396c..c022c704d3a 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.48
+	>=dev-cpp/glibmm-2.54.1
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
 	>=dev-libs/boehm-gc-7.1:=
@@ -58,9 +58,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		app-text/gtkspell:2
 	)
 	visio? (
-		media-libs/libvisio
 		app-text/libwpg:0.3
 		dev-libs/librevenge
+		media-libs/libvisio
 	)
 	wpg? (
 		app-text/libwpg:0.3


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-10-27 21:12 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2018-10-27 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     37fa00f409091c362bad18b521f66254b550cbb9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 21:11:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:11:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fa00f4

media-gfx/inkscape: Drop 0.92.3 (r0)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/inkscape/inkscape-0.92.3.ebuild | 179 ------------------------------
 1 file changed, 179 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
deleted file mode 100644
index 89ad5363774..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.48
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable exif)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		--enable-poppler-cairo
-		$(use_enable wpg)
-		$(use_enable visio)
-		$(use_enable cdr)
-		$(use_enable dbus dbusapi)
-		$(use_enable imagemagick magick)
-		$(use_with gnome gnome-vfs)
-		$(use_with inkjar)
-		$(use_with spell gtkspell)
-		$(use_with spell aspell)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	python_optimize "${ED%/}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-10-27 21:12 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2018-10-27 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2f2065d40af5583e2fdd972f240add0cdf4cd575
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 20:37:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:11:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2065d4

media-gfx/inkscape: Add missing dev-util/glib-utils DEPEND

Closes: https://bugs.gentoo.org/667464
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 36a68a10d4e..ed69409396c 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
-
 inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
 
 MY_P="${P/_/}"
 
-DESCRIPTION="A SVG based generic vector-drawing program"
+DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
 
@@ -21,8 +21,7 @@ IUSE+=" lcms nls spell static-libs visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.26.0:=[cairo]
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
@@ -44,9 +43,9 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-2.10.7:2
 	>=x11-libs/pango-1.24
 	cdr? (
-		media-libs/libcdr
 		app-text/libwpg:0.3
 		dev-libs/librevenge
+		media-libs/libcdr
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
@@ -68,7 +67,6 @@ COMMON_DEPEND="
 		dev-libs/librevenge
 	)
 "
-
 # These only use executables provided by these packages
 # See share/extensions for more details. inkscape can tell you to
 # install these so we could of course just not depend on those and rely
@@ -84,9 +82,9 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "
-
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.36
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -163,10 +161,6 @@ src_install() {
 	python_optimize "${ED%/}"/usr/share/${PN}/extensions
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-12-14  2:13 Thomas Deutschmann
  0 siblings, 0 replies; 182+ messages in thread
From: Thomas Deutschmann @ 2018-12-14  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     74de67ae509908d96d3875dfe5befe70c412a3a1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 02:08:24 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 02:08:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74de67ae

media-gfx/inkscape: x86 stable (bug #659940)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index bc4433cc996..0811c66a53f 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-12-14 22:48 Sergei Trofimovich
  0 siblings, 0 replies; 182+ messages in thread
From: Sergei Trofimovich @ 2018-12-14 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     950438810f4d903b0952531b039c12881feb427b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 22:47:07 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 22:47:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95043881

media-gfx/inkscape: stable 0.92.3-r1 for ppc, bug #659940

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 0811c66a53f..8d36563d4d0 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-12-14 22:50 Sergei Trofimovich
  0 siblings, 0 replies; 182+ messages in thread
From: Sergei Trofimovich @ 2018-12-14 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c93738ea76517314d1fc0ffb436e16b83712e1aa
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 22:49:28 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 22:50:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93738ea

media-gfx/inkscape: stable 0.92.3-r1 for ppc64, bug #659940

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 8d36563d4d0..5d18f3a89d2 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2018-12-15 11:48 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2018-12-15 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d1a4c3bb6293b1a27140fa06fd505f3f58ce74b4
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 15 11:48:04 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 15 11:48:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a4c3bb

media-gfx/inkscape: amd64 stable wrt bug #659940

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 5d18f3a89d2..f07d0bbf1f7 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-01-11  0:37 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-01-11  0:37 UTC (permalink / raw
  To: gentoo-commits

commit:     83d479e804151b6f45d5696ee54b962943e96a87
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 00:31:48 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 00:37:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d479e8

media-gfx/inkscape: Drop 0.92.2

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/Manifest               |   2 -
 media-gfx/inkscape/inkscape-0.92.2.ebuild | 176 ------------------------------
 2 files changed, 178 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 53e6179245b..3ca22028b53 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,4 +1,2 @@
-DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
-DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
 DIST inkscape-0.92.3-poppler-patches.tar.xz 7508 BLAKE2B afb639e9149256d0a7d534c28f3c51cb6adf0bfdb458be1c729475f235cd363e3e6b50033f7d377eaeae9f564b33e710ac01fc323821f5b4a97ffc73edc342a5 SHA512 0011ca503e786520c756ff4578c0db55aadf907bf6479837fa35e7a035695ff7e0aaf8f878f5354730ac75808d36c5e34ae15d32a1af37134ce881edd810c4a5
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
deleted file mode 100644
index be1c0511d2c..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.48
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${DISTDIR}/${PN}-0.92.1-poppler.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-01-16 20:01 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     3ce33d27314125eb4dc834bf8daba34bf5cdc3b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 19:44:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 20:01:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce33d27

media-gfx/inkscape: Switch to upstream poppler-0.72 fix

It incidentally contained the fix for 0.73 as well.

Closes: https://bugs.gentoo.org/675608
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/Manifest                  | 2 +-
 media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3ca22028b53..318f50bfe53 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,2 @@
-DIST inkscape-0.92.3-poppler-patches.tar.xz 7508 BLAKE2B afb639e9149256d0a7d534c28f3c51cb6adf0bfdb458be1c729475f235cd363e3e6b50033f7d377eaeae9f564b33e710ac01fc323821f5b4a97ffc73edc342a5 SHA512 0011ca503e786520c756ff4578c0db55aadf907bf6479837fa35e7a035695ff7e0aaf8f878f5354730ac75808d36c5e34ae15d32a1af37134ce881edd810c4a5
+DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687

diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 82f1004b75f..7e552f52df9 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${P/_/}"
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches.tar.xz"
+	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches-1.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-01-18 15:37 Lars Wendler
  0 siblings, 0 replies; 182+ messages in thread
From: Lars Wendler @ 2019-01-18 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ef0ed65a6b27a83686282fd6b0a7b2ea7d1a8d0a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 15:37:17 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 15:37:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0ed65a

media-gfx/inkscape: Bump to version 0.92.4

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-gfx/inkscape/Manifest               |   1 +
 media-gfx/inkscape/inkscape-0.92.4.ebuild | 170 ++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 318f50bfe53..db8162a0074 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
+DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
new file mode 100644
index 00000000000..b4bddca2ef6
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P="${P/_/}"
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable exif)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		--enable-poppler-cairo
+		$(use_enable wpg)
+		$(use_enable visio)
+		$(use_enable cdr)
+		$(use_enable dbus dbusapi)
+		$(use_enable imagemagick magick)
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_with spell gtkspell)
+		$(use_with spell aspell)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	python_optimize "${ED%/}"/usr/share/${PN}/extensions
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-05-23 12:37 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2019-05-23 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     81232782d83719d112627f4f7125f3004fb270c1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 12:37:14 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 23 12:37:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81232782

media-gfx/inkscape: amd64 stable wrt bug #685488

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 7d775127ec3..f8e3f1228a0 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-06-01 14:26 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-06-01 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b3ea1e61462eeda825109447063b7f9683b2cfa4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 12:19:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 14:26:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ea1e61

media-gfx/inkscape: Let xdg.eclass handle pkg_post{inst,rm} phases

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 13ee14e96df..d29e444aff2 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -157,15 +157,3 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 	python_optimize "${ED%/}"/usr/share/${PN}/extensions
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-06-01 14:26 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-06-01 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     40e3eed16f422d97562d24703ef1e0111af5081a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 12:17:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 14:26:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e3eed1

media-gfx/inkscape: Check compiler if compiling only

Closes: https://bugs.gentoo.org/633406
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 078ed739c98..13ee14e96df 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -105,7 +105,7 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 pkg_pretend() {
-	if use openmp; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-06-14 20:42 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-06-14 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     862b1ad2f14ac504b8dd995c52b0722151a7eedc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 20:35:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 20:42:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862b1ad2

media-gfx/inkscape: 0.92.4 ppc64 stable

Thanks-to: ernsteiswuerfel <erhard_f <AT> mailbox.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index d29e444aff2..f0122c56aa5 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-07-24 15:00 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     699a6905d601d820e6e5a457a9ce77d408842ee0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 14:17:25 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 15:00:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699a6905

media-gfx/inkscape: MAKEOPTS=-j1

Closes: https://bugs.gentoo.org/686304
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index f0122c56aa5..bf71f2480a5 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -102,6 +102,8 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
+MAKEOPTS+=" -j1" # bug 686304, fix it if you don't like it
+
 RESTRICT="test"
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-07-24 15:28 Lars Wendler
  0 siblings, 0 replies; 182+ messages in thread
From: Lars Wendler @ 2019-07-24 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     8c4acbe4b43cd77e3006ed9f3a9d9ceb7f49a95d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 15:27:00 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 15:28:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4acbe4

media-gfx/inkscape: Attempt to avoid MAKEOPTS="-j1"

Bug: https://bugs.gentoo.org/686304
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index bf71f2480a5..4c4217dd338 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -102,8 +102,6 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
-MAKEOPTS+=" -j1" # bug 686304, fix it if you don't like it
-
 RESTRICT="test"
 
 pkg_pretend() {
@@ -150,6 +148,7 @@ src_configure() {
 }
 
 src_compile() {
+	emake -C src helper/sp-marshal.h #686304
 	emake AR="$(tc-getAR)"
 }
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-07-24 20:49 Thomas Deutschmann
  0 siblings, 0 replies; 182+ messages in thread
From: Thomas Deutschmann @ 2019-07-24 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3a5e7fec355b7b4b2aabf3e0c9657b4aa9e91107
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 20:25:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 20:48:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5e7fec

media-gfx/inkscape: x86 stable (bug #685488)

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 4c4217dd338..08369700fb9 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-06 21:41 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-06 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b86b60664c446553e47a04d1c3fa7e16a1f23374
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 21:41:06 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 21:41:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86b6066

media-gfx/inkscape-1.0_beta1: fixed UnnecessarySlashStrip warning

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index a22ce6458cc..1e150bf71bd 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -146,8 +146,8 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 
 	# No extensions are present in beta1
-	if [ -n $(find "${ED%/}"/usr/share/${PN}/extensions -mindepth 1) ]; then
-		python_optimize "${ED%/}"/usr/share/${PN}/extensions
+	if [ -n $(find "${ED}"/usr/share/${PN}/extensions -mindepth 1) ]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 
 	cmake-utils_src_install


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07  8:11 Lars Wendler
  0 siblings, 0 replies; 182+ messages in thread
From: Lars Wendler @ 2019-11-07  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     343aa41ec2ce85c7b6905c1666e77a41d22276d4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 08:06:01 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 08:11:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343aa41e

media-gfx/inkscape: Added BDEPEND and fixed some style issues

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 1e150bf71bd..5084ffd08c6 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="cdr dia dbus exif gnome graphicsmagick +imagemagick openmp postscript inkjar jpeg svg2 jemalloc"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( imagemagick graphicsmagick )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( imagemagick graphicsmagick )"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
@@ -86,6 +87,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.65
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
@@ -118,13 +121,13 @@ src_configure() {
 	# aliasing unsafe wrt #310393
 	append-flags -fno-strict-aliasing
 
-mycmakeargs=(
+	mycmakeargs=(
 	-DWITH_DBUS="$(usex dbus ON OFF)"   # Compile with support for DBus interface
 	-DENABLE_LCMS="$(usex lcms ON OFF)"   # Compile with LCMS support
 	-DWITH_SVG2="$(usex svg2 ON OFF)"   # Compile with support for new SVG2 features
-#    -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+	#-DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
 	-DWITH_OPENMP="$(usex openmp ON OFF)"   # Compile with OpenMP support
-#    -DWITH_PROFILING   # Turn on profiling
+	#-DWITH_PROFILING   # Turn on profiling
 	-DBUILD_SHARED_LIBS="$(usex !static-libs ON OFF)"  # Compile libraries as shared and not static
 	-DENABLE_POPPLER=ON   # Compile with support of libpoppler
 	-DENABLE_POPPLER_CAIRO=ON   # Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)
@@ -135,7 +138,7 @@ mycmakeargs=(
 	-DWITH_LIBWPG="$(usex wpg ON OFF)"   # Compile with support of libwpg for WordPerfect Graphics
 	-DWITH_NLS="$(usex nls ON OFF)"   # Compile with Native Language Support (using gettext)
 	-DWITH_JEMALLOC="$(usex jemalloc ON OFF)"   # Compile with JEMALLOC support
-)
+	)
 
 	cmake-utils_src_configure
 }
@@ -143,10 +146,10 @@ mycmakeargs=(
 src_install() {
 	default
 
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	# No extensions are present in beta1
-	if [ -n $(find "${ED}"/usr/share/${PN}/extensions -mindepth 1) ]; then
+	if [[ -n $(find "${ED}"/usr/share/${PN}/extensions -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07  9:57 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-07  9:57 UTC (permalink / raw
  To: gentoo-commits

commit:     dd7400e52f9798aca7296e6b850f5ee323f71a0f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 09:56:59 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 09:57:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7400e5

media-gfx/inkscape-1.0_beta1: fixes

1) fixed REQUIRED_USE
2) added missing dependency (graphicsmagick)

Bug: https://bugs.gentoo.org/696794
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 5084ffd08c6..b8cf64e4536 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -22,7 +22,7 @@ IUSE="cdr dia dbus exif gnome graphicsmagick +imagemagick openmp postscript inkj
 IUSE+=" lcms nls spell static-libs visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( imagemagick graphicsmagick )"
+	?? ( imagemagick graphicsmagick )"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
@@ -51,6 +51,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
 	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07 13:47 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-07 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f9de3532d41e84af2920e3a9997f41d94776f774
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 13:46:45 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 13:47:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9de3532

media-gfx/inkscape-1.0_beta1: enabled python3_7

Bug: https://bugs.gentoo.org/696794
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index b8cf64e4536..578f4ed7dfc 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake-utils flag-o-matic xdg-utils xdg toolchain-funcs python-single-r1


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07 15:55 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-07 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6f6bfc2b4f44aca16ac86201f0df82bf3599cffe
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 15:54:37 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 15:54:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6bfc2b

media-gfx/inkscape-1.0_beta1: improved extensions check

Bug: https://bugs.gentoo.org/696794
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 578f4ed7dfc..3bed12295c6 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -150,7 +150,9 @@ src_install() {
 	find "${ED}" -type f -name "*.la" -delete || die
 
 	# No extensions are present in beta1
-	if [[ -n $(find "${ED}"/usr/share/${PN}/extensions -mindepth 1) ]]; then
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07 17:13 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-07 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     71fbff0fb00e3c17ab18e111ba7a65cbc939f9d9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 17:13:34 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 17:13:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fbff0f

media-gfx/inkscape-1.0_beta1: fixed xdg stuff

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index ebb6216931c..dff48e706a2 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
-inherit cmake-utils flag-o-matic xdg-utils xdg toolchain-funcs python-single-r1
+inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
 
 MY_P="${P/_/}"
 
@@ -156,17 +156,3 @@ src_install() {
 
 	cmake-utils_src_install
 }
-
-pkg_preinst() {
-	xdg_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-07 17:13 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-07 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     8f86e7937c99bf407dd440466f546de0cde25f8b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 16:44:12 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 17:13:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f86e793

media-gfx/inkscape-1.0_beta1: should not call default in src_install

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 3bed12295c6..ebb6216931c 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -145,8 +145,6 @@ src_configure() {
 }
 
 src_install() {
-	default
-
 	find "${ED}" -type f -name "*.la" -delete || die
 
 	# No extensions are present in beta1


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-09  8:57 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2019-11-09  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f5639e2077638f27c4c69e82aec8dfe87c1f6ca7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 23:16:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 08:57:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5639e20

media-gfx/inkscape: Misc ebuild and style fixes

Add missing dev-libs/double-conversion slot op
Cleanup, sort and local mycmakeargs
Don't even install copyright file
Drop graphicsmagick,imagemagick from REQUIRED_USE
Indentation and more detail for metadata.xml
Run cmake-utils_src_prepare first
Run cmake-utils_src_install first
Sort IUSE
Sort *DEPENDs

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 88 +++++++++++++---------------
 media-gfx/inkscape/metadata.xml              | 32 +++++-----
 2 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index dff48e706a2..9ec18d3c5b9 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -5,10 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
-
-inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
-
 MY_P="${P/_/}"
+inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
@@ -18,21 +16,30 @@ SRC_URI="https://inkscape.org/gallery/item/14917/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dia dbus exif gnome graphicsmagick +imagemagick openmp postscript inkjar jpeg svg2 jemalloc"
-IUSE+=" lcms nls spell static-libs visio wpg"
+IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
+lcms nls openmp postscript spell static-libs svg2 visio wpg"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( imagemagick graphicsmagick )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/glibmm-2.54.1
 	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
 	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
 	>=dev-libs/libsigc++-2.8
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
 	dev-libs/popt
 	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
@@ -40,9 +47,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
+	net-libs/libsoup
 	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -51,8 +60,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
 	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	spell? (
@@ -68,15 +80,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		app-text/libwpg:0.3
 		dev-libs/librevenge
 	)
-	x11-libs/gtk+:3
-	dev-libs/gdl:3
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	jemalloc? ( dev-libs/jemalloc )
-	net-libs/libsoup
-	dev-libs/double-conversion
 "
-
 # These only use executables provided by these packages
 # See share/extensions for more details. inkscape can tell you to
 # install these so we could of course just not depend on those and rely
@@ -89,12 +93,6 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.65
 "
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -112,39 +110,39 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	einfo "Fixing doc directory path..."
-	sed -i "s%doc/inkscape%doc/${P}%g" CMakeScripts/ConfigCPack.cmake || die "Failed to fix doc directory path"
-
 	cmake-utils_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
 }
 
 src_configure() {
 	# aliasing unsafe wrt #310393
 	append-flags -fno-strict-aliasing
 
-	mycmakeargs=(
-	-DWITH_DBUS="$(usex dbus ON OFF)"   # Compile with support for DBus interface
-	-DENABLE_LCMS="$(usex lcms ON OFF)"   # Compile with LCMS support
-	-DWITH_SVG2="$(usex svg2 ON OFF)"   # Compile with support for new SVG2 features
-	#-DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-	-DWITH_OPENMP="$(usex openmp ON OFF)"   # Compile with OpenMP support
-	#-DWITH_PROFILING   # Turn on profiling
-	-DBUILD_SHARED_LIBS="$(usex !static-libs ON OFF)"  # Compile libraries as shared and not static
-	-DENABLE_POPPLER=ON   # Compile with support of libpoppler
-	-DENABLE_POPPLER_CAIRO=ON   # Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)
-	-DWITH_IMAGE_MAGICK="$(usex imagemagick ON OFF)"   # Compile with support of ImageMagick for raster extensions and image import resolution (requires ImageMagick 6; set to OFF if you prefer GraphicsMagick)
-	-DWITH_GRAPHICS_MAGICK="$(usex graphicsmagick ON OFF)"   # Compile with support of GraphicsMagick for raster extensions and image import resolution
-	-DWITH_LIBCDR="$(usex cdr ON OFF)"   # Compile with support of libcdr for CorelDRAW Diagrams
-	-DWITH_LIBVISIO="$(usex visio ON OFF)"   # Compile with support of libvisio for Microsoft Visio Diagrams
-	-DWITH_LIBWPG="$(usex wpg ON OFF)"   # Compile with support of libwpg for WordPerfect Graphics
-	-DWITH_NLS="$(usex nls ON OFF)"   # Compile with Native Language Support (using gettext)
-	-DWITH_JEMALLOC="$(usex jemalloc ON OFF)"   # Compile with JEMALLOC support
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_NLS=$(usex nls)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
 	)
 
 	cmake-utils_src_configure
 }
 
 src_install() {
+	cmake-utils_src_install
+
 	find "${ED}" -type f -name "*.la" -delete || die
 
 	# No extensions are present in beta1
@@ -153,6 +151,4 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
-
-	cmake-utils_src_install
 }

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index b7fc6b5e478..49c45680f5f 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <use>
-    <flag name="cdr">Enable support for CorelDRAW Diagrams</flag>
-    <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
-    <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
-    <flag name="latex">pull in dependencies for LaTeX formulas</flag>
-    <flag name="svg2">Enable support for new SVG2 features</flag>
-    <flag name="visio">Enable support for Microsoft Visio Diagrams</flag>
-    <flag name="wpg">Enable support for WordPerfect Graphics</flag>
-  </use>
-  <upstream>
-    <remote-id type="gitlab">inkscape/inkscape</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<use>
+		<flag name="cdr">Enable support for CorelDRAW Diagrams via <pkg>media-libs/libcdr</pkg></flag>
+		<flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
+		<flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
+		<flag name="latex">pull in dependencies for LaTeX formulas</flag>
+		<flag name="svg2">Enable support for new SVG2 features</flag>
+		<flag name="visio">Enable support for Microsoft Visio Diagrams via <pkg>media-libs/libvisio</pkg></flag>
+		<flag name="wpg">Enable support for WordPerfect Graphics via <pkg>app-text/libwpg</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">inkscape/inkscape</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-12 11:00 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-12 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     1dca4ae778585b225c1a326fa66202b964864f2e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 11:00:38 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 11:00:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dca4ae7

media-gfx/inkscape-9999: added live ebuild

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 153 ++++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
new file mode 100644
index 00000000000..5957563e4f4
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
+lcms nls openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? (
+		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
+	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_NLS=$(usex nls)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# No extensions are present in beta1
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-12 16:02 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-12 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     2e153a018f756a46e3b98f43a4df42c6215c5912
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 16:02:05 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 16:02:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e153a01

media-gfx/inkscape-{1.0_beta1,9999}: fix graphics package selection

if both imagemagick and graphicsmagick are selected, inkscape
build system prefers imagemagick over graphicsmagick but
we want to prefer graphicsmagick over imagemagick

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index eb490840c8e..17f18b03979 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -127,7 +127,7 @@ src_configure() {
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+		-DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 5957563e4f4..ba2909d315c 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -124,7 +124,7 @@ src_configure() {
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+		-DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-11-12 16:52 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-11-12 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     084dbfd447232f2bac30c24ef493a704b7ac103f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 16:51:41 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 16:51:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084dbfd4

media-gfx/inkscape-{1.0_beta1,9999}: fix graphics package selection logic

since this change both imagemagick and graphicsmagick USE flags
must be enabled to use graphicsmagick

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 4 ++--
 media-gfx/inkscape/inkscape-9999.ebuild      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 17f18b03979..da91d92ffc5 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -127,8 +127,8 @@ src_configure() {
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
 		-DWITH_NLS=$(usex nls)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index ba2909d315c..bb14d85592e 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -124,8 +124,8 @@ src_configure() {
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
 		-DWITH_NLS=$(usex nls)


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2019-12-03 13:25 Miroslav Šulc
  0 siblings, 0 replies; 182+ messages in thread
From: Miroslav Šulc @ 2019-12-03 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     26714ab6c0ea041eb28304784e2391d4e952a3a9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 13:24:50 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 13:25:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26714ab6

media-gfx/inkscape-{1.0_beta1,9999}: removed gnome-base/gnome-vfs

in versions prior to 1.0 there was a configuration parameter for gnome
but in cmake build it does not exist anymore. the only occurance
of libgnomevfs2 is in ${S}/snap/snapcraft.yaml which seems to be used
for bulding installer for mac os.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 5 ++---
 media-gfx/inkscape/inkscape-9999.ebuild      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index da91d92ffc5..06558305609 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://inkscape.org/gallery/item/14917/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
-lcms nls openmp postscript spell static-libs svg2 visio wpg"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -59,7 +59,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
 	imagemagick? (
 		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index bb14d85592e..b088e553b3f 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -15,8 +15,8 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
-lcms nls openmp postscript spell static-libs svg2 visio wpg"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -58,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
 	imagemagick? (
 		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-01-16  6:05 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2020-01-16  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d19d653a781a6cb9b6f831a601931b3089e2bcdf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 05:51:29 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:05:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19d653a

media-gfx/inkscape: Permit numpy-python2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 912f6b6098b..8550767b269 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -72,7 +72,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
 	latex? (


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-01-22 21:50 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2020-01-22 21:50 UTC (permalink / raw
  To: gentoo-commits

commit:     4b1b3d58c39b76a649367615ab6f5f491a44de60
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 21:45:58 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 21:50:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b1b3d58

media-gfx/inkscape: Revbump post dep change

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/{inkscape-0.92.4.ebuild => inkscape-0.92.4-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
similarity index 100%
rename from media-gfx/inkscape/inkscape-0.92.4.ebuild
rename to media-gfx/inkscape/inkscape-0.92.4-r1.ebuild


^ permalink raw reply	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-02-09 16:29 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2020-02-09 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0a178f3dd5df4b56265e83fd9eab92edf1ab673d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 15:03:38 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:26:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a178f3d

media-gfx/inkscape: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{inkscape-0.92.4-r1.ebuild => inkscape-0.92.4-r2.ebuild} | 12 ++++++------
 ...nkscape-1.0_beta2.ebuild => inkscape-1.0_beta2-r1.ebuild} | 10 +++++++---
 media-gfx/inkscape/inkscape-9999.ebuild                      | 10 +++++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
similarity index 95%
rename from media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
rename to media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
index 8550767b269..bc73e6c6f57 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
@@ -32,9 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.6.20
 	>=dev-libs/libxslt-1.0.15
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -72,10 +70,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
 	latex? (

diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
similarity index 95%
rename from media-gfx/inkscape/inkscape-1.0_beta2.ebuild
rename to media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index fe3ac5ac3a7..52bc56d18a5 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -41,9 +41,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -52,6 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -85,7 +87,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1a10390a90d..bc57307639b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -40,9 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -51,6 +49,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -84,7 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-02-21 19:54 Michael Orlitzky
  0 siblings, 0 replies; 182+ messages in thread
From: Michael Orlitzky @ 2020-02-21 19:54 UTC (permalink / raw
  To: gentoo-commits

commit:     a4603d7c1dc746eb7b4b0170d5120ca5e5efb222
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 15:49:50 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 19:52:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4603d7c

media-gfx/inkscape: disable the effects of USE=nls.

The upstream build system is broken with USE=nls at the moment.
Rather than drop the USE flag entirely (which might lead users to
think that it's going away) this commit comments out the resulting
-DWITH_NLS parameter that gets passed to the build system. Thus
"USE=-nls" becomes a lie, but it should begin to work again once the
upstream bug is fixed. There is a highly visible comment in the ebuild
reminding the maintainers to check on the upstream bug periodically.

Bug: https://bugs.gentoo.org/699658
Inkscape-bug: https://gitlab.com/inkscape/inkscape/issues/168
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild | 9 ++++++++-
 media-gfx/inkscape/inkscape-9999.ebuild         | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index 52bc56d18a5..6350c33d337 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -132,13 +132,20 @@ src_configure() {
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_NLS=$(usex nls)
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DWITH_SVG2=$(usex svg2)
 		-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
 }

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index bc57307639b..aa29d78aa48 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -131,13 +131,20 @@ src_configure() {
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_NLS=$(usex nls)
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DWITH_SVG2=$(usex svg2)
 		-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
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-03-31  1:11 Jonas Stein
  0 siblings, 0 replies; 182+ messages in thread
From: Jonas Stein @ 2020-03-31  1:11 UTC (permalink / raw
  To: gentoo-commits

commit:     628f97b8ed238770a787c3d0824cf9efb33dd8e1
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 01:10:02 2020 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 01:11:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628f97b8

media-gfx/inkscape: make uniconvertor optional

media-gfx/uniconvertor supports only Python 2.
The dependency on uniconvertor is now optional to support the transition
to Python 3.
Bug: https://bugs.gentoo.org/448670
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 165 +++++++++++++++++++++++++++
 media-gfx/inkscape/metadata.xml              |  11 +-
 2 files changed, 171 insertions(+), 5 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
new file mode 100644
index 00000000000..912e7bba247
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P="${P/_/}"
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg uniconvertor"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	uniconvertor? ( media-gfx/uniconvertor )
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable exif)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		--enable-poppler-cairo
+		$(use_enable wpg)
+		$(use_enable visio)
+		$(use_enable cdr)
+		$(use_enable dbus dbusapi)
+		$(use_enable imagemagick magick)
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_with spell gtkspell)
+		$(use_with spell aspell)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C src helper/sp-marshal.h #686304
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	python_optimize "${ED%/}"/usr/share/${PN}/extensions
+}

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 49c45680f5f..8bfffeae53d 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -6,13 +6,14 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<use>
-		<flag name="cdr">Enable support for CorelDRAW Diagrams via <pkg>media-libs/libcdr</pkg></flag>
-		<flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
+		<flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag>
+		<flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag>
 		<flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
-		<flag name="latex">pull in dependencies for LaTeX formulas</flag>
+		<flag name="latex">Enable rendering of LaTeX formulas</flag>
 		<flag name="svg2">Enable support for new SVG2 features</flag>
-		<flag name="visio">Enable support for Microsoft Visio Diagrams via <pkg>media-libs/libvisio</pkg></flag>
-		<flag name="wpg">Enable support for WordPerfect Graphics via <pkg>app-text/libwpg</pkg></flag>
+		<flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag>
+		<flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag>
+		<flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">inkscape/inkscape</remote-id>


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-04-15 15:30 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-04-15 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     66ee8a5c08db057167751780c258df471f9e52ab
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 15 15:29:15 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 15 15:30:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ee8a5c

media-gfx/inkscape: zlogene and dilfridge are maintainers

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/metadata.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 8bfffeae53d..73af4608f62 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel</name>
 	</maintainer>
 	<use>
 		<flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag>


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-04-19  2:35 Craig Andrews
  0 siblings, 0 replies; 182+ messages in thread
From: Craig Andrews @ 2020-04-19  2:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6de02d5834ae5908fa2f8be0afff77eabf2359b6
Author:     neeshy <neeshy <AT> tfwno <DOT> gf>
AuthorDate: Wed Mar 25 19:36:50 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 02:35:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de02d58

media-gfx/inkscape: add python3_8 target

Signed-off-by: Nima Sadeghi <neeshy <AT> tfwno.gf>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index 6350c33d337..3932a963c31 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 RELEASE_SUFFIX="_2019-12-03_2b71d25d45"

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


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-04-23 19:16 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-04-23 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     dc819f47d4ca0e93da452194756ef15c240fb639
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 19:15:36 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 19:16:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc819f47

media-gfx/inkscape: Version bump (v1.0_rc1)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest                |   1 +
 media-gfx/inkscape/inkscape-1.0_rc1.ebuild | 160 +++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e36ab94e6b0..0ac112b1794 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
+DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89
 DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f

diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
new file mode 100644
index 00000000000..e6249b176dd
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="xml"
+
+RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05"
+
+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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}-${RELEASE_SUFFIX}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-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
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# No extensions are present in beta1
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-04-23 19:22 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-04-23 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     bf91f0c85c0306a13a68cdf1dbe029bbf4ac3bc6
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 19:22:32 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 19:22:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf91f0c8

media-gfx/inkscape: Drop old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest                     |   1 -
 media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild | 164 ------------------------
 2 files changed, 165 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 0ac112b1794..6896b0893a6 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89
-DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f

diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
deleted file mode 100644
index 3932a963c31..00000000000
--- a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-MY_P="${P/_/}"
-RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
-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://inkscape.org/gallery/item/16197/${MY_P}${RELEASE_SUFFIX}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-S="${WORKDIR}/${MY_P}${RELEASE_SUFFIX}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
-	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-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
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# No extensions are present in beta1
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-04-25 13:46 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2020-04-25 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f08c994742e2d31bb1b1916dc3fcb3ba17b59601
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 13:45:36 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 13:45:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08c9947

media-gfx/inkscape: re-add py36 support

Closes: https://bugs.gentoo.org/719386
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
index e6249b176dd..34878580628 100644
--- a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-05-05 12:38 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-05-05 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a91e615e2a2a73eb3d0ab06e25cd00d44c3efdd1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 12:37:09 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May  5 12:38:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91e615e

media-gfx/inkscape: Version bump (v1.0)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest            |   1 +
 media-gfx/inkscape/inkscape-1.0.ebuild | 162 +++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6896b0893a6..87355bad960 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 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 b/media-gfx/inkscape/inkscape-1.0.ebuild
new file mode 100644
index 00000000000..3af00fe145c
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}-${PN^^}_$(ver_rs 1-2 "_")
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-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
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	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
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-05-05 18:37 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-05-05 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b57fca541e887013c85303edfe448b4a5058f32a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 18:36:27 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May  5 18:37:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b57fca54

media-gfx/inkscape: mark stable

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
index 223078d3cfa..1b9241b51aa 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg uniconvertor"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-05-05 18:37 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-05-05 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b26d2d4e93f796b586dda69413392799fe15aa7c
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 18:37:27 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May  5 18:37:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26d2d4e

media-gfx/inkscape: Drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/inkscape-0.92.4-r2.ebuild | 166 ---------------------------
 1 file changed, 166 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
deleted file mode 100644
index f6599b277d7..00000000000
--- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P="${P/_/}"
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.54.1
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
-	"${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394
-)
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable exif)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		--enable-poppler-cairo
-		$(use_enable wpg)
-		$(use_enable visio)
-		$(use_enable cdr)
-		$(use_enable dbus dbusapi)
-		$(use_enable imagemagick magick)
-		$(use_with gnome gnome-vfs)
-		$(use_with inkjar)
-		$(use_with spell gtkspell)
-		$(use_with spell aspell)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C src helper/sp-marshal.h #686304
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	python_optimize "${ED%/}"/usr/share/${PN}/extensions
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-02  9:38 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2020-06-02  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     73f4811031a8acf249ea5b589d82974b19592d23
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 09:38:00 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 09:38:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f48110

media-gfx/inkscape: Keyword 1.0 sparc, #726746

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild
index 3af00fe145c..5501c64dba0 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-02 13:29 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2020-06-02 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1c82e7561212b1c01856b9a0060cb86a426df616
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 13:28:04 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 13:29:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c82e756

media-gfx/inkscape: Keyword 1.0 ia64, #726746

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild
index 5501c64dba0..3d561da7ea6 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-04 17:14 Mart Raudsepp
  0 siblings, 0 replies; 182+ messages in thread
From: Mart Raudsepp @ 2020-06-04 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a648be54f0abddd5f4c4838605b5142156e34a51
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Wed Jun  3 19:06:23 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 17:13:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a648be54

media-gfx/inkscape: arm64 keyworded (bug #726746)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild
index 8e9e53cff71..46e2fc65523 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-06 21:17 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-06-06 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     985ec691cbd2dbd4ee3933f2a69df06496757cff
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 21:16:06 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 21:17:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=985ec691

media-gfx/inkscape: sync live ebuild

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index b87ca681947..1cc566e6135 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-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}"
@@ -117,6 +117,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
@@ -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
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-06 21:17 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-06-06 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     603609036f44f8da97ff6fc700778f1be1998955
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 21:11:25 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 21:17:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60360903

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 <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest                            |  2 +-
 .../{inkscape-1.0.ebuild => inkscape-1.0-r1.ebuild}    | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 87355bad960..eef54c384ba 100644
--- 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 b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
similarity index 88%
rename from media-gfx/inkscape/inkscape-1.0.ebuild
rename to media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 46e2fc65523..bd52bf80600 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/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


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-06-06 21:17 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-06-06 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b6beaa291961ed9cbf8a0d66cb7ce66def2763fd
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 21:16:50 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 21:17:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6beaa29

media-gfx/inkscape: Drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest                |   1 -
 media-gfx/inkscape/inkscape-1.0_rc1.ebuild | 160 -----------------------------
 2 files changed, 161 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index eef54c384ba..88b7c565b70 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
deleted file mode 100644
index 34878580628..00000000000
--- a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05"
-
-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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-${RELEASE_SUFFIX}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-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
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# No extensions are present in beta1
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-07-02  6:25 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2020-07-02  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     cc4eb0223b51ca3ff161145b330614d9afbcc097
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 06:24:29 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 06:24:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4eb022

media-gfx/inkscape: amd64 stable wrt bug #726600

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index bd52bf80600..e679b983917 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-07-02  6:30 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2020-07-02  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     bfa9626872991a42f02e68de6e48681fdd29b7f0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 06:29:52 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 06:29:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa96268

media-gfx/inkscape: ppc stable wrt bug #726600

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index e679b983917..024e9c8b65b 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-07-02  6:32 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2020-07-02  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1c62b6050151b318a3f9bc2d3a1392118c7c1497
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 06:31:49 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 06:31:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c62b605

media-gfx/inkscape: ppc64 stable wrt bug #726600

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 024e9c8b65b..f2b15eb7ad8 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-07-02  6:36 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2020-07-02  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     dac6bcc3e515e936df9464915bf90954ec70ca4e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 06:35:30 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 06:35:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac6bcc3

media-gfx/inkscape: x86 stable wrt bug #726600

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index f2b15eb7ad8..86a1a7aa6dc 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-07-14 13:26 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2020-07-14 13:26 UTC (permalink / raw
  To: gentoo-commits

commit:     445d1b67c835de6cf92e28f81b354b8a91feed1f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 13:24:18 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 13:25:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445d1b67

media-gfx/inkscape: s390 keyworded (bug #726746)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 86a1a7aa6dc..b137a124f30 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-09-08 16:31 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2020-09-08 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2fe790c3a2c29415584fad5e8670139276af08f5
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 16:29:29 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 16:31:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe790c3

media-gfx/inkscape: Version bump (v1.0.1)

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 +
 media-gfx/inkscape/inkscape-1.0.1.ebuild | 158 +++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 7007e82d78c..9048977f8e6 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1 +1,2 @@
+DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
new file mode 100644
index 00000000000..acbf33e3ba9
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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://inkscape.org/gallery/item/18460/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/missing_atomic_include.patch"
+)
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${P}_2020-09-07_3bc2e813f5
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	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)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-09-08 21:59 Sergei Trofimovich
  0 siblings, 0 replies; 182+ messages in thread
From: Sergei Trofimovich @ 2020-09-08 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8b7674eaea637dd035749941ef8e1f5c6a8c09d6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 21:59:00 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 21:59:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7674ea

media-gfx/inkscape: provide working SRC_URI

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index acbf33e3ba9..c7b103100cf 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -10,7 +10,7 @@ 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://inkscape.org/gallery/item/18460/${P}.tar.xz"
+SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2020-12-27  3:46 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2020-12-27  3:46 UTC (permalink / raw
  To: gentoo-commits

commit:     8dcd1c3fec2ed218e3e2a4e7e1d74f588f4dd190
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Oct  5 09:38:37 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 03:42:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcd1c3f

media-gfx/inkscape: python3_9

Closes: https://bugs.gentoo.org/747067
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17790
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-1.0.1.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 0e5ca71a8f9..53bd4516401 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index c7b103100cf..46527098d10 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-01-02 18:04 Joonas Niilola
  0 siblings, 0 replies; 182+ messages in thread
From: Joonas Niilola @ 2021-01-02 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ce567b79660e5635d95303297fe5e9191324d397
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 18:04:11 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 18:04:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce567b79

media-gfx/inkscape: sync sandbox issue fix with -9999

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1cc566e6135..d9978ad99f8 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,4 +152,7 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-01-02 18:04 Joonas Niilola
  0 siblings, 0 replies; 182+ messages in thread
From: Joonas Niilola @ 2021-01-02 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8a7966781c218c5402a171b717322c9773134610
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 17:54:47 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 17:54:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a796678

media-gfx/inkscape: fix sandbox issue with 1.0.1

Closes: https://bugs.gentoo.org/761915
Closes: https://github.com/gentoo/gentoo/pull/18911
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index 46527098d10..ebd89f20c15 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -155,4 +155,7 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-01-20 21:54 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2021-01-20 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e8a2bf0e68093bc94a0fedc634da6c6bde93bb69
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 21:51:28 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 21:54:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a2bf0e

media-gfx/inkscape: Version bump (v1.0.2)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 +
 media-gfx/inkscape/inkscape-1.0.2.ebuild | 157 +++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9048977f8e6..aaa5a70469f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
+DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0

diff --git a/media-gfx/inkscape/inkscape-1.0.2.ebuild b/media-gfx/inkscape/inkscape-1.0.2.ebuild
new file mode 100644
index 00000000000..ed4d6019f5e
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${P}_2021-01-15_e86c870879
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	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)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-01-20 21:54 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2021-01-20 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     16be4f6fa41e9b2250a103d66345761d9cf23943
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 21:53:27 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 21:54:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16be4f6f

media-gfx/inkscape: Drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/Manifest               |   1 -
 media-gfx/inkscape/inkscape-1.0-r1.ebuild | 158 ------------------------------
 2 files changed, 159 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index aaa5a70469f..2455bcce911 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
-DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0

diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
deleted file mode 100644
index 53bd4516401..00000000000
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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://inkscape.org/gallery/item/18460/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	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)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-01-20 21:54 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2021-01-20 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     323957f1b4ab12aae8c22b3fbf6aad9498e878cb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 21:52:49 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 21:54:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323957f1

media-gfx/inkscape: mark stable

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index ebd89f20c15..01a5f16bfc2 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-02-16  2:12 Matt Turner
  0 siblings, 0 replies; 182+ messages in thread
From: Matt Turner @ 2021-02-16  2:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b179f32e9993f634f7f93acd310af69df9c85fab
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Sat Feb  6 22:20:41 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 01:25:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b179f32e

media-gfx/inkscape: Specify the cairomm+glibmm+pangomm+libsigc++ slots

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../inkscape/{inkscape-1.0.1.ebuild => inkscape-1.0.1-r1.ebuild}  | 8 ++++----
 .../inkscape/{inkscape-1.0.2.ebuild => inkscape-1.0.2-r1.ebuild}  | 8 ++++----
 media-gfx/inkscape/inkscape-9999.ebuild                           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
similarity index 97%
rename from media-gfx/inkscape/inkscape-1.0.1.ebuild
rename to media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
index 01a5f16bfc2..861ac2210cd 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
@@ -32,14 +32,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3

diff --git a/media-gfx/inkscape/inkscape-1.0.2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
similarity index 97%
rename from media-gfx/inkscape/inkscape-1.0.2.ebuild
rename to media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index ed4d6019f5e..6e4e248cea3 100644
--- a/media-gfx/inkscape/inkscape-1.0.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index d9978ad99f8..e29603e7c82 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-04-14 19:28 Mikle Kolyada
  0 siblings, 0 replies; 182+ messages in thread
From: Mikle Kolyada @ 2021-04-14 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     2d10f99ba54e87fd0a0af14d3f90957a26e28c9d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 19:27:55 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 19:28:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d10f99b

media-gfx/inkscape: mark stable

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 9ab84bfc5c5..d70335ea2fb 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-08-12  3:10 Yixun Lan
  0 siblings, 0 replies; 182+ messages in thread
From: Yixun Lan @ 2021-08-12  3:10 UTC (permalink / raw
  To: gentoo-commits

commit:     971dcf4d911956fd933a38561160b7868ee7b235
Author:     Alex Fan <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Thu Aug 12 00:58:06 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 02:55:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971dcf4d

media-gfx/inkscape: keyword 1.0.2-r1 for ~riscv

Closes: https://github.com/gentoo/gentoo/pull/21954
Signed-off-by: Alex Fan <alexfanqi <AT> yahoo.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 975ed9f12d4..ddee1494626 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-09-16 19:11 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2021-09-16 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     11c7f6127165394b955cebb4fff6cce2c1e9ca19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 19:07:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 19:11:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c7f612

media-gfx/inkscape: fix libsoup slot dependency

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../inkscape/{inkscape-1.0.2-r1.ebuild => inkscape-1.0.2-r2.ebuild}     | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
rename to media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
index ddee1494626..0a9dc6de2d5 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
-	net-libs/libsoup
+	net-libs/libsoup:2.4
 	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 963ed354865..6912d66bb36 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
-	net-libs/libsoup
+	net-libs/libsoup:2.4
 	sci-libs/gsl:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-09-25 15:59 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2021-09-25 15:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ce969302196f7f415bcc683bca0d078024fec945
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jul  5 12:43:44 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 15:58:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce969302

media-gfx/inkscape: sync live

- Add optional readline support,
- gtkspell dependency was changed to gspell and aspell is not required
  anymore,
- testing

Closes: https://bugs.gentoo.org/790269
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 6912d66bb36..dc4abef7db6 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
+openmp postscript readline spell static-libs svg2 test visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -67,10 +67,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
 	visio? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -94,9 +92,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.65
+	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -121,10 +120,13 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
 		-DWITH_OPENMP=$(usex openmp)
@@ -156,3 +158,7 @@ src_install() {
 	# Empty directory causes sandbox issues, see bug #761915
 	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
+
+src_test() {
+	cmake_build -j1 check
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-11-08 10:10 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2021-11-08 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d22998b712676a08c7f3284a9fc36481a4a4f763
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 10:10:12 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 10:10:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22998b7

media-gfx/inkscape: amd64 stable wrt bug #822174

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index 0a00c0afef4..8e48a05bedb 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-11-10  7:05 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2021-11-10  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a9b70fc577883e145fcd96541b17d0bd2c768aeb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 07:05:06 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 07:05:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b70fc5

media-gfx/inkscape: x86 stable wrt bug #822174

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index 8e48a05bedb..e5903721426 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-11-19 11:39 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2021-11-19 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     319c9930581b48125a15469b185850701ba99edd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 11:38:26 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 11:39:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319c9930

media-gfx/inkscape: Stabilize 1.1 ppc64, #822174

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index e59037214266..c1cb64de03b4 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-12-04 17:43 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2021-12-04 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f9fa41d54ec4e65f6c59ed542390ab2ab67345e7
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  4 17:41:08 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 17:43:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9fa41d5

media-gfx/inkscape: Stabilize 1.1 ppc, #822174

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index c1cb64de03b4..a1f3e81bfcda 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-12-12 20:03 David Seifert
  0 siblings, 0 replies; 182+ messages in thread
From: David Seifert @ 2021-12-12 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b87890e19640f50bf0e491442c8a34c1694464c7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 20:03:39 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 20:03:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87890e1

media-gfx/inkscape: sync live ebuild

Closes: https://github.com/gentoo/gentoo/pull/23271
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 05de5cb6c18a..c77a2bc64410 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -33,6 +33,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
 	>=dev-libs/libsigc++-2.8:2
@@ -91,7 +92,6 @@ RDEPEND="${COMMON_DEPEND}
 	postscript? ( app-text/ghostscript-gpl )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
 	test? ( dev-cpp/gtest )
 "
 
@@ -139,6 +139,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_build -j1 check
+}
+
 src_install() {
 	cmake_src_install
 
@@ -158,7 +162,3 @@ src_install() {
 	# Empty directory causes sandbox issues, see bug #761915
 	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
-
-src_test() {
-	cmake_build -j1 check
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-12-12 20:03 David Seifert
  0 siblings, 0 replies; 182+ messages in thread
From: David Seifert @ 2021-12-12 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     8100a9d8370f53ae9b1a2e79df504a58753cd8e9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 20:03:38 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 20:03:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8100a9d8

media-gfx/inkscape: subslot op on boost

* Inkscape uses `Boost::filesystem` unconditionally

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/inkscape/{inkscape-1.1.ebuild => inkscape-1.1-r1.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
similarity index 98%
rename from media-gfx/inkscape/inkscape-1.1.ebuild
rename to media-gfx/inkscape/inkscape-1.1-r1.ebuild
index a1f3e81bfcda..8827e75c514f 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
 	>=dev-libs/libsigc++-2.8:2
@@ -93,9 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
+DEPEND="${COMMON_DEPEND}"
 
 RESTRICT="test"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-12-13 22:57 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2021-12-13 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1bad1caecea83d260f2cf9b4db8979c53bbfc3ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 22:57:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 22:57:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bad1cae

media-gfx/inkscape: Keyword 1.1-r1 ia64, #828455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 6d152296eb9a..c713d8b4e707 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
+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 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2021-12-13 22:57 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2021-12-13 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     fbe53d2cf88d9a70f219502fb32095694cbb98a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 22:57:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 22:57:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe53d2c

media-gfx/inkscape: Keyword 1.1-r1 hppa, #828455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 8827e75c514f..6d152296eb9a 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-01-14 23:51 Matt Turner
  0 siblings, 0 replies; 182+ messages in thread
From: Matt Turner @ 2022-01-14 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9b733d74474e7cd3a8eec5fd768e193796554cad
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 23:51:25 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 23:51:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b733d74

media-gfx/inkscape: Keyword 1.1-r1 alpha, #808396

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index c713d8b4e707..acc281e6d6ee 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha 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 visio wpg"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-01-22  0:37 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-01-22  0:37 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-01-22 19:19 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-01-22 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     e58c99a40fbd7dac1049684104c46e3e76951dc0
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 19:18:45 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 19:18:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58c99a4

media-gfx/inkscape: Remove useflag static-libs (now always off)

Closes: https://bugs.gentoo.org/830972
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest              | 2 +-
 media-gfx/inkscape/inkscape-1.1.1.ebuild | 6 +++---
 media-gfx/inkscape/inkscape-9999.ebuild  | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 40c08b757d57..83810fd8fb24 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +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
+DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index d9c335c12041..080afaf78213 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 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 visio wpg"
+openmp postscript readline spell svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -130,7 +130,7 @@ src_configure() {
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=ON
 		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_SHARED_LIBS=ON
 		-DWITH_SVG2=$(usex svg2)
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 62a44f8decb6..df45f11b2dc0 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell static-libs svg2 test visio wpg"
+openmp postscript readline spell svg2 test visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -130,7 +130,7 @@ src_configure() {
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=ON
 		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_SHARED_LIBS=ON
 		-DWITH_SVG2=$(usex svg2)
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
@@ -152,7 +152,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


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-01-22 19:35 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-01-22 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     04075de4c2049b5cc6f30857beedab1009493477
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 19:34:13 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 19:34:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04075de4

media-gfx/inkscape: Fix up live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index df45f11b2dc0..863a38c311f8 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -6,15 +6,21 @@ EAPI=7
 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
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell svg2 test visio wpg"
 
@@ -105,6 +111,15 @@ pkg_pretend() {
 	fi
 }
 
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
 src_prepare() {
 	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-03-18 21:30 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-03-18 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c93f64cd7214c6005652bac39f92db41724a17b4
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 19:49:25 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 21:30:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93f64cd

media-gfx/inkscape: minor fixes, also from live ebuild

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2.ebuild | 37 +++++++++++++++++++++++++-------
 media-gfx/inkscape/inkscape-9999.ebuild  |  4 ++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index c966f1a88c05..58011f3429ba 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -5,18 +5,24 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
-
+MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~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 svg2 visio wpg"
+openmp postscript readline spell svg2 test visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -91,11 +97,13 @@ RDEPEND="${COMMON_DEPEND}
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
 
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${P}_2022-02-04_0a00cf5339"
+S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -103,6 +111,15 @@ pkg_pretend() {
 	fi
 }
 
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
 src_prepare() {
 	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
@@ -119,7 +136,7 @@ src_configure() {
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
 		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=OFF
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
@@ -138,6 +155,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_build -j1 check
+}
+
 src_install() {
 	cmake_src_install
 

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 70cee13a08d3..58011f3429ba 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-03-18 21:30 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-03-18 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     f403e86f20018001b2305e92a59ccc8b71abfcb5
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sat Mar 12 20:36:18 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 21:30:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f403e86f

media-gfx/inkscape: add 1.1.2

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 +
 media-gfx/inkscape/inkscape-1.1.2.ebuild | 157 +++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 83810fd8fb24..8e1fb029015d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,4 @@
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
+DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
new file mode 100644
index 000000000000..636fc5106966
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~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 svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}_2022-02-04_0a00cf5339"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-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
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-03-18 21:30 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-03-18 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     23b746af7800902dacd9550026813ab694fff110
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Mar 13 18:16:57 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 21:30:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b746af

media-gfx/inkscape: use internal 2geom explicitly

When inkscape is first time emerged to the system its 2geom library
detection mechanism selects bundled version and installs it as part of
the package. This detection mechanism can lead to a runtime problem when
inkscape is reemerged, because the 2geom library is located in the
system (from previous installation), therefore bundled version is not
selected nor appended to the package and emerge removes 2geom library
from the system because there is no replacement in a new package. Then,
inkscape fails to start because of missing library.

It is necessary to force use of the bundled 2geom library in order to
address the problem.

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/24555
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 1 +
 media-gfx/inkscape/inkscape-1.1.1.ebuild  | 1 +
 media-gfx/inkscape/inkscape-1.1.2.ebuild  | 1 +
 media-gfx/inkscape/inkscape-9999.ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index acc281e6d6ee..517577f93f25 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -125,6 +125,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index 080afaf78213..e76f7867922d 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -120,6 +120,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index 636fc5106966..c966f1a88c05 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -118,6 +118,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 863a38c311f8..70cee13a08d3 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -135,6 +135,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-04-26  2:27 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-04-26  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7910cfdb3035f0d380b6d1b561c97ec317078380
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 18:37:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 02:26:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7910cfdb

media-gfx/inkscape: drop ~s390

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-1.1.1.ebuild  | 2 +-
 media-gfx/inkscape/inkscape-1.1.2.ebuild  | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 64412bc803f8..70ed3359e180 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index a36c80fb7f88..b26f7a2e3ef9 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell svg2 visio wpg"
 

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index 5f461759e758..e5f882642e0f 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 58011f3429ba..784312083896 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-08 18:01 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-08 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     13a14abd1ea08404bc4cec1c413b74dd18a3b92f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 18:00:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  8 18:00:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a14abd

media-gfx/inkscape: use libjpeg-turbo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 92895f6cd959..380722ee9a7b 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	readline? ( sys-libs/readline:= )
 	spell? ( app-text/gspell )
 	visio? (

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 784312083896..77b4ae19423d 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	readline? ( sys-libs/readline:= )
 	spell? ( app-text/gspell )
 	visio? (


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-14 21:30 David Seifert
  0 siblings, 0 replies; 182+ messages in thread
From: David Seifert @ 2022-05-14 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     874964c0135c47678ca1d40cc127f5be086876ba
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:12 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874964c0

media-gfx/inkscape: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild   | 9 ++++++---
 media-gfx/inkscape/inkscape-1.1.1.ebuild    | 9 ++++++---
 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 9 ++++++---
 media-gfx/inkscape/inkscape-1.1.2.ebuild    | 9 ++++++---
 media-gfx/inkscape/inkscape-9999.ebuild     | 9 ++++++---
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 70ed3359e180..57545def31b0 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -101,9 +101,12 @@ RESTRICT="test"
 S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74"
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index b26f7a2e3ef9..c8815fedb950 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -102,9 +102,12 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 380722ee9a7b..372ffec009bb 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -111,9 +111,12 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
 }
 
 src_unpack() {

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index e5f882642e0f..50ef40cb981d 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -110,9 +110,12 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
 }
 
 src_unpack() {

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 77b4ae19423d..8f8d1dbdbc7b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -106,9 +106,12 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
 }
 
 src_unpack() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-15  2:54 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-15  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     68e083b70d4e2c2f9bc0acb69f3d0cab9b94b79e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 02:52:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 02:52:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e083b7

media-gfx/inkscape: add virtual/imagemagick-tools test dep

Needed for 'compare' binary.

Closes: https://bugs.gentoo.org/842765
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 372ffec009bb..e981f947726c 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-15  5:36 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-15  5:36 UTC (permalink / raw
  To: gentoo-commits

commit:     e989d457ad34cc7477ec15352e226c3ac1499ccd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 04:13:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 04:13:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e989d457

media-gfx/inkscape: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 8f8d1dbdbc7b..8e02f6c2278e 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-31  2:55 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-31  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0773c4063cede3878b29a6aaf54ee2596a358105
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:54:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:54:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0773c406

media-gfx/inkscape: skip some tests; fix SRC_URI

Bug: https://bugs.gentoo.org/846893
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.ebuild b/media-gfx/inkscape/inkscape-1.2.ebuild
index 5e052cb10ba3..05ed4ec9c216 100644
--- a/media-gfx/inkscape/inkscape-1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}_2022-05-15_dc2aedaf03.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -159,7 +159,15 @@ src_configure() {
 }
 
 src_test() {
-	cmake_build -j1 check
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-31  2:55 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-31  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a2333ca82c2323c2356c5fbd84214ad52016d0f5
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri May 20 13:40:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:12:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2333ca8

media-gfx/inkscape: sync live

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25575
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 76be9a5c187a..63ee92909973 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -17,11 +17,11 @@ else
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell svg2 test visio wpg X"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -49,13 +49,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
+	media-libs/libepoxy
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	net-libs/libsoup:2.4
 	sci-libs/gsl:=
-	>=x11-libs/pango-1.37.2
+	>=x11-libs/pango-1.44
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
@@ -67,7 +68,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/librevenge
 		media-libs/libcdr
 	)
-	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
 	imagemagick? (
 		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
@@ -142,7 +142,6 @@ src_configure() {
 		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_GNU_READLINE=$(usex readline)


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-31  2:55 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-31  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     63af94bfcd2ca9cbe61b47ff54eb480354b97cd5
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri May 20 13:33:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:12:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63af94bf

media-gfx/inkscape: add 1.2

Closes: https://bugs.gentoo.org/846893
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/Manifest            |   1 +
 media-gfx/inkscape/inkscape-1.2.ebuild | 182 +++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 8e1fb029015d..568f2b0515b2 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -2,3 +2,4 @@ DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
+DIST inkscape-1.2.tar.xz 39157952 BLAKE2B f2f8041cb57d8aa4cad1007f40ea7ce251a6d0c44d713a1542dd9cdf43b4a221705f5b59a244f6e9aca62ad7ec3686f44e7d79ec8cfdeb83a01f18a0d1be32bf SHA512 d4be4ef80638ed5a0fae655c3ea696a2171130110e220beb510e4b51dba95854ad065293bb07683c93a1c550764a1947621389da1199c43997f76b62b69e3812

diff --git a/media-gfx/inkscape/inkscape-1.2.ebuild b/media-gfx/inkscape/inkscape-1.2.ebuild
new file mode 100644
index 000000000000..5e052cb10ba3
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}_2022-05-15_dc2aedaf03.tar.xz -> ${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build -j1 check
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-31  2:55 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-31  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7a92aa5d494b62931feebccbffdeb6da1229b12b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:55:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:55:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a92aa5d

media-gfx/inkscape: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 63ee92909973..e9b78447bd43 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -160,7 +160,15 @@ src_configure() {
 }
 
 src_test() {
-	cmake_build -j1 check
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-05-31  2:57 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-05-31  2:57 UTC (permalink / raw
  To: gentoo-commits

commit:     28c1c931fa490ce7a949e43125db9056dffd112e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:56:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:56:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c1c931

media-gfx/inkscape: Stabilize 1.1.2-r1 amd64, #839273

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index e981f947726c..f18c02e8c2d9 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-06-01  8:19 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-06-01  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a4c17aa4e3ab8ecb4356727a6c8ae22355ce25ee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 08:19:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 08:19:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c17aa4

media-gfx/inkscape: Stabilize 1.1.2-r1 x86, #839273

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index f18c02e8c2d9..962c95234b2b 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-06-02  2:21 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-06-02  2:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ec9c0fefb779c5dfcdf6a487c08ad5e70fb20aa8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 02:21:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 02:21:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9c0fef

media-gfx/inkscape: Stabilize 1.1.2-r1 ppc, #839273

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 962c95234b2b..9e26dba24588 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-06-02  2:21 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-06-02  2:21 UTC (permalink / raw
  To: gentoo-commits

commit:     de2578b9049da4a5447ce2c66e4daf24ae6aea9f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 02:21:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 02:21:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2578b9

media-gfx/inkscape: Stabilize 1.1.2-r1 ppc64, #839273

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 9e26dba24588..26c5f92f0e7f 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-06-03  8:18 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-06-03  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     f17edb0ba283dac0d2e65b0f9f5a2f34630d4a65
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 08:18:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 08:18:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17edb0b

media-gfx/inkscape: add missing dev-python/cssselect dep

Closes: https://bugs.gentoo.org/849353
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/{inkscape-1.2.ebuild => inkscape-1.2-r1.ebuild} | 1 +
 media-gfx/inkscape/inkscape-9999.ebuild                            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.2.ebuild b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.2.ebuild
rename to media-gfx/inkscape/inkscape-1.2-r1.ebuild
index 05ed4ec9c216..3715ededf16d 100644
--- a/media-gfx/inkscape/inkscape-1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index e9b78447bd43..71f4ce5d054a 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -60,6 +60,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-07-19  2:18 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-07-19  2:18 UTC (permalink / raw
  To: gentoo-commits

commit:     be55d2acab82c0ae924ecef22e60f037fab35fdb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 02:17:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 02:17:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be55d2ac

media-gfx/inkscape: add 1.2.1

Closes: https://bugs.gentoo.org/853622
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/Manifest                                        | 1 +
 media-gfx/inkscape/{inkscape-9999.ebuild => inkscape-1.2.1.ebuild} | 7 ++++---
 media-gfx/inkscape/inkscape-9999.ebuild                            | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 568f2b0515b2..6bd667bf328c 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -2,4 +2,5 @@ DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
+DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 DIST inkscape-1.2.tar.xz 39157952 BLAKE2B f2f8041cb57d8aa4cad1007f40ea7ce251a6d0c44d713a1542dd9cdf43b4a221705f5b59a244f6e9aca62ad7ec3686f44e7d79ec8cfdeb83a01f18a0d1be32bf SHA512 d4be4ef80638ed5a0fae655c3ea696a2171130110e220beb510e4b51dba95854ad065293bb07683c93a1c550764a1947621389da1199c43997f76b62b69e3812

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.2.1.ebuild
similarity index 97%
copy from media-gfx/inkscape/inkscape-9999.ebuild
copy to media-gfx/inkscape/inkscape-1.2.1.ebuild
index 71f4ce5d054a..e2183428d93b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
@@ -49,7 +49,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
-	media-libs/libepoxy
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
@@ -60,7 +59,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 71f4ce5d054a..fc44cfcddf1b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
@@ -60,7 +60,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-03 11:25 Jakov Smolić
  0 siblings, 0 replies; 182+ messages in thread
From: Jakov Smolić @ 2022-09-03 11:25 UTC (permalink / raw
  To: gentoo-commits

commit:     978a69e0567f39eab3c9138720ae383544ef98b2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 11:25:39 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 11:25:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978a69e0

media-gfx/inkscape: Keyword 1.2.1-r2 riscv, #868234

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index a0df591ee0d9..64b9b9673f63 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64"
+	KEYWORDS="~alpha ~amd64 ~riscv"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-06  6:49 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-06  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8def02924faf55eb848be5cf211de183fd66df4c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 06:49:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 06:49:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8def0292

media-gfx/inkscape: Keyword 1.2.1-r2 arm64, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index dc180510b3c4..76c94d5ff523 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~riscv"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~riscv"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-07  2:16 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-07  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     bb4b8c85c4d87910840425a5d879ae6484c8da4e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 02:15:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 02:15:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4b8c85

media-gfx/inkscape: Keyword 1.2.1-r2 arm, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 76c94d5ff523..1d74e8e297fa 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~riscv"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-07  7:52 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2022-09-07  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a6e3f9bb91e88f9261b01b472228d15172fb727a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 19:43:12 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 07:51:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e3f9bb

media-gfx/inkscape: Update PYTHON_REQ_USE to xml(+)

Update PYTHON_REQ_USE to specify "xml(+)", as Python 3.11 no longer
features the "xml" flag.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.1-r1.ebuild   | 2 +-
 media-gfx/inkscape/inkscape-1.1.1.ebuild    | 2 +-
 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-1.1.2-r2.ebuild | 2 +-
 media-gfx/inkscape/inkscape-1.1.2.ebuild    | 2 +-
 media-gfx/inkscape/inkscape-1.2-r1.ebuild   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 714016bcc03f..052661b4241c 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index ee780ca4c180..e888907c7a7f 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 

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

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
index 92e3b044afaf..07c6545b959f 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index 5f60b384ddc5..8a3676d83cfa 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 

diff --git a/media-gfx/inkscape/inkscape-1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
index 8b952b447c1e..3362bab86f5d 100644
--- a/media-gfx/inkscape/inkscape-1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-08  5:19 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-08  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     437d5e4ead7ef2347e3a88373ca43cf812accb27
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 05:19:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 05:19:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437d5e4e

media-gfx/inkscape: Keyword 1.2.1-r2 sparc, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 1d74e8e297fa..c9025c036b32 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~sparc"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-08  5:32 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-08  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d27503a47402c35f9d17ad3311b4a2241c266bee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 05:32:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 05:32:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27503a4

media-gfx/inkscape: Keyword 1.2.1-r2 x86, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 1d4b9878295a..c766c52615e1 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-08  5:32 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-08  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c06daa192c6859ca2321082deb320ce408265894
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 05:32:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 05:32:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06daa19

media-gfx/inkscape: Keyword 1.2.1-r2 ppc64, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 8e83f535bde4..1d4b9878295a 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-08  5:32 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2022-09-08  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d60085f4e435ecef6314b0dc114da0aaa8600939
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 05:32:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 05:32:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60085f4

media-gfx/inkscape: Keyword 1.2.1-r2 ppc, #859184

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index c9025c036b32..8e83f535bde4 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~sparc"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-10 18:28 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2022-09-10 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c67a0231a970b87a042599d398adc26b26ab29fc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 18:28:26 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 18:28:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67a0231

media-gfx/inkscape: Keyword 1.2.1-r2 hppa, #859184

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index c766c52615e1..ac022094d385 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-15 15:11 Agostino Sarubbo
  0 siblings, 0 replies; 182+ messages in thread
From: Agostino Sarubbo @ 2022-09-15 15:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ca2f677e2942831bb76445e09615f33ddc1cdde6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 15:11:25 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 15:11:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2f677e

media-gfx/inkscape: Stabilize 1.2.1-r2 amd64, #867094

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index ac022094d385..08371c34c1c8 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-09-16 10:15 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2022-09-16 10:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9d6119c65ea48101a47b26cd55228451d171f05b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 10:14:57 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 10:14:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6119c6

media-gfx/inkscape: Keyword 1.2.1-r2 ia64, #859184

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 1a49062fc5f1..cee8aa000e16 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-10-03 16:05 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-10-03 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     fa3a9278e216a0c9242f5c18143ac46314393f41
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 16:04:34 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 16:05:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3a9278

media-gfx/inkscape: drop versions

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest                 |   4 -
 media-gfx/inkscape/inkscape-1.1-r1.ebuild   | 171 ------------------------
 media-gfx/inkscape/inkscape-1.1.1.ebuild    | 167 ------------------------
 media-gfx/inkscape/inkscape-1.1.2-r2.ebuild | 191 ---------------------------
 media-gfx/inkscape/inkscape-1.1.2.ebuild    | 186 ---------------------------
 media-gfx/inkscape/inkscape-1.2-r1.ebuild   | 191 ---------------------------
 media-gfx/inkscape/inkscape-1.2.1-r1.ebuild | 193 ----------------------------
 7 files changed, 1103 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6bd667bf328c..43b58482d8b7 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,6 +1,2 @@
-DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
-DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
-DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
-DIST inkscape-1.2.tar.xz 39157952 BLAKE2B f2f8041cb57d8aa4cad1007f40ea7ce251a6d0c44d713a1542dd9cdf43b4a221705f5b59a244f6e9aca62ad7ec3686f44e7d79ec8cfdeb83a01f18a0d1be32bf SHA512 d4be4ef80638ed5a0fae655c3ea696a2171130110e220beb510e4b51dba95854ad065293bb07683c93a1c550764a1947621389da1199c43997f76b62b69e3812

diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
deleted file mode 100644
index 052661b4241c..000000000000
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-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://media.inkscape.org/dl/resources/file/${P}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/inkscape-1.1-musl.txz
-"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Backport from master
-	eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch
-	eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch
-
-	# Not yet accepted upstream but rather trivial
-	eapply "${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
-
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-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
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
deleted file mode 100644
index e888907c7a7f..000000000000
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}_2021-09-20_3bf5ae0d25"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.1-poppler-21.11.0.patch
-
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-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
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
deleted file mode 100644
index 07c6545b959f..000000000000
--- a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-# automagic-libX11 (merged before 1.2): https://gitlab.com/inkscape/inkscape/-/merge_requests/3208
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.03.0.patch" # bug 835424
-	"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.04.0.patch" # bug 835661 / bug 843275
-	"${FILESDIR}/${PN}-1.1.2-automagic-libX11.patch" # bug 768663
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build -j1 check
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
deleted file mode 100644
index 8a3676d83cfa..000000000000
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build -j1 check
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
deleted file mode 100644
index 3362bab86f5d..000000000000
--- a/media-gfx/inkscape/inkscape-1.2-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
-	)
-
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
deleted file mode 100644
index 2ed2d93aa201..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
-	)
-
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-10-03 16:09 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2022-10-03 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     3217f4803d9739778fd9ef7cd10b814a3a610917
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 16:08:32 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 16:08:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3217f480

media-gfx/inkscape: hard-disable jemalloc

Bug: https://bugs.gentoo.org/724672
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 7c5bda1590ff..cfc5f2381840 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg
 openmp postscript readline spell svg2 test visio wpg X"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -76,7 +76,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	)
-	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	readline? ( sys-libs/readline:= )
 	spell? ( app-text/gspell )
@@ -149,7 +148,7 @@ src_configure() {
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_GNU_READLINE=$(usex readline)
 		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DWITH_JEMALLOC=OFF
 		-DENABLE_LCMS=ON
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=ON


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-10-21 16:38 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2022-10-21 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     49b1fb9967b166d4e929d7950d83fd86923f231b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 14:27:58 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 16:38:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b1fb99

media-gfx/inkscape: stabilize 1.2.1-r2 for ppc

Tested-by: ernsteiswuerfel <erhard_f <AT> mailbox.org>
Bug: https://bugs.gentoo.org/867094
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index cee8aa000e16..e4746b6d759e 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2022-10-22 14:54 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2022-10-22 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     836f8434f43e7258f4adae2aae4f61039b9fc29d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 14:50:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 14:54:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836f8434

media-gfx/inkscape: Stabilize 1.2.1-r2 ppc64, #867094

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index e4746b6d759e..64ce94f2bd58 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-01-03  2:53 WANG Xuerui
  0 siblings, 0 replies; 182+ messages in thread
From: WANG Xuerui @ 2023-01-03  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     8901cf2e1725288c1606e536b9421fcb4632beba
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 03:41:11 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 02:52:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8901cf2e

media-gfx/inkscape: keyword 1.2.1-r2 for ~loong

Some tests fail, but the failures also appear on amd64.

Closes: https://bugs.gentoo.org/885513
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index 64ce94f2bd58..3691e7f5b7cb 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-02-04 16:11 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2023-02-04 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     7cdb1a8afc7fe974af7c55c193467f63b452a87c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 16:10:06 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 16:11:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdb1a8a

media-gfx/inkscape: add 1.2.2

Closes: https://bugs.gentoo.org/892311
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 +
 media-gfx/inkscape/inkscape-1.2.2.ebuild | 193 +++++++++++++++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e27b5a4f3503..6e703ca5b40b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1 +1,2 @@
 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
+DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
new file mode 100644
index 000000000000..10abaffaa749
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="xml(+)"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-02-20 18:05 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2023-02-20 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     bf37f6e86cc40a38d52d0d687e19e69de0312906
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 17:41:57 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 18:05:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf37f6e8

media-gfx/inkscape: Enable py3.11

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

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


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-01  1:43 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-01  1:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f2545a478d4b3deb435d3837e8efcdf4503d65e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 01:40:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 01:40:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2545a47

media-gfx/inkscape: Stabilize 1.2.2 amd64, #904540

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index 5a3d412e1fa3..fcc109b4a36d 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-01  7:34 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-01  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1d61ed07b27752281c9e976cdb33f9aecda369a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 07:33:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 07:33:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d61ed07

media-gfx/inkscape: destabilize 1.2.2-r1 for ~amd64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
index 5813268f5d70..b608d9a3e9b7 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-01  8:34 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-01  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     fb9e05cc16a8c2be6affb9dc42f8f173a2a24e8d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 08:31:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 08:33:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9e05cc

media-gfx/inkscape: Stabilize 1.2.2 ppc64, #904540

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index fcc109b4a36d..d9588370c24a 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-01  9:39 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-01  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3f4bbe851a2d78b6ede3acc5c133dcdf77ba9667
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 09:38:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 09:38:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4bbe85

media-gfx/inkscape: Stabilize 1.2.2 ppc, #904540

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index d9588370c24a..5979c64f9712 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-01  9:39 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-01  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a7701a0a8577f4afdf470263c0a5d0bf1adf11c7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 09:38:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 09:38:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7701a0a

media-gfx/inkscape: Stabilize 1.2.2 x86, #904540

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index 5979c64f9712..a5abc5d13f0a 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-06 10:14 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-06 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3ff17cac30ae63164b19c9e38ab5a02fece15fae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 10:13:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 10:14:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff17cac

media-gfx/inkscape: drop stale dev-libs/gdl dep

See https://gitlab.com/inkscape/inkscape/-/commit/32385e8e9822d6ff5bbc6d058cf4c47dfb2fb045.

Noticed after Alpine did it (thanks!)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../inkscape/{inkscape-1.2.2-r1.ebuild => inkscape-1.2.2-r2.ebuild}      | 1 -
 media-gfx/inkscape/inkscape-9999.ebuild                                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r2.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
rename to media-gfx/inkscape/inkscape-1.2.2-r2.ebuild
index b608d9a3e9b7..661f368af5d9 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r2.ebuild
@@ -46,7 +46,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
 	media-libs/fontconfig

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 336e101cff8b..21a753469f57 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -46,7 +46,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
 	media-libs/libepoxy


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-06 11:34 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-06 11:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b3694ba7d77b938d598a5004c49e808adb8d5ca8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 11:28:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  6 11:33:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3694ba7

media-gfx/inkscape: drop stale dev-util/intltool dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../inkscape/{inkscape-1.2.2-r2.ebuild => inkscape-1.2.2-r3.ebuild}      | 1 -
 media-gfx/inkscape/inkscape-9999.ebuild                                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.2.2-r2.ebuild
rename to media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
index 661f368af5d9..dec3b3e7e1ac 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
@@ -28,7 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	test? ( virtual/imagemagick-tools )

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 21a753469f57..07e3302df825 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -28,7 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	test? ( virtual/imagemagick-tools )


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-05-13  3:54 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-05-13  3:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c4cfa22bd0a79ff0fe88ae7e44f2d774e71184b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 03:53:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:53:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4cfa22b

media-gfx/inkscape: add appdirs dep for extension store

Closes: https://bugs.gentoo.org/906240
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../inkscape/{inkscape-1.2.2-r3.ebuild => inkscape-1.2.2-r4.ebuild}      | 1 +
 media-gfx/inkscape/inkscape-9999.ebuild                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
rename to media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index dec3b3e7e1ac..7189d99a6480 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -57,6 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
 		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 07e3302df825..e54b80ba8cd3 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -58,6 +58,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
 		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-06-11 23:06 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2023-06-11 23:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f3e4451334502bec81a9bdcd09c448975974a8ca
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 23:05:58 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 23:05:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e44513

media-gfx/inkscape: drop 1.2.1-r2

Closes: https://bugs.gentoo.org/877589
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest                 |   1 -
 media-gfx/inkscape/inkscape-1.2.1-r2.ebuild | 197 ----------------------------
 2 files changed, 198 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6e703ca5b40b..599244276cc3 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f

diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
deleted file mode 100644
index 2caaf0b3ba7a..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
-	)
-
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-08-26 14:07 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-08-26 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     35275a6a0c2cea2cf3bb9f9dc5c46bfebc114e64
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 14:06:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 14:07:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35275a6a

media-gfx/inkscape: 9999 needs boost[stacktrace(-)]

Bug: https://bugs.gentoo.org/689300
Bug: https://bugs.gentoo.org/911267
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index e54b80ba8cd3..176dc00840be 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
+	dev-libs/boost:=[stacktrace(-)]
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
 	>=dev-libs/libsigc++-2.8:2


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-09-17 17:20 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2023-09-17 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5922eeb181dc27d9f6123a1c4e73bf826769254e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 17:20:10 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 17:20:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5922eeb1

media-gfx/inkscape: Stabilize 1.2.2-r4 amd64, #913068

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index 7189d99a6480..26947757ea97 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-09-17 17:20 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2023-09-17 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     31975e0a88fab36e3f1a6f7b26712e4d6a5454eb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 17:20:13 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 17:20:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31975e0a

media-gfx/inkscape: Stabilize 1.2.2-r4 x86, #913068

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index 26947757ea97..d1745d96109b 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-09-18  4:30 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-09-18  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     807894bf026f9869f7f5c65ed3ee3648c7529901
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 13:31:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:23:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807894bf

media-gfx/inkscape: version bump to 1.3

Closes: https://bugs.gentoo.org/911267
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32258
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/Manifest            |   1 +
 media-gfx/inkscape/inkscape-1.3.ebuild | 192 +++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 599244276cc3..cb108bd79ffe 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1 +1,2 @@
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
+DIST inkscape-1.3.tar.xz 85764028 BLAKE2B 798ba301fa649c12c4fd14ec32ab5361ec83a15d5049e493cb27666a7322a65a5f168f8510d525f58abcba8cf32bd2de772de3ae11e86d40556f0255fe768c90 SHA512 1eb488105586bf98a51c7109ab2e23292f039e5f0e66de4d3684a73f0ab408d89ee55560517d3185370ad3f32b31cf03d149df02ba5c895fe386dd1581fcb2e8

diff --git a/media-gfx/inkscape/inkscape-1.3.ebuild b/media-gfx/inkscape/inkscape-1.3.ebuild
new file mode 100644
index 000000000000..491ac24b157a
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.3.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg
+openmp postscript readline spell svg2 test visio wpg X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=[stacktrace(-)]
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/libepoxy
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=OFF
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-09-18  4:30 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-09-18  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     421ad224a895f8edf0a27c3cf2b70fc72c1f44e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 03:50:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:23:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421ad224

media-gfx/inkscape: disable tests

We need to figure out the test failures (see the hint in the bug).

Bug: https://bugs.gentoo.org/871621
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 8 +++-----
 media-gfx/inkscape/inkscape-1.2.2.ebuild    | 8 +++-----
 media-gfx/inkscape/inkscape-1.3.ebuild      | 8 +++-----
 media-gfx/inkscape/inkscape-9999.ebuild     | 8 +++-----
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index d1745d96109b..dad95b005747 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -21,10 +21,10 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	dev-util/glib-utils
@@ -103,8 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="!test? ( test )"
-
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index a5abc5d13f0a..1d5d7d1ddda9 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -21,10 +21,10 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	dev-util/glib-utils
@@ -104,8 +104,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="!test? ( test )"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {

diff --git a/media-gfx/inkscape/inkscape-1.3.ebuild b/media-gfx/inkscape/inkscape-1.3.ebuild
index 491ac24b157a..8f86e17bc1c1 100644
--- a/media-gfx/inkscape/inkscape-1.3.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.ebuild
@@ -21,10 +21,10 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline spell svg2 test visio wpg X"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	dev-util/glib-utils
@@ -103,8 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="!test? ( test )"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 176dc00840be..7954fbf3efac 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -21,10 +21,10 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline spell svg2 test visio wpg X"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	dev-util/glib-utils
@@ -103,8 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="!test? ( test )"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-11-30  3:07 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-11-30  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1e3c09a18ef2315383084fdd260b96caf493cc51
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 02:58:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 02:58:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3c09a1

media-gfx/inkscape: add 1.3.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 +
 media-gfx/inkscape/inkscape-1.3.2.ebuild | 202 +++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index cb108bd79ffe..404631c36257 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
+DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 DIST inkscape-1.3.tar.xz 85764028 BLAKE2B 798ba301fa649c12c4fd14ec32ab5361ec83a15d5049e493cb27666a7322a65a5f168f8510d525f58abcba8cf32bd2de772de3ae11e86d40556f0255fe768c90 SHA512 1eb488105586bf98a51c7109ab2e23292f039e5f0e66de4d3684a73f0ab408d89ee55560517d3185370ad3f32b31cf03d149df02ba5c895fe386dd1581fcb2e8

diff --git a/media-gfx/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
new file mode 100644
index 000000000000..ca758524da42
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.3.2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=[stacktrace(-)]
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/libepoxy
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	sourceview? ( x11-libs/gtksourceview:4 )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_CAIRO=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=OFF
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_GSOURCEVIEW=$(usex sourceview)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		render_test-use
+		render_test-glyph-y-pos
+		render_text-glyphs-combining
+		render_text-glyphs-vertical
+		render_test-rtl-vertical
+		test_lpe
+		test_lpe64
+		cli_export-png-color-mode-gray-8_png_check_output
+	)
+
+	# bug #871621
+	cmake_src_compile tests
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2023-12-14  4:15 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2023-12-14  4:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9fbc0fcfece99a0ee9054fa84a09065142caa070
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Dec 13 18:25:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:14:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbc0fcf

media-gfx/inkscape: Stabilize 1.2.2-r4 ppc64, #913068

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index dad95b005747..a78c5f718e1a 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-01-02  7:38 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-01-02  7:38 UTC (permalink / raw
  To: gentoo-commits

commit:     9888fcd6af173323cf23ca341864a79ca6b6c7c9
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Dec 30 03:30:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 07:37:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9888fcd6

media-gfx/inkscape: Stabilize 1.2.2-r4 ppc, #913068

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index a78c5f718e1a..3d15b4e0824c 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-01-30 21:48 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-01-30 21:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9ebb79a04f909576b0332655afb6764bcd01f017
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 21:47:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 21:47:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebb79a0

media-gfx/inkscape: fix libxml2-2.12 compat for 1.2.2 too

1.3.x is going to be a pain to stable as needs newer boost, so...

Bug: https://bugs.gentoo.org/923247
Bug: https://bugs.gentoo.org/923255
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index 3d15b4e0824c..c3246f097c88 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -107,6 +107,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.2-fix-compile.patch
+	"${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-01-30 23:18 Andreas Sturmlechner
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas Sturmlechner @ 2024-01-30 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     d1409e7f8b46917eb60b8641a8c4854de732b94a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 21:52:04 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 23:18:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1409e7f

media-gfx/inkscape: drop 1.2.2, 1.3 (broken with dev-libs/libxml2-2.12)

Bug: https://bugs.gentoo.org/923247
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/inkscape/Manifest              |   1 -
 media-gfx/inkscape/inkscape-1.2.2.ebuild | 191 -----------------------------
 media-gfx/inkscape/inkscape-1.3.ebuild   | 201 -------------------------------
 3 files changed, 393 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 404631c36257..beebd4bf54b8 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
-DIST inkscape-1.3.tar.xz 85764028 BLAKE2B 798ba301fa649c12c4fd14ec32ab5361ec83a15d5049e493cb27666a7322a65a5f168f8510d525f58abcba8cf32bd2de772de3ae11e86d40556f0255fe768c90 SHA512 1eb488105586bf98a51c7109ab2e23292f039e5f0e66de4d3684a73f0ab408d89ee55560517d3185370ad3f32b31cf03d149df02ba5c895fe386dd1581fcb2e8

diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
deleted file mode 100644
index 1d5d7d1ddda9..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Lots of test failures which need investigating, bug #871621
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
-	)
-
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}

diff --git a/media-gfx/inkscape/inkscape-1.3.ebuild b/media-gfx/inkscape/inkscape-1.3.ebuild
deleted file mode 100644
index 0f162519d9ab..000000000000
--- a/media-gfx/inkscape/inkscape-1.3.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Lots of test failures which need investigating, bug #871621
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=[stacktrace(-)]
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/libepoxy
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	sourceview? ( x11-libs/gtksourceview:4 )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=OFF
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_GSOURCEVIEW=$(usex sourceview)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	CMAKE_SKIP_TESTS=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		render_test-use
-		render_test-glyph-y-pos
-		render_text-glyphs-combining
-		render_text-glyphs-vertical
-		render_test-rtl-vertical
-		test_lpe
-		test_lpe64
-		cli_export-png-color-mode-gray-8_png_check_output
-	)
-
-	# bug #871621
-	cmake_src_compile tests
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-02-29  2:43 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-02-29  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c5ebd5b8de96b966562aeed9cc6d899d8c43c08e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 02:43:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 02:43:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ebd5b8

media-gfx/inkscape: filter LTO (ODR)

Bug: https://gitlab.com/inkscape/lib2geom/-/issues/71
Closes: https://bugs.gentoo.org/859628
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 4 +++-
 media-gfx/inkscape/inkscape-1.3.2.ebuild    | 4 +++-
 media-gfx/inkscape/inkscape-9999.ebuild     | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
index c3246f097c88..00c5bc63f64e 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild
@@ -134,7 +134,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# aliasing unsafe wrt #310393
+	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
+	filter-lto
+	# Aliasing unsafe (bug #310393)
 	append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(

diff --git a/media-gfx/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
index a59e5ee19170..5aeb0df4ea69 100644
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2.ebuild
@@ -134,7 +134,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# aliasing unsafe wrt #310393
+	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
+	filter-lto
+	# Aliasing unsafe (bug #310393)
 	append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 698236284069..e15278a2cad5 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -130,7 +130,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# aliasing unsafe wrt #310393
+	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
+	filter-lto
+	# Aliasing unsafe (bug #310393)
 	append-flags -fno-strict-aliasing
 
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-03-12  0:52 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-03-12  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8f3867c8f2e4b1f7dcaa0c2e19812b3133bed141
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 00:49:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 00:52:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3867c8

media-gfx/inkscape: fix Python dependencies & shebangs

* Fix Python dependency (needs pillow for jpeg/tiff/webp at least)
* Fix shebangs on Python extensions so we respect PYTHON_SINGLE_TARGET

Closes: https://bugs.gentoo.org/924747
Closes: https://bugs.gentoo.org/922320
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{inkscape-9999.ebuild => inkscape-1.3.2-r1.ebuild}        | 11 ++++++++---
 media-gfx/inkscape/inkscape-9999.ebuild                       |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
similarity index 95%
copy from media-gfx/inkscape/inkscape-9999.ebuild
copy to media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index e15278a2cad5..28800fc56156 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (
@@ -106,6 +107,11 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libxml2-2.12.patch
+	"${FILESDIR}"/${P}-poppler-24.03.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -141,6 +147,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_CAIRO=OFF
 		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
@@ -187,14 +194,12 @@ src_install() {
 	cmake_src_install
 
 	find "${ED}" -type f -name "*.la" -delete || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
 	local extdir="${ED}"/usr/share/${PN}/extensions
-
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index e15278a2cad5..ae2fa0eac0ff 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (
@@ -187,14 +188,12 @@ src_install() {
 	cmake_src_install
 
 	find "${ED}" -type f -name "*.la" -delete || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
 	local extdir="${ED}"/usr/share/${PN}/extensions
-
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-03-12 14:38 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2024-03-12 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6e32a9d0fab95d78506981d50ae33c1f6be92953
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 14:37:56 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 14:37:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e32a9d0

media-gfx/inkscape: Stabilize 1.3.2-r1 amd64, #923255

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index fdd5c1e56865..dd527eeaaf53 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-03-12 14:38 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2024-03-12 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2b0d289dc5396578f0cbde67d1a9bbcd60680d35
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 14:37:55 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 14:37:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0d289d

media-gfx/inkscape: Stabilize 1.3.2-r1 x86, #923255

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index 28800fc56156..fdd5c1e56865 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-03-12 15:18 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-03-12 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     0065382a1b13d7f28f188eb4d16bafd6a5e06eb2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 15:09:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 15:11:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0065382a

media-gfx/inkscape: fix Pillow dep for JPEG

We have USE=jpeg which already does something, so it's not a problem if we
propagate it conditionally w/ jpeg? on pillow, even if it's a runtime-only
dep there, I guess.

Reported by wikky.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index dd527eeaaf53..2d62ab98e924 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index ae2fa0eac0ff..491557c237fc 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-04-04 16:23 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2024-04-04 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     08e90b1eb1da01c9a602f6b80ab67b2e1efc8d54
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Apr  2 22:11:22 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:22:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e90b1e

media-gfx/inkscape: Stabilize 1.3.2-r1 ppc64, #923255

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index 2d62ab98e924..61d629c39e2d 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-04-04 16:23 Arthur Zamarin
  0 siblings, 0 replies; 182+ messages in thread
From: Arthur Zamarin @ 2024-04-04 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e76352103b63828dc4a8254f9a6e8c6c20726c46
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Apr  2 23:19:34 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:22:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7635210

media-gfx/inkscape: Stabilize 1.3.2-r1 ppc, #923255

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index 61d629c39e2d..f712f2ccc29f 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-04-15 15:24 Michał Górny
  0 siblings, 0 replies; 182+ messages in thread
From: Michał Górny @ 2024-04-15 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d2915722cd8b6b83b9222966bb9ec1a4ee956c20
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 15:18:14 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 15:23:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2915722

media-gfx/inkscape: Enable py3.12

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.3.2-r1.ebuild | 5 +++--
 media-gfx/inkscape/inkscape-9999.ebuild     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
index f712f2ccc29f..305c099e01eb 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
+
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
+MY_P="${P/_/}"
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 491557c237fc..94b4d2fb3a70 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
+
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
+MY_P="${P/_/}"
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-04-29 23:27 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2024-04-29 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     dc08e03f0a50aebc5d808a3f1ecf36c7b77f71d8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 23:26:43 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 23:27:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc08e03f

media-gfx/inkscape: add missing dependency

Closes: https://bugs.gentoo.org/919786
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../inkscape/{inkscape-1.3.2-r1.ebuild => inkscape-1.3.2-r2.ebuild}      | 1 +
 media-gfx/inkscape/inkscape-9999.ebuild                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
rename to media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
index 305c099e01eb..f746f1a32d60 100644
--- a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/appdirs[${PYTHON_USEDEP}]
 		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 94b4d2fb3a70..b91ba44ceda8 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/appdirs[${PYTHON_USEDEP}]
 		dev-python/cachecontrol[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-09-20 19:23 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2024-09-20 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     a211c482c4cf7ece9d5c533bf586c133b9de8ce8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 19:22:08 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 19:23:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a211c482

media-gfx/inkscape: Add 1.4beta3 (without keywords)

Bug: https://bugs.gentoo.org/939907
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/Manifest                                  |  1 +
 .../{inkscape-9999.ebuild => inkscape-1.4_beta3.ebuild}      | 12 ++++--------
 media-gfx/inkscape/inkscape-9999.ebuild                      |  8 ++------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 53dccb520d73..92c5de657268 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1 +1,2 @@
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
+DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
similarity index 92%
copy from media-gfx/inkscape/inkscape-9999.ebuild
copy to media-gfx/inkscape/inkscape-1.4_beta3.ebuild
index ea0ae58a644c..965b6faf3353 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
@@ -16,8 +16,8 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -38,7 +38,7 @@ BDEPEND="
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
 	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
+	>=dev-cpp/glibmm-2.58:2
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
@@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/freetype:2
 	media-libs/lcms:2
 	media-libs/libpng:0=
-	net-libs/libsoup:2.4
 	sci-libs/gsl:=
 	>=x11-libs/pango-1.44
 	x11-libs/gtk+:3[X?]
@@ -124,7 +123,7 @@ src_unpack() {
 	else
 		default
 	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die
 }
 
 src_prepare() {
@@ -198,7 +197,4 @@ src_install() {
 		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index ea0ae58a644c..7871706cb2a5 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -38,7 +38,7 @@ BDEPEND="
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
 	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
+	>=dev-cpp/glibmm-2.58:2
 	dev-cpp/gtkmm:3.0
 	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
@@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/freetype:2
 	media-libs/lcms:2
 	media-libs/libpng:0=
-	net-libs/libsoup:2.4
 	sci-libs/gsl:=
 	>=x11-libs/pango-1.44
 	x11-libs/gtk+:3[X?]
@@ -124,7 +123,7 @@ src_unpack() {
 	else
 		default
 	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die
 }
 
 src_prepare() {
@@ -198,7 +197,4 @@ src_install() {
 		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-09-24 15:51 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2024-09-24 15:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f56c755a9b5db7e6749836856f1dca150d4d089f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 15:50:24 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 15:51:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56c755a

media-gfx/inkscape: keyword 1.4_beta3

Closes: https://bugs.gentoo.org/939907
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.4_beta3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
index 965b6faf3353..eab33b71e0fe 100644
--- a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-10-15 11:17 Andreas K. Hüttel
  0 siblings, 0 replies; 182+ messages in thread
From: Andreas K. Hüttel @ 2024-10-15 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     f1fd7eeedd3dd09e881137d740fcd76a791fe44d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 11:16:42 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 11:17:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1fd7eee

media-gfx/inkscape: add 1.4

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

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

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 92c5de657268..76baabb37e72 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
+DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
 DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.4.ebuild
similarity index 98%
copy from media-gfx/inkscape/inkscape-9999.ebuild
copy to media-gfx/inkscape/inkscape-1.4.ebuild
index 7871706cb2a5..eab33b71e0fe 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 7871706cb2a5..eab33b71e0fe 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-10-17  7:08 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-10-17  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     2167608f7a9e182ce95c7cf8ebf87494a9cf173f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 07:06:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 07:06:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2167608f

media-gfx/inkscape: enable py3.13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.4.ebuild  | 2 +-
 media-gfx/inkscape/inkscape-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-1.4.ebuild b/media-gfx/inkscape/inkscape-1.4.ebuild
index ddbdde41002c..29117135a3c6 100644
--- a/media-gfx/inkscape/inkscape-1.4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index eab33b71e0fe..57b9aef00a3d 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-11-13 20:03 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-11-13 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     6032b98499a4b1194b229a746bad9f9d754db183
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 19:54:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 19:54:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6032b984

media-gfx/inkscape: drop 1.4_beta3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/Manifest                  |   1 -
 media-gfx/inkscape/inkscape-1.4_beta3.ebuild | 200 ---------------------------
 2 files changed, 201 deletions(-)

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 76baabb37e72..4a8d70c059b9 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,2 @@
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
-DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba

diff --git a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
deleted file mode 100644
index eab33b71e0fe..000000000000
--- a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-MY_P="${P/_/}"
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Lots of test failures which need investigating, bug #871621
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.58:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=[stacktrace(-)]
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/libepoxy
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	sourceview? ( x11-libs/gtksourceview:4 )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
-	filter-lto
-	# Aliasing unsafe (bug #310393)
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=OFF
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_GSOURCEVIEW=$(usex sourceview)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	CMAKE_SKIP_TESTS=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		render_test-use
-		render_test-glyph-y-pos
-		render_text-glyphs-combining
-		render_text-glyphs-vertical
-		render_test-rtl-vertical
-		test_lpe
-		test_lpe64
-		cli_export-png-color-mode-gray-8_png_check_output
-	)
-
-	# bug #871621
-	cmake_src_compile tests
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-11-13 20:03 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-11-13 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     93ab3be0431790c058dfa234fec55fb6ce520f22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 20:01:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 20:01:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ab3be0

media-gfx/inkscape: depend on tinycss2

See https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers.

Closes: https://bugs.gentoo.org/942828
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/{inkscape-1.4.ebuild => inkscape-1.4-r1.ebuild} | 1 +
 media-gfx/inkscape/inkscape-9999.ebuild                            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.4.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
similarity index 99%
rename from media-gfx/inkscape/inkscape-1.4.ebuild
rename to media-gfx/inkscape/inkscape-1.4-r1.ebuild
index 33c9e981ae53..b5aaaa12c6fe 100644
--- a/media-gfx/inkscape/inkscape-1.4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
@@ -67,6 +67,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 57b9aef00a3d..d2cb3625c46c 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -67,6 +67,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-11-13 20:03 Sam James
  0 siblings, 0 replies; 182+ messages in thread
From: Sam James @ 2024-11-13 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f1f73163b66057f2ece8b35014b39c85640041a9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 20:02:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 20:02:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f73163

media-gfx/inkscape: add note wrt release notes

Bug: https://bugs.gentoo.org/942828
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.4-r1.ebuild | 3 +++
 media-gfx/inkscape/inkscape-9999.ebuild   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index b5aaaa12c6fe..bef2104ba139 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Remember to check the release notes for a 'Important Changes for Packagers'
+# section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers.
+
 PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index d2cb3625c46c..5e601916d853 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Remember to check the release notes for a 'Important Changes for Packagers'
+# section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers.
+
 PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 


^ permalink raw reply related	[flat|nested] 182+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
@ 2024-11-24 22:17 Jakov Smolić
  0 siblings, 0 replies; 182+ messages in thread
From: Jakov Smolić @ 2024-11-24 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     06d7ba5767ae7cd40e2df8d4eb9c8ef8c8c1f4fb
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 22:17:22 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 22:17:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d7ba57

media-gfx/inkscape: Stabilize 1.4-r1 x86, #942841

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index 127905e9a0a9..b3ecdedf0a6f 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 182+ messages in thread

end of thread, other threads:[~2024-11-24 22:17 UTC | newest]

Thread overview: 182+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-01  8:19 [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-11-24 22:17 Jakov Smolić
2024-11-13 20:03 Sam James
2024-11-13 20:03 Sam James
2024-11-13 20:03 Sam James
2024-10-17  7:08 Sam James
2024-10-15 11:17 Andreas K. Hüttel
2024-09-24 15:51 Andreas K. Hüttel
2024-09-20 19:23 Andreas K. Hüttel
2024-04-29 23:27 Andreas K. Hüttel
2024-04-15 15:24 Michał Górny
2024-04-04 16:23 Arthur Zamarin
2024-04-04 16:23 Arthur Zamarin
2024-03-12 15:18 Sam James
2024-03-12 14:38 Arthur Zamarin
2024-03-12 14:38 Arthur Zamarin
2024-03-12  0:52 Sam James
2024-02-29  2:43 Sam James
2024-01-30 23:18 Andreas Sturmlechner
2024-01-30 21:48 Sam James
2024-01-02  7:38 Sam James
2023-12-14  4:15 Sam James
2023-11-30  3:07 Sam James
2023-09-18  4:30 Sam James
2023-09-18  4:30 Sam James
2023-09-17 17:20 Arthur Zamarin
2023-09-17 17:20 Arthur Zamarin
2023-08-26 14:07 Sam James
2023-06-11 23:06 Andreas K. Hüttel
2023-05-13  3:54 Sam James
2023-05-06 11:34 Sam James
2023-05-06 10:14 Sam James
2023-05-01  9:39 Sam James
2023-05-01  9:39 Sam James
2023-05-01  8:34 Sam James
2023-05-01  7:34 Sam James
2023-05-01  1:43 Sam James
2023-02-20 18:05 Michał Górny
2023-02-04 16:11 Andreas K. Hüttel
2023-01-03  2:53 WANG Xuerui
2022-10-22 14:54 Michał Górny
2022-10-21 16:38 Andreas Sturmlechner
2022-10-03 16:09 Andreas K. Hüttel
2022-10-03 16:05 Andreas K. Hüttel
2022-09-16 10:15 Arthur Zamarin
2022-09-15 15:11 Agostino Sarubbo
2022-09-10 18:28 Arthur Zamarin
2022-09-08  5:32 Sam James
2022-09-08  5:32 Sam James
2022-09-08  5:32 Sam James
2022-09-08  5:19 Sam James
2022-09-07  7:52 Michał Górny
2022-09-07  2:16 Sam James
2022-09-06  6:49 Sam James
2022-09-03 11:25 Jakov Smolić
2022-07-19  2:18 Sam James
2022-06-03  8:18 Sam James
2022-06-02  2:21 Sam James
2022-06-02  2:21 Sam James
2022-05-31  2:57 Sam James
2022-05-31  2:55 Sam James
2022-05-31  2:55 Sam James
2022-05-31  2:55 Sam James
2022-05-31  2:55 Sam James
2022-05-15  5:36 Sam James
2022-05-15  2:54 Sam James
2022-05-14 21:30 David Seifert
2022-05-08 18:01 Sam James
2022-04-26  2:27 Sam James
2022-03-18 21:30 Andreas K. Hüttel
2022-03-18 21:30 Andreas K. Hüttel
2022-03-18 21:30 Andreas K. Hüttel
2022-01-22 19:35 Andreas K. Hüttel
2022-01-22 19:19 Andreas K. Hüttel
2022-01-22  0:37 Andreas K. Hüttel
2022-01-14 23:51 Matt Turner
2021-12-13 22:57 Sam James
2021-12-13 22:57 Sam James
2021-12-12 20:03 David Seifert
2021-12-12 20:03 David Seifert
2021-12-04 17:43 Arthur Zamarin
2021-11-19 11:39 Arthur Zamarin
2021-11-10  7:05 Agostino Sarubbo
2021-11-08 10:10 Agostino Sarubbo
2021-09-25 15:59 Andreas K. Hüttel
2021-09-16 19:11 Sam James
2021-08-12  3:10 Yixun Lan
2021-04-14 19:28 Mikle Kolyada
2021-02-16  2:12 Matt Turner
2021-01-20 21:54 Mikle Kolyada
2021-01-20 21:54 Mikle Kolyada
2021-01-20 21:54 Mikle Kolyada
2021-01-02 18:04 Joonas Niilola
2021-01-02 18:04 Joonas Niilola
2020-12-27  3:46 Sam James
2020-09-08 21:59 Sergei Trofimovich
2020-09-08 16:31 Mikle Kolyada
2020-07-14 13:26 Sam James
2020-07-02  6:36 Agostino Sarubbo
2020-07-02  6:32 Agostino Sarubbo
2020-07-02  6:30 Agostino Sarubbo
2020-07-02  6:25 Agostino Sarubbo
2020-06-06 21:17 Mikle Kolyada
2020-06-06 21:17 Mikle Kolyada
2020-06-06 21:17 Mikle Kolyada
2020-06-04 17:14 Mart Raudsepp
2020-06-02 13:29 Michał Górny
2020-06-02  9:38 Michał Górny
2020-05-05 18:37 Mikle Kolyada
2020-05-05 18:37 Mikle Kolyada
2020-05-05 12:38 Mikle Kolyada
2020-04-25 13:46 Andreas K. Hüttel
2020-04-23 19:22 Mikle Kolyada
2020-04-23 19:16 Mikle Kolyada
2020-04-19  2:35 Craig Andrews
2020-04-15 15:30 Mikle Kolyada
2020-03-31  1:11 Jonas Stein
2020-02-21 19:54 Michael Orlitzky
2020-02-09 16:29 Michał Górny
2020-01-22 21:50 Michał Górny
2020-01-16  6:05 Michał Górny
2019-12-03 13:25 Miroslav Šulc
2019-11-12 16:52 Miroslav Šulc
2019-11-12 16:02 Miroslav Šulc
2019-11-12 11:00 Miroslav Šulc
2019-11-09  8:57 Andreas Sturmlechner
2019-11-07 17:13 Miroslav Šulc
2019-11-07 17:13 Miroslav Šulc
2019-11-07 15:55 Miroslav Šulc
2019-11-07 13:47 Miroslav Šulc
2019-11-07  9:57 Miroslav Šulc
2019-11-07  8:11 Lars Wendler
2019-11-06 21:41 Miroslav Šulc
2019-07-24 20:49 Thomas Deutschmann
2019-07-24 15:28 Lars Wendler
2019-07-24 15:00 Andreas Sturmlechner
2019-06-14 20:42 Andreas Sturmlechner
2019-06-01 14:26 Andreas Sturmlechner
2019-06-01 14:26 Andreas Sturmlechner
2019-05-23 12:37 Mikle Kolyada
2019-01-18 15:37 Lars Wendler
2019-01-16 20:01 Andreas Sturmlechner
2019-01-11  0:37 Andreas Sturmlechner
2018-12-15 11:48 Mikle Kolyada
2018-12-14 22:50 Sergei Trofimovich
2018-12-14 22:48 Sergei Trofimovich
2018-12-14  2:13 Thomas Deutschmann
2018-10-27 21:12 Andreas Sturmlechner
2018-10-27 21:12 Andreas Sturmlechner
2018-10-27 21:12 Andreas Sturmlechner
2018-03-31  5:12 Tim Harder
2018-03-12  6:17 Matt Turner
2018-03-12  6:17 Matt Turner
2018-01-27 21:57 Mikle Kolyada
2018-01-15 10:52 Lars Wendler
2017-11-23 12:46 Jonas Stein
2017-11-22 16:13 Jonas Stein
2017-11-22 16:13 Jonas Stein
2017-11-22 12:05 Jonas Stein
2017-11-22  9:19 Jonas Stein
2017-11-21 17:17 Jonas Stein
2017-08-31 12:16 Tim Harder
2017-08-31 12:16 Tim Harder
2017-08-09  8:47 Sergei Trofimovich
2017-08-08 22:26 Sergei Trofimovich
2017-08-02  6:31 Andreas Sturmlechner
2017-05-26 18:37 Markus Meier
2017-05-14 20:54 Jeroen Roovers
2017-05-14 14:24 Andreas Hüttel
2017-05-12 18:54 Jeroen Roovers
2017-02-23 12:47 Michael Weber
2017-02-18 12:35 Manuel Rüger
2017-01-26 11:00 Agostino Sarubbo
2016-12-04 17:12 Michael Palimaka
2016-11-02 16:55 Michael Palimaka
2016-06-10 15:36 Andreas Hüttel
2016-02-12 10:07 Justin Lecher
2016-01-30  9:40 Pacho Ramos
2016-01-23  8:00 Jeroen Roovers
2016-01-17 17:02 Agostino Sarubbo
2016-01-15  9:03 Agostino Sarubbo
2015-12-06 21:55 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox