New snapshot

svn path=/trunk/overlay/; revision=70

4 files changed, 144 insertions, 1 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index bed8e5d..acdd174 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,6 @@
 AUX inkscape-0.41_gnome-print.patch 404 RMD160 a5132cb26d889c82bbf42e715ede39c66650e710 SHA1 0b06333a46041039be43c8aa26777731304b9d1e SHA256 89f5bd446a96c9a4b4865a01cd6d87bbb1cf8078705d0d01c75180f2caf2e048
 AUX inkscape-0.44-gcc41.patch 803 RMD160 0394eeadb24671d603dec17b3388021d98a0539e SHA1 42586de7cc9799af926469c63a1be8807d1d0157 SHA256 4a7c68f7db7590c14cf4ee2d801bed01df5b987c414af481053fc3a3a6438354
+AUX inkscape-0.47-escapeDevName.patch 1075 RMD160 bb01d422f1eb4ea7420681b4b25bb98fe27512bf SHA1 99783aa78e8564a300fa39663bd0580201fa912d SHA256 89e71ba4573b896389f567a2321b48b3e16a4eec3233a527bdf94806762fc40f
 AUX inkscape-0.47-type-punning.patch 440 RMD160 2eb47c48ec5017dc8e22582a06e817a8dce19aa5 SHA1 f78b90d499c72c0e98229d0de41018e50309582f SHA256 e3cbd6bd071f7525b55f6b0bdb72137d4ffa02eed6c490ad67943db564171636
 AUX inkscape-20050326.psfix.patch 41224 RMD160 cc9a44c3cabda30ca31dccf5cb42b4c2087ffc9b SHA1 4bd3aa96f8b886b25b92bb914fd11289cf03ac37 SHA256 defff82478298e7e260fd92f6829034d775aaf1201d6e28f3145b5c703c87bab
 AUX inkscape-epsout.patch 1449 RMD160 ee467b8646301698a5b8ae60cb2d544e337bf681 SHA1 4ce73e237263c159524bd758b94c8fa0a70e576f SHA256 a291a979318cc3925bb208ba9aa8c823b058c8e3071eeaba85b8d1fb2fc486a6
@@ -7,5 +8,6 @@ AUX inkscape-landscape.patch 592 RMD160 00fdf7f577d9085d6056742009fcfd40f548f2e1
 EBUILD inkscape-0.46_pre15990.ebuild 2421 RMD160 1555270e78a0f24c9285ec76fc985c75aa7b1382 SHA1 92a42ed740c92d78c70511b11cd7b99b1d4265fa SHA256 c5568cd27f0a9f0ee8816f64ddfe2efd0b6f42bd9f82d3ae2c29e9e85d508f54
 EBUILD inkscape-0.46_pre16516.ebuild 2421 RMD160 1555270e78a0f24c9285ec76fc985c75aa7b1382 SHA1 92a42ed740c92d78c70511b11cd7b99b1d4265fa SHA256 c5568cd27f0a9f0ee8816f64ddfe2efd0b6f42bd9f82d3ae2c29e9e85d508f54
 EBUILD inkscape-0.46_pre17441.ebuild 2421 RMD160 1555270e78a0f24c9285ec76fc985c75aa7b1382 SHA1 92a42ed740c92d78c70511b11cd7b99b1d4265fa SHA256 c5568cd27f0a9f0ee8816f64ddfe2efd0b6f42bd9f82d3ae2c29e9e85d508f54
-EBUILD inkscape-0.47_pre20335.ebuild 3081 RMD160 bba708acfaf0df8d956dc6372fd8b05bb0532ea5 SHA1 6546ca5a2d26f84a6119922b64c9ed13553f60b1 SHA256 c5b096c1ebeca5bb1264be7d03220b84e43e449a4c2f3aa3972b7acc9109b121
+EBUILD inkscape-0.47_pre20335.ebuild 3127 RMD160 f2078f72f8c3a790f7157c2ef1644e19514abf0b SHA1 498dfd4a5a06e34cfd53acb48b4f3caeb6ba80a7 SHA256 9ceab470afcadc24a2f703637f871e7360d9fe37cfd87a16eccd7dcecc83067a
+EBUILD inkscape-0.47_pre20395.ebuild 3127 RMD160 f2078f72f8c3a790f7157c2ef1644e19514abf0b SHA1 498dfd4a5a06e34cfd53acb48b4f3caeb6ba80a7 SHA256 9ceab470afcadc24a2f703637f871e7360d9fe37cfd87a16eccd7dcecc83067a
 MISC NOTES 56 RMD160 d48096e40f8f09e4901631591be3ba9efdefb62b SHA1 f1764ab40c496936f46f560625046181eb64fef1 SHA256 c630b8873c8eafc186770124e61c71f71428440c6a2e95dc86c158fd4a49d778
