add patches for improved gnuplot svg handling, bug #234753; describe local USE-flags in metadata.xml

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc2 i686

8 files changed, 208 insertions, 5 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 670c32a48394..a3d444224f71 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.101 2008/06/04 23:50:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.102 2008/08/16 12:55:29 maekke Exp $
+
+*inkscape-0.46-r5 (16 Aug 2008)
+*inkscape-0.46-r4 (16 Aug 2008)
+
+  16 Aug 2008; Markus Meier <maekke@gentoo.org>
+  +files/inkscape-0.46-bug-174720-0.patch,
+  +files/inkscape-0.46-bug-174720-1.patch,
+  +files/inkscape-0.46-bug-214171.patch, metadata.xml,
+  -inkscape-0.46-r3.ebuild, +inkscape-0.46-r4.ebuild,
+  +inkscape-0.46-r5.ebuild:
+  add patches for improved gnuplot svg handling, bug #234753; describe local
+  USE-flags in metadata.xml
 
 *inkscape-0.46-r3 (04 Jun 2008)
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 44db6e7b428a..8ad82b6be7ef 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX inkscape-0.46-bug-174720-0.patch 908 RMD160 ea73954482813cac9644d7dbe99c2f27d1ed9722 SHA1 354f42f93974519391492cda599887dbf89f24ea SHA256 0c42debc80f1cbc254a49f3a737bbadaa8a975d81a850b2448bd1267500ee66e
+AUX inkscape-0.46-bug-174720-1.patch 862 RMD160 c356fe9abfcc79575dcfe58b13240a7ad3939a00 SHA1 b6d3e2f821f0dc877ccb1ff3c5f751406daff767 SHA256 e038344cdb69176eaba5ff5f67e5eea5690608bd69e5b5e4e47b491d55a82394
+AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da11f5291 SHA1 c7e492fcbebc8a417e61eb56f8bc70fe2e78eab5 SHA256 e4d74045d8e30289d6d7095461dbe3df083fd4fbc664f1944763bb6e71170226
 AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
 AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
 EBUILD inkscape-0.46-r2.ebuild 2663 RMD160 98a8e8beb79c00229206c91b577974bef8bc03f4 SHA1 4f4c85fbf5c2783f7cb3a2375966ccd39763a20c SHA256 4fec98bc259390da87633972e0a9e61a5a820f82fb9d9b54f2a81a057f5dc4e2
