bugfixing revision

4 files changed, 9 insertions, 54 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 091f097738ba..d516a98a0004 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.7 2002/10/22 12:06:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.8 2002/10/23 15:21:31 foser Exp $
 
 *dia-0.90-r2 (22 Oct 2002)
 
+  23 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added libart_lgpl dep for png USE
+  Thanks go to Ryan Tolboom <rxt1077@njit.edu> for notifying
+
   22 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
   Added truetype and png USE flags (bug #8916)
 
diff --git a/app-office/dia/dia-0.90-r1.ebuild b/app-office/dia/dia-0.90-r1.ebuild
deleted file mode 100644
index fc96800f134e..000000000000
--- a/app-office/dia/dia-0.90-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2002 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-r1.ebuild,v 1.6 2002/10/05 05:39:09 drobbins Exp $
-
-IUSE="nls gnome bonobo"
-
-S=${WORKDIR}/${P}
-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"
-
-RDEPEND=">=dev-libs/libxml-1.8.15
-	>=media-libs/gdk-pixbuf-0.18.0
-	>=dev-libs/popt-1.6.3
-	>=dev-libs/libunicode-0.4-r1
-	bonobo? ( >=gnome-base/bonobo-1.0.19-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"
- 
-    # enable-gnome-print not recoomended
-
-	econf ${myconf} || die
-	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
index 160c911a3bb4..ef2d4ca59d65 100644
--- a/app-office/dia/dia-0.90-r2.ebuild
+++ b/app-office/dia/dia-0.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.1 2002/10/22 12:06:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.90-r2.ebuild,v 1.2 2002/10/23 15:21:31 foser Exp $
 
 IUSE="nls gnome bonobo truetype png"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND=">=dev-libs/libxml-1.8.14
 	>=media-libs/gdk-pixbuf-0.7
@@ -19,7 +19,8 @@ RDEPEND=">=dev-libs/libxml-1.8.14
 	dev-libs/libunicode
 	bonobo? ( gnome-base/bonobo )
 	truetype? ( >=media-libs/freetype-2.0.5 )
-	png? ( media-libs/libpng )" 
+	png? ( media-libs/libpng
+		>=media-libs/libart_lgpl-2.1 )" 
 
 # Python module needs some work
 DEPEND="${RDEPEND}
diff --git a/app-office/dia/files/digest-dia-0.90-r1 b/app-office/dia/files/digest-dia-0.90-r1
deleted file mode 100644
index add9d92cfd0c..000000000000
--- a/app-office/dia/files/digest-dia-0.90-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62c80b2492e2b7d92bfbe360f46c157a dia-0.90.tar.gz 2888211