diff --git a/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch b/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
new file mode 100644
index 0000000..54088e2
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
@@ -0,0 +1,26 @@
+--- inkscape/src/dialogs/input.cpp	(revision 20335)
++++ inkscape/src/dialogs/input.cpp	(working copy)
+@@ -67,6 +67,14 @@
+     "ignore", "x", "y", "pressure", "xtilt", "ytilt", "wheel"
+ };
+ 
++Glib::ustring stripPeriod(const Glib::ustring &input) {
++    Glib::ustring result = input;
++    for(Glib::ustring::size_type pos=result.find('.'); pos!=Glib::ustring::npos; pos=result.find('.',pos)){
++       result.erase(pos,1);
++    }
++    return result;
++}
++
+ void
+ sp_input_load_from_preferences (void)
+ {
+@@ -75,7 +83,7 @@
+     for (GList *list_ptr = gdk_devices_list(); list_ptr != NULL; list_ptr = list_ptr->next) {
+         GdkDevice *device = static_cast<GdkDevice *>(list_ptr->data);
+         //repr = sp_repr_lookup_child(devices, "id", device->name);
+-        Glib::ustring device_path = Glib::ustring("/devices/") + device->name;
++        Glib::ustring device_path = Glib::ustring("/devices/") + stripPeriod(device->name);
+         if (/*repr != NULL*/ 1) {
+             GdkInputMode mode;
+             Glib::ustring device_mode = prefs->getString(device_path + "/mode");
diff --git a/media-gfx/inkscape/inkscape-0.47_pre20335.ebuild b/media-gfx/inkscape/inkscape-0.47_pre20335.ebuild
index 576bae6..0fcab13 100644
--- a/media-gfx/inkscape/inkscape-0.47_pre20335.ebuild
+++ b/media-gfx/inkscape/inkscape-0.47_pre20335.ebuild
@@ -101,6 +101,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch ${FILESDIR}/${MP}-type-punning.patch
+	epatch ${FILESDIR}/${MP}-escapeDevName.patch
 
 	sh autogen.sh || die "Failed to create configure"
 	elibtoolize ${ELTCONF}
diff --git a/media-gfx/inkscape/inkscape-0.47_pre20395.ebuild b/media-gfx/inkscape/inkscape-0.47_pre20395.ebuild
new file mode 100644
index 0000000..0fcab13
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.47_pre20395.ebuild
@@ -0,0 +1,114 @@
+# 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-r5.ebuild,v 1.8 2008/11/24 21:11:03 ranger Exp $
+
+inherit gnome2 eutils subversion
+
+PREVER="${PV/*_pre/}"
+PREVER="${PREVER/*_p/}"
+MV="${PV/_p*/}"
+MP="$PN-$MV"
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI=""
+ESVN_REPO_URI="https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk"
+ESVN_REVISION="${PREVER}"
+S=${WORKDIR}/${MP}
+
+EAPI="2"
+
+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 openmp"
+RESTRICT="nomirror test"
+
+COMMON_DEPEND="
+	openmp? ( >=sys-devel/gcc-4.2[openmp] )
+	>=app-text/poppler-bindings-0.8.3[cairo]
+	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
+	sci-libs/gsl
+	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 )
+	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[plotutils] 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_enable lcms)"
+	G2CONF="${G2CONF} $(use_with perl)"
+	G2CONF="${G2CONF} $(use_with openmp)"
+}
+
+src_unpack() {
+	subversion_src_unpack
+#	gnome2_src_unpack
+	gnome2_omf_fix
+
+	cd "${S}"
+	epatch ${FILESDIR}/${MP}-type-punning.patch
+	epatch ${FILESDIR}/${MP}-escapeDevName.patch
+
+	sh autogen.sh || die "Failed to create configure"
+	elibtoolize ${ELTCONF}
+}
+
+src_compile() {
+	default_src_compile
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"