No longer need to check for USE=cid in libXfont, because it builds unconditionally.

(Portage version: 2.0.53)

7 files changed, 11 insertions, 58 deletions

diff --git a/x11-apps/mkcfm/ChangeLog b/x11-apps/mkcfm/ChangeLog
index d46ae9b97eca..5c1a1f920f95 100644
--- a/x11-apps/mkcfm/ChangeLog
+++ b/x11-apps/mkcfm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/mkcfm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.3 2005/12/04 21:46:15 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.4 2005/12/09 05:58:19 spyderous Exp $
+
+*mkcfm-0.99.3-r1 (09 Dec 2005)
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mkcfm-0.99.1.ebuild,
+  -mkcfm-0.99.2.ebuild, -mkcfm-0.99.3.ebuild, +mkcfm-0.99.3-r1.ebuild:
+  No longer need to check for USE=cid in libXfont, because it builds
+  unconditionally.
 
 *mkcfm-0.99.3 (04 Dec 2005)
 
diff --git a/x11-apps/mkcfm/files/digest-mkcfm-0.99.1 b/x11-apps/mkcfm/files/digest-mkcfm-0.99.1
deleted file mode 100644
index aa409622aeab..000000000000
--- a/x11-apps/mkcfm/files/digest-mkcfm-0.99.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62fc0e48c7dc3d60f3bf693f222a25bd mkcfm-0.99.1.tar.bz2 73863
diff --git a/x11-apps/mkcfm/files/digest-mkcfm-0.99.2 b/x11-apps/mkcfm/files/digest-mkcfm-0.99.2
deleted file mode 100644
index 0e831faf4944..000000000000
--- a/x11-apps/mkcfm/files/digest-mkcfm-0.99.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8defea59ab389985db13d97044291b8e mkcfm-0.99.2.tar.bz2 73921
diff --git a/x11-apps/mkcfm/files/digest-mkcfm-0.99.3 b/x11-apps/mkcfm/files/digest-mkcfm-0.99.3-r1
index 0a6d830ad931..0a6d830ad931 100644
--- a/x11-apps/mkcfm/files/digest-mkcfm-0.99.3
+++ b/x11-apps/mkcfm/files/digest-mkcfm-0.99.3-r1
diff --git a/x11-apps/mkcfm/mkcfm-0.99.2.ebuild b/x11-apps/mkcfm/mkcfm-0.99.2.ebuild
deleted file mode 100644
index bf0cb720441c..000000000000
--- a/x11-apps/mkcfm/mkcfm-0.99.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.2.ebuild,v 1.1 2005/11/11 19:49:50 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org mkcfm application"
-KEYWORDS="~x86"
-RDEPEND="x11-libs/libXfont
-	x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/libXfont cid; then
-		die "Build x11-libs/libXfont with USE=cid."
-	fi
-}
-
diff --git a/x11-apps/mkcfm/mkcfm-0.99.1.ebuild b/x11-apps/mkcfm/mkcfm-0.99.3-r1.ebuild
index 8e6894ea233d..3e1effdda7ab 100644
--- a/x11-apps/mkcfm/mkcfm-0.99.1.ebuild
+++ b/x11-apps/mkcfm/mkcfm-0.99.3-r1.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-apps/mkcfm/mkcfm-0.99.1.ebuild,v 1.1 2005/10/20 01:08:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.3-r1.ebuild,v 1.1 2005/12/09 05:58:19 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,15 +9,9 @@ inherit x-modular
 
 DESCRIPTION="X.Org mkcfm application"
 KEYWORDS="~x86"
-RDEPEND="x11-libs/libXfont
+# >=x11-libs/libXfont-0.99.3-r1 for always-on cid support
+RDEPEND=">=x11-libs/libXfont-0.99.3-r1
 	x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/libXfont cid; then
-		die "Build x11-libs/libXfont with USE=cid."
-	fi
-}
-
diff --git a/x11-apps/mkcfm/mkcfm-0.99.3.ebuild b/x11-apps/mkcfm/mkcfm-0.99.3.ebuild
deleted file mode 100644
index 7ba34b70c612..000000000000
--- a/x11-apps/mkcfm/mkcfm-0.99.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.3.ebuild,v 1.1 2005/12/04 21:46:15 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org mkcfm application"
-KEYWORDS="~x86"
-RDEPEND="x11-libs/libXfont
-	x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/libXfont cid; then
-		die "Build x11-libs/libXfont with USE=cid."
-	fi
-}
-