updated to latest version

5 files changed, 11 insertions, 65 deletions

diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.30-r1 b/gnome-base/gnome-print/files/digest-gnome-print-0.30-r1
deleted file mode 100644
index 12745799c96d..000000000000
--- a/gnome-base/gnome-print/files/digest-gnome-print-0.30-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a3c0dff05f649d59616c7652d149759 gnome-print-0.30.tar.gz 1003520
diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.31 b/gnome-base/gnome-print/files/digest-gnome-print-0.31
deleted file mode 100644
index 3c4cb488b30f..000000000000
--- a/gnome-base/gnome-print/files/digest-gnome-print-0.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 345886fa17f598b7487b67bf876f3cef gnome-print-0.31.tar.gz 921600
diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.32 b/gnome-base/gnome-print/files/digest-gnome-print-0.32
new file mode 100644
index 000000000000..83a09a8cb247
--- /dev/null
+++ b/gnome-base/gnome-print/files/digest-gnome-print-0.32
@@ -0,0 +1 @@
+MD5 2dfe9de478faea9146d2857590cc8521 gnome-print-0.32.tar.gz 987136
diff --git a/gnome-base/gnome-print/gnome-print-0.31.ebuild b/gnome-base/gnome-print/gnome-print-0.31.ebuild
deleted file mode 100644
index 4c33f4ddea15..000000000000
--- a/gnome-base/gnome-print/gnome-print-0.31.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.31.ebuild,v 1.1 2001/10/16 23:41:30 hallski Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-print"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
-	 >=gnome-base/libglade-0.17-r1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext ) 
-        sys-devel/perl
-        >=app-text/ghostscript-6.50-r2"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	
-	cd ${S}
-	# add missing DESTDIR to font installation
-	sed -e 's:install $(datadir):install $(DESTDIR)$(datadir):' \
-		installer/Makefile.in > installer/Makefile.in.new
-	mv installer/Makefile.in.new installer/Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc 					\
-		    --localstatedir=/var/lib				\
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dosed /usr/share/fonts/fontmap
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/gnome-base/gnome-print/gnome-print-0.30-r1.ebuild b/gnome-base/gnome-print/gnome-print-0.32.ebuild
index d366ca13a294..6cab995b2649 100644
--- a/gnome-base/gnome-print/gnome-print-0.30-r1.ebuild
+++ b/gnome-base/gnome-print/gnome-print-0.32.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.30-r1.ebuild,v 1.1 2001/10/16 23:43:03 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.32.ebuild,v 1.1 2001/11/10 13:06:22 hallski Exp $
 
 
 S=${WORKDIR}/${P}
@@ -22,9 +22,14 @@ src_unpack() {
 	
 	cd ${S}
 	# add missing DESTDIR to font installation
-	sed -e 's:install $(datadir):install $(DESTDIR)$(datadir):' \
+	sed 's:all \($(datadir).*\)\($(sysconfdir)\):all $(DESTDIR)\1$(DESTDIR)\2:'\
 		installer/Makefile.in > installer/Makefile.in.new
 	mv installer/Makefile.in.new installer/Makefile.in
+	# add --clean to gnome-font-install options so that currently-installed
+	# fontmaps will be ignored and new complete ones will be built
+	sed "s:'--dynamic',:& '--clean',:" \
+		run-gnome-font-install > run-gnome-font-install.new
+	mv run-gnome-font-install.new run-gnome-font-install
 }
 
 src_compile() {
@@ -45,11 +50,8 @@ src_compile() {
 }
 
 src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     install || die
+	make DESTDIR=${D} install || die
 
-	dosed /usr/share/fonts/fontmap
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dosed /etc/gnome/fonts/*
+	dodoc AUTHORS COPYING ChangeLog NEWS README
 }