gcc33 fixes and misc. , mark 0.91 x86 and cleanup old versions

8 files changed, 36 insertions, 122 deletions

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 83ac365868b8..0446c628a92c 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,10 +1,6 @@
-MD5 425afbd8a6e2f57de0db9fee05a61d35 dia-0.88.1-r1.ebuild 1108
-MD5 396ab6879579cb23058d5041459de35d dia-0.90-r2.ebuild 1409
-MD5 730202da475cb923908c98ae83584af9 dia-0.91.ebuild 1665
-MD5 07c67259aafcf9af40e007a42622153f ChangeLog 2467
+MD5 09af8ed573bad0e21c092943af508bbe dia-0.91.ebuild 1486
+MD5 ba0b94c41c6dd72d0a95ff96ea1f0a41 ChangeLog 2629
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 266855bdb86ff533dc0790aa8180c5f7 files/dia-0.91-gcc33_fix.patch 589
 MD5 6b65e31bb3d998a18e0161e06060fd58 files/digest-dia-0.91 62
-MD5 e923403257551985b0e465ae9d123dbb files/digest-dia-0.90-r2 61
 MD5 2dc18dc468903c86599f681f73802f3e files/dia-0.91-Cisco-Makefile.in 17188
-MD5 1ae42abab37b7fb025361b0bf9e74cf5 files/digest-dia-0.88.1-r1 63
diff --git a/app-office/dia/dia-0.88.1-r1.ebuild b/app-office/dia/dia-0.88.1-r1.ebuild
deleted file mode 100644
index 0183e8831964..000000000000
--- a/app-office/dia/dia-0.88.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.88.1-r1.ebuild,v 1.13 2003/09/08 11:27:52 msterret Exp $
-
-DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
-IUSE="nls cups gnome bonobo"
-
-RDEPEND=">=dev-libs/libxml-1.8.15
-	>=media-libs/gdk-pixbuf-0.16.0-r4
-	>=dev-libs/popt-1.5
-	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-#	python? ( dev-lang/python-2.0 )"
-
-src_compile() {
-	local myconf
-	use gnome && myconf="--enable-gnome"
-	use bonobo && myconf="--enable-gnome --enable-bonobo"
-#	use python && myconf="${myconf} --with-python"
-	use nls || myconf="${myconf} --disable-nls"
-	use cups || myconf="${myconf} --disable-gnome-print"
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-}
diff --git a/app-office/dia/dia-0.90-r2.ebuild b/app-office/dia/dia-0.90-r2.ebuild
deleted file mode 100644
index 313e55e78b70..000000000000
--- a/app-office/dia/dia-0.90-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.90-r2.ebuild,v 1.8 2003/09/06 22:21:01 msterret Exp $
-
-DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="nls gnome bonobo truetype png"
-
-RDEPEND=">=dev-libs/libxml-1.8.14
-	>=media-libs/gdk-pixbuf-0.7
-	dev-libs/popt
-	dev-libs/libunicode
-	bonobo? ( gnome-base/bonobo )
-	truetype? ( >=media-libs/freetype-2.0.5 )
-	png? ( media-libs/libpng
-		>=gnome-base/gnome-libs-1.4 )"
-# Python module needs some work
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-#	python? ( dev-lang/python-2.0 )"
-
-src_compile() {
-	local myconf
-
-	use gnome && myconf="--enable-gnome" \
-		|| myconf="--disable-gnome"
-
-	use bonobo && myconf="${myconf} --enable-bonobo" \
-		|| myconf="${myconf} --disable-bonobo"
-
-#	use python && myconf="${myconf} --with-python"
-
-	use truetype && myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --enable-freetype"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	# enable-gnome-print not recoomended
-
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-}
diff --git a/app-office/dia/dia-0.91.ebuild b/app-office/dia/dia-0.91.ebuild
index e56d2c6182f9..b3900a0febbb 100644
--- a/app-office/dia/dia-0.91.ebuild
+++ b/app-office/dia/dia-0.91.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.91.ebuild,v 1.8 2003/09/08 11:27:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.91.ebuild,v 1.9 2003/09/21 16:49:34 foser Exp $
+
+inherit gnome2
 
 DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
 
 SLOT="0"
@@ -12,41 +13,37 @@ KEYWORDS="x86 ~ppc ~sparc"
 IUSE="gnome png python"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
