remove old versions, add new version

5 files changed, 19 insertions, 80 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 928cb09746cb..645ce19a5308 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.3 2002/04/24 14:07:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.4 2002/05/09 23:04:17 spider Exp $
 
+
+*pango-1.0.1-r3 (9 May 2002)
+  9 May 2002; Spider <spider@gentoo.org>; pango-1.0.1-r3.ebuild :
+  fix some unnecessary deps. update DEPEND/RDEPEND
+  
 *pango-1.0.1-r2 (24 Apr 2002)
   24 Apr 2002; Spider <spider@gentoo.org>; pango-1.0.1-r2.ebuild
   Libtoolize
diff --git a/x11-libs/pango/files/digest-pango-1.0.1-r2 b/x11-libs/pango/files/digest-pango-1.0.1-r2
deleted file mode 100644
index c5ba8b57e0bf..000000000000
--- a/x11-libs/pango/files/digest-pango-1.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 489b44d55af53e907a2d186f0999a3d9 pango-1.0.1.tar.bz2 767885
diff --git a/x11-libs/pango/files/digest-pango-1.0.1-r1 b/x11-libs/pango/files/digest-pango-1.0.1-r3
index c5ba8b57e0bf..c5ba8b57e0bf 100644
--- a/x11-libs/pango/files/digest-pango-1.0.1-r1
+++ b/x11-libs/pango/files/digest-pango-1.0.1-r3
diff --git a/x11-libs/pango/pango-1.0.1-r1.ebuild b/x11-libs/pango/pango-1.0.1-r1.ebuild
deleted file mode 100644
index 9afb5591cafb..000000000000
--- a/x11-libs/pango/pango-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Spider  <spider.gentoo@darkmere.wanfear.com>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.1-r1.ebuild,v 1.2 2002/04/27 23:34:20 bangert Exp $
-
-# ACONFVER=2.52f
-# AMAKEVER=1.5b
-# Source inherit.eclass and inherit AutoTools
-# . /usr/portage/eclass/inherit.eclass  || die
-# inherit autotools 
-
-SLOT="1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-
-DEPEND=">=dev-libs/glib-2.0.1
-		virtual/x11
-		>=dev-util/pkgconfig-0.12.0
-		>=app-text/openjade-1.3-r2
-		>=app-text/docbook-sgml-dtd-4.1
-		>=app-text/sgml-common-0.6.1
-		>=app-text/docbook-sgml-1.0
-		>=media-libs/freetype-2.0.8
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-src_compile() {
-	local myconf
-	 use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-			--sysconfdir=/etc \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-			${myconf} \
-		    --enable-debug || die
-# turn on debug again, glib dislikes not having it.
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-	rm ${D}/etc/pango/pango.modules
-
-
- 	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
-
diff --git a/x11-libs/pango/pango-1.0.1-r2.ebuild b/x11-libs/pango/pango-1.0.1-r3.ebuild
index 3ecbbfa4dcf9..cbc56b6cc577 100644
--- a/x11-libs/pango/pango-1.0.1-r2.ebuild
+++ b/x11-libs/pango/pango-1.0.1-r3.ebuild
@@ -1,13 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Spider  <spider.gentoo@darkmere.wanfear.com>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.1-r2.ebuild,v 1.2 2002/04/27 23:34:20 bangert Exp $
-
-# ACONFVER=2.52f
-# AMAKEVER=1.5b
-# Source inherit.eclass and inherit AutoTools
-# . /usr/portage/eclass/inherit.eclass  || die
-# inherit autotools 
+# Author: Spider  <spider@gentoo.org>
+# Maintainer: Spider <spider@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.1-r3.ebuild,v 1.1 2002/05/09 23:04:17 spider Exp $
 
 SLOT="1"
 
@@ -16,21 +11,20 @@ DESCRIPTION="Text rendering and Layout library"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
 HOMEPAGE="http://www.pango.org/"
 
-DEPEND=">=dev-libs/glib-2.0.1
-		virtual/x11
-		>=dev-util/pkgconfig-0.12.0
-		>=app-text/openjade-1.3-r2
-		>=app-text/docbook-sgml-dtd-4.1
-		>=app-text/sgml-common-0.6.1
-		>=app-text/docbook-sgml-1.0
-		>=media-libs/freetype-2.0.8
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.0.1
+	>=media-libs/freetype-2.0.8"
+	
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
 
 
 src_compile() {
 	libtoolize --copy --force
 	local myconf
-	 use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
+	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
 	./configure --host=${CHOST} \
 		    --prefix=/usr \
 			--sysconfdir=/etc \
@@ -39,7 +33,7 @@ src_compile() {
 			${myconf} \
 		    --enable-debug || die
 # turn on debug again, glib dislikes not having it.
-	emake || die
+	emake || make || die "paralell make and serial make failed" 
 }
 
 src_install() {