From a6001fed89675bc37dfce86a737ee1c737ba6518 Mon Sep 17 00:00:00 2001
From: Marinus Schraal <foser@gentoo.org>
Date: Tue, 22 Oct 2002 11:42:10 +0000
Subject: [PATCH] New version, fixes bonobo build problems

---
 media-gfx/sodipodi/ChangeLog                  |  7 +++++-
 media-gfx/sodipodi/files/digest-sodipodi-0.25 |  1 -
 media-gfx/sodipodi/files/digest-sodipodi-0.27 |  1 +
 ...ipodi-0.25.ebuild => sodipodi-0.27.ebuild} | 24 +++++++------------
 4 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 media-gfx/sodipodi/files/digest-sodipodi-0.25
 create mode 100644 media-gfx/sodipodi/files/digest-sodipodi-0.27
 rename media-gfx/sodipodi/{sodipodi-0.25.ebuild => sodipodi-0.27.ebuild} (68%)

diff --git a/media-gfx/sodipodi/ChangeLog b/media-gfx/sodipodi/ChangeLog
index 1da7393f5529..5fe1fbc58e26 100644
--- a/media-gfx/sodipodi/ChangeLog
+++ b/media-gfx/sodipodi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/sodipodi
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.2 2002/10/19 00:10:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.3 2002/10/22 11:42:10 foser Exp $
+
+*sodipodi-0.27 (22 Oct 2002)
+
+  22 Oct 2002; foser <foser@gentoo.org> sodipodi-0.27.ebuild :
+  New version. Fixes bonobo breakage.
 
 *sodipodi-0.25 (19 Oct 2002)
 
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.25 b/media-gfx/sodipodi/files/digest-sodipodi-0.25
deleted file mode 100644
index 4e33bd966ae7..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9abf6f193933f73a227e105ffaf545d2 sodipodi-0.25.tar.gz 1260296
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.27 b/media-gfx/sodipodi/files/digest-sodipodi-0.27
new file mode 100644
index 000000000000..e87413d45dfb
--- /dev/null
+++ b/media-gfx/sodipodi/files/digest-sodipodi-0.27
@@ -0,0 +1 @@
+MD5 8ed34ae02211352052fba45270e8d203 sodipodi-0.27.tar.gz 1324473
diff --git a/media-gfx/sodipodi/sodipodi-0.25.ebuild b/media-gfx/sodipodi/sodipodi-0.27.ebuild
similarity index 68%
rename from media-gfx/sodipodi/sodipodi-0.25.ebuild
rename to media-gfx/sodipodi/sodipodi-0.27.ebuild
index 1025ad2064cf..d8d24a83a871 100644
--- a/media-gfx/sodipodi/sodipodi-0.25.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.27.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.25.ebuild,v 1.1 2002/10/19 00:10:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.27.ebuild,v 1.1 2002/10/22 11:42:10 foser Exp $
 
-IUSE="xml nls bonobo"
+IUSE="xml2 nls bonobo"
 
 S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
+DESCRIPTION="Vector illustration application for GNOME"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
 
@@ -13,30 +13,22 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+# add wmf USE when in use.desc
 RDEPEND=">=gnome-base/gnome-print-0.35
 	>=gnome-extra/gal-0.13
 	media-libs/gdk-pixbuf
 	bonobo? ( gnome-base/bonobo )
-	xml? ( dev-libs/libxml2 )"
+	xml2? ( dev-libs/libxml2 )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	
-	patch -d ${S}/src/bonobo -p0 < ${FILESDIR}/bonobo-makefile-fix.patch
-}
-
 src_compile() {
 	local myconf
 
-	# Bonobo seems really brokenF
-	myconf="${myconf} --without-bonobo"
-
-#	use bonobo \
-#		&& myconf="${myconf} --with-bonobo" \
-#		|| myconf="${myconf} --without-bonobo"
+	use bonobo \
+		&& myconf="${myconf} --with-bonobo" \
+		|| myconf="${myconf} --without-bonobo"
 
 	use xml2 \
 		&& myconf="${myconf} --with-gnome-xml2" \
-- 
2.26.2