added png and truetype use flags

4 files changed, 61 insertions, 59 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 2a5adcb56fa9..091f097738ba 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.6 2002/08/30 12:22:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.7 2002/10/22 12:06:52 foser Exp $
+
+*dia-0.90-r2 (22 Oct 2002)
+
+  22 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added truetype and png USE flags (bug #8916)
 
 *dia-0.90-r1 (21 Jun 2002)
 
diff --git a/app-office/dia/dia-0.90-r2.ebuild b/app-office/dia/dia-0.90-r2.ebuild
new file mode 100644
index 000000000000..160c911a3bb4
--- /dev/null
+++ b/app-office/dia/dia-0.90-r2.ebuild
@@ -0,0 +1,55 @@
+# 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 $
+
+IUSE="nls gnome bonobo truetype png"
+
+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.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 )" 
+
+# 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} || 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.ebuild b/app-office/dia/dia-0.90.ebuild
deleted file mode 100644
index caf8aee01c3e..000000000000
--- a/app-office/dia/dia-0.90.ebuild
+++ /dev/null
@@ -1,58 +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.ebuild,v 1.5 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"
-KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=dev-libs/libxml-1.8.15
-	>=media-libs/gdk-pixbuf-0.18.0
-	>=dev-libs/popt-1.6.3
-	bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-#	python? ( dev-lang/python-2.0 )"
-
-
-
-src_compile() {
-	local myconf
-
-	if [ "`use gnome`" ] ; then
-		myconf="--enable-gnome"
-	fi
-
-	if [ "`use bonobo`" ]; then
-		myconf="--enable-gnome --enable-bonobo"
-	fi
-
-#	if [ "`use python`" ] ; then
-#		myconf="${myconf} --with-python"
-#	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
- 
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    ${myconf} || die
-
-        # enable-gnome-print not recoomended
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-}
diff --git a/app-office/dia/files/digest-dia-0.90 b/app-office/dia/files/digest-dia-0.90-r2
index add9d92cfd0c..add9d92cfd0c 100644
--- a/app-office/dia/files/digest-dia-0.90
+++ b/app-office/dia/files/digest-dia-0.90-r2