-EBUILD inkscape-0.46-r3.ebuild 2717 RMD160 192c76c96fc23abbf7c3351d5dfa00865fe15c19 SHA1 29e2da85a080d2de136209d529ef927672777125 SHA256 86dbdbea7ce29fac3abf3f2267ecce6cf098838a41f153022ab76ab81930c60d
-MISC ChangeLog 13164 RMD160 94dbeb6896145b2067df62d3f3b71284b76df53a SHA1 f2576d599b8944c76ddf5420d0b87675980d885f SHA256 7e472d4324d8ed9c865fb7f5eccb798032e7da9475f7587fa26810dd23230a08
-MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
+EBUILD inkscape-0.46-r4.ebuild 2803 RMD160 93c687acf0997b638d2cf42bbb01cf9b4cf0fe60 SHA1 5a40bab829009a221e809b2a3ac5490a7e1904b1 SHA256 4a14e8c41a645d0273e93c0d4795863a64e5bbc558a8a5ea61b4347a074a4e7e
+EBUILD inkscape-0.46-r5.ebuild 2851 RMD160 1cdcdad930e1161a998d16b11d42237169ca120c SHA1 4358a358ca7dd87643c6ebad598670d5faf4516f SHA256 a36a61348e0d0d1509bf6a41756761306af68f38b2cea7120d651534b4473cc1
+MISC ChangeLog 13604 RMD160 12354b9804ab7cb9032cb7ae419adfd258059b01 SHA1 d33dae71b0e6c36e28415d16b67479133a27ce94 SHA256 c968547bc177078634ec99e9cc8d83e6f104626abecf86ad53d8075215ba088f
+MISC metadata.xml 458 RMD160 90cb8f8058926fe666fc2dbec1af647248210f6c SHA1 9af2ef1f67bb9be6e9eecb2dc2f70badeb6277b1 SHA256 52763c744f2f6615fd6f900c3843356432ead07777ebdb548836b1e4fbed20ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkimzo8ACgkQkKaRLQcq0GKGsgCfbSSocRvNUwAno7YB6Y9Vb7PF
+pjUAnR85rDfNsa71MgwWm5YK5nKXHkus
+=jtFB
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch
new file mode 100644
index 000000000000..1a4d780f4787
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch
@@ -0,0 +1,22 @@
+diff -pur inkscape-0.46.orig/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.orig/src/style.cpp	2008-03-11 05:19:45.000000000 +0100
++++ inkscape-0.46/src/style.cpp	2008-03-28 12:35:52.000000000 +0100
+@@ -2125,7 +2125,9 @@ static void
+ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
+ {
+     if ((paint->set && paint->currentcolor) || parent->currentcolor) {
++        bool isset = paint->set;
+         paint->clear();
++        paint->set = isset;
+         paint->currentcolor = TRUE;
+         paint->setColor(style->color.value.color);
+         return;
+@@ -3001,6 +3003,7 @@ sp_style_read_icolor(SPIPaint *paint, gc
+         guint32 const rgb0 = sp_svg_read_color(str, 0xff);
+         if (rgb0 != 0xff) {
+             paint->setColor(rgb0);
++            paint->set = TRUE;
+             paint->inherit = FALSE;
+         }
+     }
+Only in inkscape-0.46/src: style.cpp~
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch
new file mode 100644
index 000000000000..1d6b8e4ed4af
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch
@@ -0,0 +1,21 @@
+diff -pur --exclude='*~' inkscape-0.46.p1/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.p1/src/style.cpp	2008-04-08 09:23:25.000000000 +0200
++++ inkscape-0.46/src/style.cpp	2008-04-08 12:30:35.000000000 +0200
+@@ -3614,7 +3614,7 @@ sp_style_write_ipaint(gchar *b, gint con
+                 css << "currentColor";
+             }
+ 
+-            if ( paint->colorSet ) {
++            if ( paint->colorSet && !paint->currentcolor ) {
+                 if ( !css.str().empty() ) {
+                     css << " ";
+                 }
+@@ -3623,7 +3623,7 @@ sp_style_write_ipaint(gchar *b, gint con
+                 css << color_buf;
+             }
+ 
+-            if (paint->value.color.icc) {
++            if (paint->value.color.icc && !paint->currentcolor) {
+                 if ( !css.str().empty() ) {
+                     css << " ";
+                 }
diff --git a/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch b/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch
new file mode 100644
index 000000000000..2a6bfe7be17b
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch
@@ -0,0 +1,21 @@
+diff -pur --exclude='*~' inkscape-0.46.p2/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.p2/src/style.cpp	2008-04-08 22:46:34.000000000 +0200
++++ inkscape-0.46/src/style.cpp	2008-04-08 23:29:29.000000000 +0200
+@@ -1582,7 +1582,7 @@ sp_style_merge_paint_prop_from_dying_par
+      * I haven't given this much attention.  See comments below about
+      * currentColor, colorProfile, and relative URIs.
+      */
+-    if (!child.set || child.inherit || child.currentcolor) {
++    if (!child.set || child.inherit) {
+         sp_style_merge_ipaint(style, &child, &parent);
+         child.set = parent.set;
+         child.inherit = parent.inherit;
+@@ -2142,6 +2142,8 @@ sp_style_merge_ipaint(SPStyle *style, SP
+         }
+     } else if ( parent->isColor() ) {
+         paint->setColor( parent->value.color );
++    } else if ( parent->isNoneSet() ) {
++        paint->noneSet = TRUE;
+     } else if ( parent->isNone() ) {
+         //
+     } else {
diff --git a/media-gfx/inkscape/inkscape-0.46-r4.ebuild b/media-gfx/inkscape/inkscape-0.46-r4.ebuild
new file mode 100644
index 000000000000..1a2b454171fb
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.46-r4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r4.ebuild,v 1.1 2008/08/16 12:55:29 maekke Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	<app-text/poppler-bindings-0.8.3
+	dev-cpp/glibmm
+	>=dev-cpp/gtkmm-2.10.0
+	>=dev-libs/boehm-gc-6.4
+	dev-libs/boost
+	>=dev-libs/glib-2.6.5
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml
+	dev-python/pyxml
+	media-gfx/imagemagick
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libpng
+	virtual/xft
+	>=x11-libs/gtk+-2.10.7
+	>=x11-libs/pango-1.4.0
+	gnome? (
+		>=gnome-base/gnome-vfs-2.0
+		gnome-base/libgnomeprint
+		gnome-base/libgnomeprintui
+	)
+	lcms? ( >=media-libs/lcms-1.14 )
+	perl? (
+		dev-perl/XML-Parser
+		dev-perl/XML-XQL
+	)
+	spell? ( app-text/gtkspell )"
+
+# 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
+	dia? ( app-office/dia )
+	postscript? ( >=media-gfx/pstoedit-3.44 media-gfx/skencil )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	x11-libs/libX11
+	>=dev-util/intltool-0.29"
+
+pkg_setup() {
+	# bug 207070
+	if use postscript && ! built_with_use media-gfx/pstoedit plotutils ; then
+		eerror "you need to emerge media-gfx/pstoedit with plotutils support."
+		die "remerge media-gfx/pstoedit with USE=\"plotutils\""
+	fi
+	# bug 213026 and bug 213706
+	if ! built_with_use app-text/poppler-bindings cairo ; then
+		eerror "you need to emerge app-text/poppler-bindings with cairo	support."
+		die "remerge app-text/poppler-bindings with USE=\"cairo\""
+	fi
+
+	G2CONF="${G2CONF} --with-xft"
+	G2CONF="${G2CONF} $(use_with spell gtkspell)"
+	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
+	G2CONF="${G2CONF} $(use_enable mmx)"
+	G2CONF="${G2CONF} $(use_with inkjar)"
+	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
+	G2CONF="${G2CONF} $(use_with gnome gnome-print)"
+	G2CONF="${G2CONF} $(use_enable lcms)"
+	G2CONF="${G2CONF} $(use_with perl)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
+	epatch "${FILESDIR}"/${P}-bug-174720-1.patch
+	epatch "${FILESDIR}"/${P}-bug-214171.patch
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/media-gfx/inkscape/inkscape-0.46-r3.ebuild b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
index 336661122a9c..4c954b3720be 100644
--- a/media-gfx/inkscape/inkscape-0.46-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.46-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r3.ebuild,v 1.1 2008/06/04 23:50:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.1 2008/08/16 12:55:29 maekke Exp $
 
 inherit gnome2 eutils
 
@@ -92,6 +92,9 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
+	epatch "${FILESDIR}"/${P}-bug-174720-0.patch
+	epatch "${FILESDIR}"/${P}-bug-174720-1.patch
+	epatch "${FILESDIR}"/${P}-bug-214171.patch
 }
 
 DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index a083c07fab9e..7b667a5c882f 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -2,4 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>
+	<use>
+		<flag name='dia'>
+			pull in <pkg>app-office/dia</pkg> for dia import extension
+		</flag>
+		<flag name='inkjar'>
+			enables support for OpenOffice.org SVG jar files
+		</flag>
+		<flag name='postscript'>
+			pull in dependencies needed for the postscript import extension
+		</flag>
+	</use>
 </pkgmetadata>