new release 'n cleanup

6 files changed, 19 insertions, 33 deletions

diff --git a/media-gfx/sodipodi/ChangeLog b/media-gfx/sodipodi/ChangeLog
index 29b4af35e2c3..c504b427c6f3 100644
--- a/media-gfx/sodipodi/ChangeLog
+++ b/media-gfx/sodipodi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2003/11/13 02:19:23 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/ChangeLog,v 1.18 2003/12/04 15:47:55 foser Exp $
+
+*sodipodi-0.33 (04 Dec 2003)
+
+  04 Dec 2003; foser <foser@gentoo.org> sodipodi-0.33.ebuild :
+  New release, requested in #34879
+  fixed deps, tightened configure switches
 
   12 Nov 2003; Todd Sunderlin <todd@gentoo.org> sodipodi-0.32.ebuild:
   changed to stable on sparc
diff --git a/media-gfx/sodipodi/Manifest b/media-gfx/sodipodi/Manifest
index e41849e75588..65df4eadb74a 100644
--- a/media-gfx/sodipodi/Manifest
+++ b/media-gfx/sodipodi/Manifest
@@ -1,11 +1,8 @@
 MD5 77842e5324d77279b891743dee5c24bc sodipodi-0.32.ebuild 920
 MD5 4308a8209abb3ae0204f22d3ba3dfdb5 sodipodi-0.28.ebuild 1380
-MD5 fcaac435fe9acd8175678363e80fe5bd sodipodi-0.31.1-r1.ebuild 1120
-MD5 77842e5324d77279b891743dee5c24bc sodipodi-0.33.ebuild 920
-MD5 8d9d20df8f8ca2ed0f5d01acca1b4aa8 ChangeLog 2455
+MD5 d353f4394b18992502becf5be2bd392c sodipodi-0.33.ebuild 1069
+MD5 e67ac0be0e3557131c8076aea1d634b0 ChangeLog 2628
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 002b26a1c0e0f79d578954dc0db7ec01 files/sodipodi-0.24.1-compile.patch 401
-MD5 e51ca1b45c22e7a6b1c20b7526bbf6f9 files/digest-sodipodi-0.31.1-r1 68
 MD5 b06ae3761eae4107d65a634b4168a7d4 files/digest-sodipodi-0.28 66
 MD5 7b307f02d45ceeb01f8e010147f73224 files/digest-sodipodi-0.32 66
 MD5 796559c273a15e0a8e7c9c55c22ddcb8 files/digest-sodipodi-0.33 66
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1 b/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1
deleted file mode 100644
index 4dea1fa66dd4..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.31.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217c2939b733f030e28e6cbfd8492c9e sodipodi-0.31.1.tar.gz 1315985
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.33 b/media-gfx/sodipodi/files/digest-sodipodi-0.33
new file mode 100644
index 000000000000..e9cf1c9bde2f
--- /dev/null
+++ b/media-gfx/sodipodi/files/digest-sodipodi-0.33
@@ -0,0 +1 @@
+MD5 997ae5aadb960f59e774a5f4ad42c119 sodipodi-0.33.tar.gz 2197940
diff --git a/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch b/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch
deleted file mode 100644
index 61a801e077b1..000000000000
--- a/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r sodipodi-0.24.1.orig/src/bonobo/Makefile.am sodipodi-0.24.1/src/bonobo/Makefile.am
---- sodipodi-0.24.1.orig/src/bonobo/Makefile.am	Fri Oct  5 02:07:16 2001
-+++ sodipodi-0.24.1/src/bonobo/Makefile.am	Sat Oct  6 14:00:39 2001
-@@ -5,7 +5,8 @@
- 
- INCLUDES = \
- 	-I$(includedir) \
--	-I$(SODIPODI_CFLAGS)
-+	-I$(SODIPODI_CFLAGS)	\
-+	$(SODIPODI_BONOBO_CFLAGS)
- 
- noinst_LIBRARIES = libspbonobo.a
- 
diff --git a/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild b/media-gfx/sodipodi/sodipodi-0.33.ebuild
index c8553881b21e..36e522c9519b 100644
--- a/media-gfx/sodipodi/sodipodi-0.31.1-r1.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.33.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2003/04/25 13:02:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.33.ebuild,v 1.1 2003/12/04 15:47:55 foser Exp $
 
 inherit gnome2
 
@@ -10,32 +10,28 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 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
+	media-libs/fontconfig
 	dev-libs/popt
 	sys-libs/zlib
 	media-libs/libpng
-	gnome? ( =gnome-base/libgnomeprintui-1.116* )"
+	gnome? ( >=gnome-base/libgnomeprint-2.2
+		>=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} `use_enable mmx` `use_with gnome gnome-print`"
 G2CONF="${G2CONF} --with-xft --with-popt"
+# disable experimental features for now
+G2CONF="${G2CONF} --without-mlview --without-kde"
 
 DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README TODO"
-
-SCROLLKEEPER_UPDATE="0"