-		>=x11-libs/pango-1.1.5
-		>=dev-libs/libxml2-2.3.9
-		>=dev-libs/libxslt-1.0
-		>=media-libs/freetype-2.0.9
-		>=dev-util/intltool-0.21
-		png? ( media-libs/libpng
-				media-libs/libart_lgpl )
-		gnome? ( >=gnome-base/libgnome-2.0
-				>=gnome-base/libgnomeui-2.0 )
-		python? ( >=dev-lang/python-2.0
-				>=dev-python/pygtk-1.99 )"
+	<=x11-libs/pango-1.2.3
+	>=dev-libs/libxml2-2.3.9
+	>=dev-libs/libxslt-1.0
+	>=media-libs/freetype-2.0.9
+	>=dev-util/intltool-0.21
+	png? ( media-libs/libpng
+		media-libs/libart_lgpl )
+	gnome? ( >=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0 )
+	python? ( >=dev-lang/python-2.0
+		>=dev-python/pygtk-1.99 )"
+
+G2CONF="${G2CONF} `use_enable gnome` `use_with python`"
 
 src_unpack() {
+
 	unpack ${A}
+
 	# fix b0rked Makefile in Cisco directory
 	einfo "Patching shapes/Cisco/Makefile.in"
 	cd ${S}
 	cp ${FILESDIR}/${P}-Cisco-Makefile.in ${S}/shapes/Cisco/Makefile.in || die
-}
 
-src_compile() {
-	local myconf
+	epatch ${FILESDIR}/${P}-gcc33_fix.patch
 
-	use gnome \
-		&& myconf="--enable-gnome" \
-		|| myconf="--disable-gnome"
-
-	use python && myconf="${myconf} --with-python"
-
-	econf ${myconf} || die
-	emake || die
 }
 
 src_install() {
+
 	make DESTDIR=${D} install || die
+
 	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
 
 	# fix .desktop link
diff --git a/app-office/dia/files/dia-0.91-gcc33_fix.patch b/app-office/dia/files/dia-0.91-gcc33_fix.patch
new file mode 100644
index 000000000000..56adbfd15392
--- /dev/null
+++ b/app-office/dia/files/dia-0.91-gcc33_fix.patch
@@ -0,0 +1,12 @@
+diff -ur dia-0.91/plug-ins/python/pydia-geometry.c dia-0.91-gentoo/plug-ins/python/pydia-geometry.c
+--- dia-0.91/plug-ins/python/pydia-geometry.c	2003-01-20 05:38:22.000000000 +1300
++++ dia-0.91-gentoo/plug-ins/python/pydia-geometry.c	2003-09-10 11:56:53.000000000 +1200
+@@ -211,7 +211,7 @@
+ {
+ #define I_OR_F(v) \
+   (self->is_int ? \
+-   PyInt_FromLong(self->r.ri.##v) : PyFloat_FromDouble(self->r.rf.##v))
++   PyInt_FromLong(self->r.ri.v) : PyFloat_FromDouble(self->r.rf.v))
+ 
+   if (!strcmp(attr, "__members__"))
+     return Py_BuildValue("[ssss]", "top", "left", "right", "bottom" );
diff --git a/app-office/dia/files/digest-dia-0.88.1-r1 b/app-office/dia/files/digest-dia-0.88.1-r1
deleted file mode 100644
index f3bf11fb0b6c..000000000000
--- a/app-office/dia/files/digest-dia-0.88.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66a8017a9a93efe08c658f0a29838724 dia-0.88.1.tar.gz 1975480
diff --git a/app-office/dia/files/digest-dia-0.90-r2 b/app-office/dia/files/digest-dia-0.90-r2
deleted file mode 100644
index add9d92cfd0c..000000000000
--- a/app-office/dia/files/digest-dia-0.90-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62c80b2492e2b7d92bfbe360f46c157a dia-0.90.tar.gz 2888211
diff --git a/app-office/dia/files/digest-dia-0.91 b/app-office/dia/files/digest-dia-0.91
index 551368389249..b0c555d66bfc 100644
--- a/app-office/dia/files/digest-dia-0.91
+++ b/app-office/dia/files/digest-dia-0.91
@@ -1 +1 @@
-MD5 0a1e8075c4ee7615ff6b24cb3d1ec6c6 dia-0.91.tar.gz 3409320
+MD5 283517483601e81749db81a849a3bc91 dia-0.91.tar.bz2 2307990