Update proto deps to better reflect compile-time requirements. Also drop old

versions.
(Portage version: 2.0.53_rc7)

6 files changed, 11 insertions, 63 deletions

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 136de3bd2691..50071b53d3ef 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.10 2005/10/25 01:53:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.11 2005/11/04 16:39:00 joshuabaergen Exp $
+
+  04 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -libXfont-0.99.0.ebuild, -libXfont-0.99.0-r1.ebuild,
+  libXfont-0.99.1.ebuild:
+  Update proto deps to better reflect compile-time requirements.  Also drop old
+  versions.
 
   25 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   libXfont-0.99.0.ebuild, libXfont-0.99.0-r1.ebuild, libXfont-0.99.1.ebuild:
diff --git a/x11-libs/libXfont/files/digest-libXfont-0.99.0 b/x11-libs/libXfont/files/digest-libXfont-0.99.0
deleted file mode 100644
index f489efe96e32..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-0.99.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7566ddf06a209656c0e4814d5739e8c1 libXfont-0.99.0.tar.bz2 584112
diff --git a/x11-libs/libXfont/files/digest-libXfont-0.99.0-r1 b/x11-libs/libXfont/files/digest-libXfont-0.99.0-r1
deleted file mode 100644
index f489efe96e32..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-0.99.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7566ddf06a209656c0e4814d5739e8c1 libXfont-0.99.0.tar.bz2 584112
diff --git a/x11-libs/libXfont/libXfont-0.99.0-r1.ebuild b/x11-libs/libXfont/libXfont-0.99.0-r1.ebuild
deleted file mode 100644
index d255cf4c4d86..000000000000
--- a/x11-libs/libXfont/libXfont-0.99.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-0.99.0-r1.ebuild,v 1.3 2005/10/25 01:53:54 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="cid truetype speedo bitmap-fonts ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto
-	x11-proto/xproto
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable cid)
-	$(use_enable speedo)
-	$(use_enable truetype freetype)
-	$(use_enable bitmap-fonts pcfformat)
-	$(use_enable bitmap-fonts bdfformat)
-	$(use_enable bitmap-fonts snfformat)
-	$(use_enable ipv6)
-	--enable-type1"
diff --git a/x11-libs/libXfont/libXfont-0.99.0.ebuild b/x11-libs/libXfont/libXfont-0.99.0.ebuild
deleted file mode 100644
index dbbbb07d0999..000000000000
--- a/x11-libs/libXfont/libXfont-0.99.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-0.99.0.ebuild,v 1.9 2005/10/25 01:53:54 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="cid truetype type1 speedo bitmap-fonts ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto
-	x11-proto/xproto
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable cid)
-	$(use_enable speedo)
-	$(use_enable truetype freetype)
-	$(use_enable type1)
-	$(use_enable bitmap-fonts pcfformat)
-	$(use_enable bitmap-fonts bdfformat)
-	$(use_enable bitmap-fonts snfformat)
-	$(use_enable ipv6)"
diff --git a/x11-libs/libXfont/libXfont-0.99.1.ebuild b/x11-libs/libXfont/libXfont-0.99.1.ebuild
index 19de19374909..a258ca0bc696 100644
--- a/x11-libs/libXfont/libXfont-0.99.1.ebuild
+++ b/x11-libs/libXfont/libXfont-0.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-0.99.1.ebuild,v 1.2 2005/10/25 01:53:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-0.99.1.ebuild,v 1.3 2005/11/04 16:39:00 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -12,11 +12,11 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="cid truetype speedo bitmap-fonts ipv6"
 RDEPEND="x11-libs/xtrans
 	x11-libs/libfontenc
+	x11-proto/xproto
+	x11-proto/fontsproto
 	truetype? ( >=media-libs/freetype-2 )"
 DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto
-	x11-proto/xproto
-	x11-proto/fontsproto"
+	x11-proto/fontcacheproto"
 
 CONFIGURE_OPTIONS="$(use_enable cid)
 	$(use_enable speedo)