Add inkscape revision snapshot

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

10 files changed, 232 insertions, 209 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 56cdca7..566a7dc 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,6 @@
-AUX inkscape-0.47-escapeDevName.patch 1075 RMD160 bb01d422f1eb4ea7420681b4b25bb98fe27512bf SHA1 99783aa78e8564a300fa39663bd0580201fa912d SHA256 89e71ba4573b896389f567a2321b48b3e16a4eec3233a527bdf94806762fc40f
-AUX inkscape-0.47-export-dpi.patch 1921 RMD160 4d650ebc3518cddac3815c586a1fbd3fb20d64bf SHA1 7b3547966f6741ba1e170eef703e29fc71d9ba98 SHA256 31ef78f2a6d49a123bd12fdca85f90d68c800e942532609579eecdf3bd197e0c
-AUX inkscape-0.47-type-punning.patch 440 RMD160 2eb47c48ec5017dc8e22582a06e817a8dce19aa5 SHA1 f78b90d499c72c0e98229d0de41018e50309582f SHA256 e3cbd6bd071f7525b55f6b0bdb72137d4ffa02eed6c490ad67943db564171636
-EBUILD inkscape-0.47_alpha21976.ebuild 2996 RMD160 b5c03c24d1c8aecaaabdb6f71e88cfea5be271ae SHA1 b9b58b842645fe2bf518a285f8fabc70ccba0102 SHA256 51a70ffc56bdfdb79fc3c4d0e6a5672594a80c82d9943c23c4844ec22bfe5c56
-MISC NOTES 56 RMD160 d48096e40f8f09e4901631591be3ba9efdefb62b SHA1 f1764ab40c496936f46f560625046181eb64fef1 SHA256 c630b8873c8eafc186770124e61c71f71428440c6a2e95dc86c158fd4a49d778
+AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a
+AUX inkscape-0.49.0-libwpg.patch 1008 SHA256 d6af5c82036df4617ecd9112c15ff77682e73859e71560d24cca3a4dbcea1a7c SHA512 8f1ab8d37016e0381faba11e5242e8f645293fdc88a9d6d72200f6075960737fba263295c216aca398f556b03f4275ebd56947346d4f90c8167031186dcce3c2 WHIRLPOOL 667958639cbe4e0636e0575c6ff88f1102b67a2d936023a607a525581a7390d04d3fc09f8785c6ac295aa8c02588e41fca2fe8cf0616cc0636558319b00c4111
+AUX inkscape-0.49.0-spell.patch 2370 SHA256 892ad287cf6a7def5440cf69b4dcb671e43b9868b6e0aa82a72a283a57526ded SHA512 6cc46c0780e4978494c6b756b8767730bd59e3f793175ce1447e85b989d2d27637f3a72cbd4065a5f089fdae3b347aea8187581dc1ba3c72332756b70992137a WHIRLPOOL f526088ed59ca646a78c8cfa7ca48345ed0e3af914267d5686686dacb5c74741b5ac5be77e2ad4caa855c1beeb3e97010d4a29d5641fb5c468994e4bf1cec381
+AUX inkscape-0.49_alpha12387-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
+EBUILD inkscape-0.49_alpha12387.ebuild 2840 SHA256 5428f65b44947493f2b78d4f1f496ae9fa0a860710039e1dde68d3498fe2ec12 SHA512 ddf7debda1957caaec22fb9c32ecae4d563b7c39450a20b7362279ec92f84de3ed7e54ac07d83d48cb42e077ed1819aacf1e094063b9764a06d81f9009bfac86 WHIRLPOOL 05e73c028ca8a62558cec359644b09e3fb3b83a25b430e2859968a0de7a1b0d6eef5fef54bab64587ef0a7df4684b4b121fa2a2d664de691b4ad17cf2c5172c6
+MISC NOTES 56 SHA256 c630b8873c8eafc186770124e61c71f71428440c6a2e95dc86c158fd4a49d778 SHA512 1884da6de155458667b3ca8b22d35f1e7229dd5a3bc8d7063c1d630813ea1b6fc60ebef25bdab882647b7f57548b34abee297990c7115340a1acc471f122239f WHIRLPOOL de9feae1ac0e9b6c5eff7c5626df799ab63b2928cf397c48e272fe5e0896bbf5b3c19a932efbcb84baff8f9a2980b2c7638add94f50d94e546461b2e4fd86519
diff --git a/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch b/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
deleted file mode 100644
index 54088e2..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-escapeDevName.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/files/inkscape-0.47-export-dpi.patch b/media-gfx/inkscape/files/inkscape-0.47-export-dpi.patch
deleted file mode 100644
index 8997261..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-export-dpi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: src/extension/internal/cairo-renderer-pdf-out.cpp
-===================================================================
---- src/extension/internal/cairo-renderer-pdf-out.cpp	(revision 20479)
-+++ src/extension/internal/cairo-renderer-pdf-out.cpp	(working copy)
-@@ -153,7 +153,7 @@
-         g_warning("Parameter <blurToBitmap> might not exist");
-     }
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     }
-Index: src/extension/internal/cairo-ps-out.cpp
-===================================================================
---- src/extension/internal/cairo-ps-out.cpp	(revision 20479)
-+++ src/extension/internal/cairo-ps-out.cpp	(working copy)
-@@ -151,7 +151,7 @@
-         new_blurToBitmap  = mod->get_param_bool("blurToBitmap");
-     } catch(...) {}
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     } catch(...) {}
-@@ -215,7 +215,7 @@
-         new_blurToBitmap  = mod->get_param_bool("blurToBitmap");
-     } catch(...) {}
- 
--    int new_bitmapResolution  = 72;
-+    int new_bitmapResolution  = 150;
-     try {
-         new_bitmapResolution = mod->get_param_int("resolution");
-     } catch(...) {}
-Index: src/main.cpp
-===================================================================
---- src/main.cpp	(revision 20479)
-+++ src/main.cpp	(working copy)
-@@ -1398,6 +1398,16 @@
-         (*i)->set_param_bool("blurToBitmap", TRUE);
-     }
- 
-+    if (sp_export_dpi) {
-+        int dpi = atoi(sp_export_dpi);
-+        if ((dpi < 1) || (dpi > 10000)) {
-+            g_warning("DPI value %s out of range [1 - 10000]. Nothing exported.", sp_export_dpi);
-+            return;
-+        }
-+        g_print("DPI: %d\n", dpi);
-+        (*i)->set_param_int("resolution", dpi);
-+    }
-+
-     (*i)->save(doc, uri);
- }
- 
diff --git a/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch b/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch
deleted file mode 100644
index bbd8f68..0000000
--- a/media-gfx/inkscape/files/inkscape-0.47-type-punning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- inkscape/src/util/glib-list-iterators.h	(revision 20335)
-+++ inkscape/src/util/glib-list-iterators.h	(working copy)
-@@ -44,7 +44,8 @@
-     GSList const *list() const { return _list; }
-     
-     reference operator*() const {
--        return *reinterpret_cast<pointer>(&_list->data);
-+        void * const& x(_list->data);
-+        return reinterpret_cast<reference>(x);
-     }
- 
-     bool operator==(GSListConstIterator const &other) {
diff --git a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
new file mode 100644
index 0000000..ea5f214
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.48.3.1/inkscape.desktop.in
++++ inkscape-0.48.3.1/inkscape.desktop.in
+@@ -5,7 +5,7 @@
+ _X-GNOME-FullName=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ Type=Application
+-Categories=Graphics;VectorGraphics;GTK;
++Categories=Graphics;2DGraphics;VectorGraphics;GTK;
+ MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
+ Exec=inkscape %F
+ TryExec=inkscape
diff --git a/media-gfx/inkscape/files/inkscape-0.49.0-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.49.0-libwpg.patch
new file mode 100644
index 0000000..124ac39
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49.0-libwpg.patch
@@ -0,0 +1,23 @@
+--- inkscape-0.49_alpha12387/configure.ac.orig	2013-06-25 14:12:04.000000000 +0100
++++ inkscape-0.49_alpha12387/configure.ac	2013-06-25 14:12:58.000000000 +0100
+@@ -498,13 +498,13 @@
+ with_libwpg=no
+ 
+ if test "x$enable_wpg" = "xyes"; then
+-	PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
+-	if test "x$with_libwpg01" = "xyes"; then
+-		AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
+-		with_libwpg=yes
+-		AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
+-		AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
+-	fi
++#	PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
++#	if test "x$with_libwpg01" = "xyes"; then
++#		AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
++#		with_libwpg=yes
++#		AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
++#		AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
++#	fi
+ 
+ 	PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
+ 	if test "x$with_libwpg02" = "xyes"; then
diff --git a/media-gfx/inkscape/files/inkscape-0.49.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.49.0-spell.patch
new file mode 100644
index 0000000..882ddfd
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49.0-spell.patch
@@ -0,0 +1,64 @@
+--- inkscape-0.48.0/configure.ac.orig	2010-10-26 21:22:06.000000000 +0200
++++ inkscape-0.48.0/configure.ac	2010-10-26 21:33:39.000000000 +0200
+@@ -645,13 +645,18 @@
+ 	AS_HELP_STRING([--enable-gtk3-experimental], [enable compilation with GTK+3 (EXPERIMENTAL!)]),
+ 	[enable_gtk3=$enableval], [enable_gtk3=no])
+ 
++AC_ARG_WITH([gtkspell],
++	AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
++
+ with_gtkmm_3_0="no"
+ if test "x$enable_gtk3" = "xyes"; then
+-
++	
+ 	ink_spell_pkg=
+-	if pkg-config --exists gtkspell-3.0; then
+-		ink_spell_pkg=gtkspell-3.0
+-		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++	if test "x$with_gtkspell" = "xyes"; then
++		if pkg-config --exists gtkspell-3.0; then
++			ink_spell_pkg=gtkspell-3.0
++			AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++		fi
+ 	fi
+ 
+ 	PKG_CHECK_MODULES(GTK,
+@@ -703,9 +708,11 @@
+ else
+ 
+ 	ink_spell_pkg=
+-	if pkg-config --exists gtkspell-2.0; then
+-		ink_spell_pkg=gtkspell-2.0
+-		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++	if test "x$with_gtkspell" = "xyes"; then
++		if pkg-config --exists gtkspell-2.0; then
++			ink_spell_pkg=gtkspell-2.0
++			AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++		fi
+ 	fi
+ 
+ 	PKG_CHECK_MODULES(GTK,
+@@ -838,12 +843,17 @@
+ dnl **************************
+ dnl Check for aspell 
+ dnl ******************************
+-AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
+-if test "x$aspell_ok" = "xyes"; then
+-	AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
+-  INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
+-else
+-	AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
++AC_ARG_WITH([aspell],
++	AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes])
++
++if test "x$with_aspell" = "xyes"; then
++	AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
++	if test "x$aspell_ok" = "xyes"; then
++		AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
++		INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
++	else
++		AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
++	fi
+ fi
+ 
+ dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
diff --git a/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch b/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch
new file mode 100644
index 0000000..a586053
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.49_alpha12387-python2.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.48.4/src/extension/implementation/script.cpp
++++ inkscape-0.48.4/src/extension/implementation/script.cpp
+@@ -89,7 +89,7 @@
+ #ifdef WIN32
+         {"python", "python-interpreter", "pythonw" },
+ #else
+-        {"python", "python-interpreter", "python" },
++        {"python", "python-interpreter", "python2" },
+ #endif
+         {"ruby",   "ruby-interpreter",   "ruby"   },
+         {"shell",  "shell-interpreter",  "sh"     },
diff --git a/media-gfx/inkscape/inkscape-0.47_alpha21976.ebuild b/media-gfx/inkscape/inkscape-0.47_alpha21976.ebuild
deleted file mode 100644
index 63db8bf..0000000
--- a/media-gfx/inkscape/inkscape-0.47_alpha21976.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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 $
-
-EAPI=2
-inherit gnome2 eutils subversion
-
-PREVER="${PV/*_alpha/}"
-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 ppc64 x86"
-IUSE="dia gnome inkjar jabber lcms mmx nls postscript spell wmf wpg openmp"
-RESTRICT="nomirror test"
-
-COMMON_DEPEND="
-	openmp? ( >=sys-devel/gcc-4.2[openmp] )
-	>=virtual/poppler-glib-0.8.3[cairo]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0
-	>=dev-libs/boehm-gc-6.4
-	>=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-1.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=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 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell
-	)
-	wpg? ( >=media-libs/libwpg-0.1 )"
-
-# 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}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with spell gtkspell)"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_with openmp)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_unpack() {
-	subversion_src_unpack
-#	gnome2_src_unpack
-	gnome2_omf_fix
-
-	cd "${S}"
-	epatch ${FILESDIR}/${MP}-type-punning.patch
-	epatch ${FILESDIR}/${MP}-export-dpi.patch
-
-	sed -i -e "s,\(AC_INIT.*[0-9.]\++devel\),\1-r${PREVER}," configure.ac
-
-	sh autogen.sh || die "Failed to create configure"
-	elibtoolize ${ELTCONF}
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}
diff --git a/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild b/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild
new file mode 100644
index 0000000..c2cd5ab
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.49_alpha12387.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.7 2012/12/27 17:24:48 ago Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+
+GCONF_DEBUG=no
+
+inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs bzr
+
+PREVER="${PV/*_alpha/}"
+PREVER="${PREVER/*_pre/}"
+PREVER="${PREVER/*_p/}"
+#MY_V="${PV/_p*/}"
+#MY_P="$PN-$MY_V"
+
+S="${WORKDIR}/${P}"
+
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI=""
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+EBZR_REPO_URI="https://code.launchpad.net/~inkscape.dev/inkscape/trunk"
+EBZR_BRANCH="lp:inkscape"
+EBZR_REVISION="${PREVER}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
+
+RESTRICT="nomirror test"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
+	dev-cpp/glibmm
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-libs/boehm-gc-6.4
+	>=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
+	media-gfx/imagemagick[cxx]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/libpng-1.2
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	sci-libs/gsl
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.4.0
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)"
+
+# 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
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog NEWS README*"
+
+src_prepare() {
+	sed -i -e "s,\(AC_INIT.*[0-9.]\++devel\),\1-r${PREVER}," configure.ac
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PN}-0.49.0-spell.patch \
+		"${FILESDIR}"/${PN}-0.49.0-libwpg.patch \
+		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
+		"${FILESDIR}"/${P}-python2.patch
+	eautoreconf
+
+	# bug 421111
+	python_convert_shebangs -r 2 share/extensions
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--without-perl
+		--enable-poppler-cairo
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_enable lcms)
+		$(use_enable nls)
+		$(use_with spell aspell)
+		$(use_with spell gtkspell)"
+
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}