Updating media-gfx/inkscape live ebuild.

2 files changed, 44 insertions, 46 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index d3d7887..8c7b397 100755
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1 +1 @@
-EBUILD inkscape-9999.ebuild 2189 RMD160 06e16ea7c649860bff394c63328391d443b06241 SHA1 724bd5f85325aa6e5780fafd7e2ecfc639a30887 SHA256 159a9043a547db16fd4e6780b40edf17e064057f133d2dbd538b5d7914bc0436
+EBUILD inkscape-9999.ebuild 2212 SHA256 a270ab9ff8cc0b1bdff90d2c524a05e7d323f31c534f4a97b3a4b741061a100f SHA512 c617afd459ea260dfddfdc33d9f982dc71dcaf8d53c5fea76ced0d39322d97df7383efbae281d840862d2416dc4ee8fd1bb047e3cd56dd623076b801e6924287 WHIRLPOOL 673dd7dba6ebd0efb937bc9f2ca1755d352c0a5ad93a48d67fa64d2f6f85c3a92bc8c38510aa1d66ba5358d8a3fdd34b2c72326df5472c70ece7682751daba08
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 4003acf..5e7533d 100755
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: $
 
-EAPI=4
-inherit bzr gnome2 eutils autotools flag-o-matic
+EAPI=5
+inherit bzr gnome2 eutils flag-o-matic
 
 SRC_URI=""
-EBZR_REPO_URI="https://code.launchpad.net/inkscape"
-EBZR_PROJECT="${PN}"
+EBZR_REPO_URI="lp:inkscape"
+EBZR_PROJECT="inkscape"
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="dia gnome inkjar lcms mmx nls postscript spell wmf wpg"
+KEYWORDS=""
+IUSE="dia gs gnome inkjar dbus lcms nls poppler postscript python perl wmf wpg"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0
+	>=dev-cpp/glibmm-2.36
+	dev-cpp/gtkmm:2.4
 	>=dev-libs/boehm-gc-6.4
 	>=dev-libs/glib-2.6.5
 	>=dev-libs/libsigc++-2.0.12
@@ -28,22 +28,19 @@ COMMON_DEPEND="
 	>=dev-libs/libxslt-1.0.15
 	dev-libs/popt
 	dev-python/lxml
-	dev-python/pyxml
-	media-gfx/imagemagick
+	|| ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,symlink] )
 	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpng-1.2
+	media-libs/freetype:2
+	>=media-libs/libpng-1.5
+	app-text/libwpd:0.9
+	wpg? ( app-text/libwpg:0.2 )
 	sci-libs/gsl
 	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7
+	x11-libs/gtk+:2
 	>=x11-libs/pango-1.4.0
+	|| ( dev-lang/python[xml] dev-python/pyxml )
 	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 )"
+	lcms? ( media-libs/lcms:0 )"
 
 # These only use executables provided by these packages
 # See share/extensions for more details. inkscape can tell you to
@@ -52,42 +49,43 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/numpy
+	media-gfx/uniconvertor
+	postscript? ( media-gfx/pstoedit )
 	dia? ( app-office/dia )
-	postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
-	wmf? ( media-libs/libwmf )"
-
+	gs? ( app-text/ghostscript-gpl )"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	sys-devel/gettext
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	x11-libs/libX11
 	>=dev-util/intltool-0.29"
 
 src_unpack() {
 	bzr_src_unpack
 }
+src_configure(){
+	sh autogen.sh || die "autogen"
+	econf \
+	$(use_with perl)\
+	$(use_with python)\
+	$(use_enable poppler poppler-cairo)\
+	$(use_with gnome gnome-vfs)\
+	$(use_with inkjar)\
+	$(use_enable wpg)\
+	$(use_enable dbus dbusapi)\
+	$(use_enable lcms)\
+	$(use_enable nls)\
 
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
 	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	eautoreconf
-	sh autogen.sh || die
-}
 
-src_configure() {
-        # aliasing unsafe wrt #310393
-        append-flags -fno-strict-aliasing
-        gnome2_src_configure
+	#./configure
+	# aliasing unsafe wrt #310393
+	#append-flags -fno-strict-aliasing
+	#gnome2_src_configure
 }
 
+pkg_postinst() {
+	elog "local configurations (also includes extensions) are moved from"
+	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
+	elog ">=media-gfx/inkscape-0.48"
+}
\ No newline at end of file