Removed old ebuilds and updated dependencies for gnome-print and gnome-core

5 files changed, 30 insertions, 73 deletions

diff --git a/gnome-base/gnome-print/ChangeLog b/gnome-base/gnome-print/ChangeLog
index daf05faad15b..ca216e0437c9 100644
--- a/gnome-base/gnome-print/ChangeLog
+++ b/gnome-base/gnome-print/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-print
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/ChangeLog,v 1.2 2002/03/10 08:59:12 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/ChangeLog,v 1.3 2002/03/18 12:22:55 seemant Exp $
+
+*gnome-print-0.35-r2 (18 Mar 2002)
+
+  18 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gnome-print-0.35-r2.ebuild :
+
+  Added gnome-libs as a compile-time dependency and cleaned up the sed statement
+  in src_unpack().
 
 *gnome-print-0.35-r1 (10 Mar 2002)
 
diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.34-r1 b/gnome-base/gnome-print/files/digest-gnome-print-0.34-r1
deleted file mode 100644
index 5d0d821b23f2..000000000000
--- a/gnome-base/gnome-print/files/digest-gnome-print-0.34-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af477455dca1c68539343a26a04e6c2b gnome-print-0.34.tar.gz 998679
diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.35 b/gnome-base/gnome-print/files/digest-gnome-print-0.35-r2
index 86024ae64c0d..86024ae64c0d 100644
--- a/gnome-base/gnome-print/files/digest-gnome-print-0.35
+++ b/gnome-base/gnome-print/files/digest-gnome-print-0.35-r2
diff --git a/gnome-base/gnome-print/gnome-print-0.34-r1.ebuild b/gnome-base/gnome-print/gnome-print-0.34-r1.ebuild
deleted file mode 100644
index 029cb180dd0e..000000000000
--- a/gnome-base/gnome-print/gnome-print-0.34-r1.ebuild
+++ /dev/null
@@ -1,57 +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.34-r1.ebuild,v 1.1 2002/01/20 09:33:28 azarah 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
-	 >=media-libs/freetype-2.0.1"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-        sys-devel/perl
-	tex? ( app-text/tetex )
-        >=app-text/ghostscript-6.50-r2"
-
-src_unpack() {
-	unpack ${A}
-
-	#fix Makefile not to run gnome-font-install
-	cp ${S}/installer/Makefile.in ${S}/installer/Makefile.in.orig
-	sed -e 's:$(PERL) $(top_srcdir)/run-gnome-font-install:echo $(top_srcdir)/run-gnome-font-install:' \
-	${S}/installer/Makefile.in.orig > ${S}/installer/Makefile.in
-}
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc 					\
-		    --localstatedir=/var/lib || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} 						\
-		sysconfdir=${D}/etc					\
-		install || die
-
-	insinto /usr/share/fonts
-	doins ${S}/run-gnome-font-install
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ldconfig >/dev/null 2>/dev/null
-	echo ">>> Installing fonts"
-	perl /usr/share/fonts/run-gnome-font-install \
-		/usr/bin/gnome-font-install \
-		/usr/share/fonts /usr/share/fonts /etc >/dev/null 2>/dev/null
-}
diff --git a/gnome-base/gnome-print/gnome-print-0.35.ebuild b/gnome-base/gnome-print/gnome-print-0.35-r2.ebuild
index d8a0850547b1..034e75a029b3 100644
--- a/gnome-base/gnome-print/gnome-print-0.35.ebuild
+++ b/gnome-base/gnome-print/gnome-print-0.35-r2.ebuild
@@ -1,44 +1,52 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.35.ebuild,v 1.1 2002/01/29 19:30:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-print/gnome-print-0.35-r2.ebuild,v 1.1 2002/03/18 12:22:55 seemant Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="Gnome printing library"
+DESCRIPTION="GNOME printing library"
 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
-	 >=media-libs/freetype-2.0.1"
+	>=gnome-base/gnome-libs-1.4.1.4
+	>=gnome-base/libglade-0.17-r1
+	>=media-libs/freetype-2.0.1"
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-        sys-devel/perl
-	tex? ( app-text/tetex )
-        >=app-text/ghostscript-6.50-r2"
+		sys-devel/gettext
+		sys-devel/perl
+		tex? ( app-text/tetex )
+     	>=app-text/ghostscript-6.50-r2
+		nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 
 	#fix Makefile not to run gnome-font-install
 	cp ${S}/installer/Makefile.in ${S}/installer/Makefile.in.orig
-	sed -e 's:$(PERL) $(top_srcdir)/run-gnome-font-install:echo $(top_srcdir)/run-gnome-font-install:' \
+	sed -e 's:$(PERL) \($(top_srcdir)/run-gnome-font-install\):echo \1:' \
 		${S}/installer/Makefile.in.orig > ${S}/installer/Makefile.in
 }
 
 src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc 					\
-		    --localstatedir=/var/lib || die
+
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc \
+		    --localstatedir=/var/lib \
+			${myconf} || die
 
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} 						\
-		gnulocaledir=${D}/usr/share/locale			\
+		gnulocaledir=${D}/usr/share/locale	\
 		sysconfdir=${D}/etc					\
 		install || die