a few fixes

7 files changed, 51 insertions, 93 deletions

diff --git a/media-gfx/sodipodi/ChangeLog b/media-gfx/sodipodi/ChangeLog
index c05d63864f22..7b9550456f5d 100644
--- a/media-gfx/sodipodi/ChangeLog
+++ b/media-gfx/sodipodi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sodipodi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.10 2003/03/28 07:42:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.11 2003/03/30 20:52:18 foser Exp $
+
+*sodipodi-0.31.1-r1 (30 Mar 2003)
+
+  30 Mar 2003; foser <foser@gentoo.org> sodipodi-0.31.1-r1.ebuild :
+  Dep fixes
+  Use flag fixes
+  Adapted to gnome2 eclass
 
 *sodipodi-0.31.1 (28 Mar 2003)
 
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.24.1-r4 b/media-gfx/sodipodi/files/digest-sodipodi-0.24.1-r4
deleted file mode 100644
index 267e45fbe98e..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.24.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bb1c07993e6cee32ae2b2d8c39b9b40 sodipodi-0.24.1.tar.gz 1285296
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.31 b/media-gfx/sodipodi/files/digest-sodipodi-0.31
deleted file mode 100644
index cfd357850306..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae09a532da09b472a6b088055c248dff sodipodi-0.31.tar.gz 1315798
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1 b/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1
new file mode 100644
index 000000000000..4dea1fa66dd4
--- /dev/null
+++ b/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1
@@ -0,0 +1 @@
+MD5 217c2939b733f030e28e6cbfd8492c9e sodipodi-0.31.1.tar.gz 1315985
diff --git a/media-gfx/sodipodi/sodipodi-0.24.1-r4.ebuild b/media-gfx/sodipodi/sodipodi-0.24.1-r4.ebuild
deleted file mode 100644
index 1e44ff9ec9bb..000000000000
--- a/media-gfx/sodipodi/sodipodi-0.24.1-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.1-r4.ebuild,v 1.7 2003/02/13 12:38:24 vapier Exp $
-
-IUSE="nls bonobo"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-RDEPEND=">=gnome-base/gnome-print-0.30
-	>=gnome-extra/gal-0.13-r1
-	media-libs/gdk-pixbuf
-	bonobo? ( >=gnome-base/bonobo-1.0.9 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-compile.patch
-	automake
-}
-
-src_compile() {
-	local myconf
-
-	# Bonobo support doesn't seem to work.
-	use bonobo \
-		&& myconf="${myconf} --with-bonobo" \
-		|| myconf="${myconf} --without-bonobo"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
-
-	econf \
-		--enable-gnome \
-		--enable-gnome-print \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
diff --git a/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild b/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild
new file mode 100644
index 000000000000..0749dd65575d
--- /dev/null
+++ b/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild,v 1.1 2003/03/30 20:52:18 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="Sodipodi is a vector-based drawing program for GNOME."
+HOMEPAGE="http://sodipodi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+IUSE="gnome mmx"
+
+RDEPEND=">=x11-libs/gtk+-2.2.1
+	>=media-libs/libart_lgpl-2.3.10
+	>=dev-libs/libxml2-2.4.24
+	virtual/xft
+	dev-libs/popt
+	sys-libs/zlib
+	media-libs/libpng
+	gnome? ( =gnome-base/libgnomeprintui-2.2* )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.22"
+
+use mmx \
+	&& G2CONF="--enable-mmx ${G2CONF}" \
+	|| G2CONF="--disable-mmx ${G2CONF}"
+use gnome \
+	&& G2CONF="--with-gnome-print ${G2CONF}" \
+	|| G2CONF="--without-gnome-print ${G2CONF}"
+
+# FIXME : xft doesnt actually seem to work 
+G2CONF="${G2CONF} --with-xft --with-popt"
+
+DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
+
+SCROLLKEEPER_UPDATE="0"
diff --git a/media-gfx/sodipodi/sodipodi-0.31.ebuild b/media-gfx/sodipodi/sodipodi-0.31.ebuild
deleted file mode 100644
index ef9fb6e60637..000000000000
--- a/media-gfx/sodipodi/sodipodi-0.31.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.31.ebuild,v 1.1 2003/03/07 16:31:06 lordvan Exp $
-
-DESCRIPTION="Sodipodi is a vector-based drawing program for GNOME."
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=x11-libs/gtk+-2.2.1
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/libxml2-2.5.1
-	>=x11-libs/xft-2.0.1
-	>=gnome-base/libgnomeprint-2.2.1.1
-	>=gnome-base/libgnomeprintui-2.2.1.1
-	>=dev-libs/popt-1.7"
-
-src_compile() {
-	use nls || myconf="--disable-nls ${myconf}"
-	# breaks with gnome-print
-	myconf="${myconf} --with-popt --with-xft --without-gnome-print"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog HACKING NEWS README TODO
-}