Version bump. Restrict python extensions to python2 (bug #421111) and respect AR (bug #443694).

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 126 insertions, 1 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index e19daf08656a..3806fa14e2e2 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.188 2012/11/10 02:59:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.189 2012/12/18 08:20:07 radhermit Exp $
+
+*inkscape-0.48.4 (18 Dec 2012)
+
+  18 Dec 2012; Tim Harder <radhermit@gentoo.org> +inkscape-0.48.4.ebuild,
+  +files/inkscape-0.48.4-python2.patch:
+  Version bump. Restrict python extensions to python2 (bug #421111) and respect
+  AR (bug #443694).
 
   10 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> inkscape-0.48.3.1.ebuild:
   Drop usage of boost-utils since it's now pointless.
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch b/media-gfx/inkscape/files/inkscape-0.48.4-python2.patch
new file mode 100644
index 000000000000..a586053e9192
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-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.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
new file mode 100644
index 000000000000..546b3febfdbe
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.4.ebuild
@@ -0,0 +1,107 @@
+# 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.1 2012/12/18 08:20:07 radhermit Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+
+GCONF_DEBUG=no
+
+inherit autotools eutils flag-o-matic gnome2 python toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+
+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="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() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
+		"${FILESDIR}"/${PN}-0.48.2-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)"
+}