added xfree-4.3-r2+ blocking dep, for xft

8 files changed, 7 insertions, 180 deletions

diff --git a/x11-libs/xft/ChangeLog b/x11-libs/xft/ChangeLog
index fdea4ce62ed0..63a2e4983b6a 100644
--- a/x11-libs/xft/ChangeLog
+++ b/x11-libs/xft/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-libs/xft
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.19 2003/04/08 13:36:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.20 2003/04/18 01:32:26 foser Exp $
 
 *xft-2.0.1-r2 (08 Apr 2003)
 
+  18 Apr 2003; foser <foser@gentoo.org> xft-2.0.1-r2.ebuild :
+  Added xfree-4.3-r2 blocking depend because it contains its own xft2 lib
+
   08 Apr 2003; Martin Schlemmer <azarah@gentoo.org> xft-2.0.1-r1.ebuild :
   Fix headers to install to /usr/X11R6/include/X11, and not symlinked dir
   /usr/include/X11, closing bug #18688.  Mark stable for x86, as all other
diff --git a/x11-libs/xft/files/digest-xft-2.0-r1 b/x11-libs/xft/files/digest-xft-2.0-r1
deleted file mode 100644
index 05efa21a9a47..000000000000
--- a/x11-libs/xft/files/digest-xft-2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
diff --git a/x11-libs/xft/files/digest-xft-2.0.1 b/x11-libs/xft/files/digest-xft-2.0.1
deleted file mode 100644
index 1952672e6a0d..000000000000
--- a/x11-libs/xft/files/digest-xft-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
diff --git a/x11-libs/xft/files/digest-xft-2.0.1-r1 b/x11-libs/xft/files/digest-xft-2.0.1-r1
deleted file mode 100644
index 1952672e6a0d..000000000000
--- a/x11-libs/xft/files/digest-xft-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
diff --git a/x11-libs/xft/xft-2.0-r1.ebuild b/x11-libs/xft/xft-2.0-r1.ebuild
deleted file mode 100644
index 5a1f03b48fec..000000000000
--- a/x11-libs/xft/xft-2.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0-r1.ebuild,v 1.9 2003/02/13 17:04:12 vapier Exp $
-
-PROVIDE="virtual/xft"
-DESCRIPTION="Xft2"
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"     
-HOMEPAGE="http://fontconfig.org/" 
-LICENSE="fontconfig"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-RDEPEND="x11-base/xfree
-	>=media-libs/fontconfig-2.0-r4"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.53a"	
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/Xft"   
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	export WANT_AUTOCONF_2_5=1
-	autoconf --force
-}
-
-src_compile() {
-	econf --x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		|| die "Xft2 config failed"
-	emake || die "Xft2 make failed"  
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	dodir /usr/X11R6/lib
-	dosym ../../lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so     
-}
-
-pkg_preinst() {
-	if [ "${ROOT}" = "/" -a ! -d /root/.Xft ]
-	then
-		mv -f /usr/X11R6/include/X11/Xft /root/.Xft
-	fi
-}
-
-pkg_postinst() {
-	einfo "Your old Xft includes have been saved to /root/.Xft"
-}
diff --git a/x11-libs/xft/xft-2.0.1-r1.ebuild b/x11-libs/xft/xft-2.0.1-r1.ebuild
deleted file mode 100644
index 0315d5abff11..000000000000
--- a/x11-libs/xft/xft-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1-r1.ebuild,v 1.11 2003/03/15 20:13:14 gerk Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/fcpackage.${PV/\.0\./_}/Xft"
-PROVIDE="virtual/xft"
-DESCRIPTION="X FreeType library, also known as Xft2.0"
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\.0\./_}.tar.gz"     
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="0"
-KEYWORDS="~x86 ppc alpha sparc hppa arm"
-
-RDEPEND="x11-base/xfree
-	>=media-libs/fontconfig-2.1-r1"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.53a"	
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-
-	# Update from XFree86 cvs tree
-	epatch ${FILESDIR}/${P}-cvs-update-20021221.patch
-	
-	einfo "Running autoconf..."
-	export WANT_AUTOCONF_2_5=1
-	autoconf --force
-}
-
-src_compile() {
-	econf --x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		|| die "Xft2 config failed"
-	emake || die "Xft2 make failed"  
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	dodir /usr/X11R6/lib
-	dosym ../../lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so     
-}
-
-pkg_preinst() {
-	if [ "${ROOT}" = "/" -a ! -d /root/.Xft -a \
-	     -f /usr/X11R6/include/X11/Xft/XftFreetype.h ]
-	then
-		mv -f /usr/X11R6/include/X11/Xft /root/.Xft
-	fi
-}
-
-pkg_postinst() {
-	einfo "Your old Xft1.1 includes have been saved to /root/.Xft,"
-	einfo "if they were present ..."
-}
-
diff --git a/x11-libs/xft/xft-2.0.1-r2.ebuild b/x11-libs/xft/xft-2.0.1-r2.ebuild
index dcfa1a5e9fde..99bd0891da9b 100644
--- a/x11-libs/xft/xft-2.0.1-r2.ebuild
+++ b/x11-libs/xft/xft-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1-r2.ebuild,v 1.2 2003/04/15 02:34:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1-r2.ebuild,v 1.3 2003/04/18 01:32:26 foser Exp $
 
 IUSE=""
 
@@ -19,7 +19,8 @@ RDEPEND="x11-base/xfree
 	>=media-libs/fontconfig-2.1-r1"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.53a"	
+	>=sys-devel/autoconf-2.53a
+	!>=x11-base/xfree-4.3-r2"	
 
 PROVIDE="virtual/xft"
 
diff --git a/x11-libs/xft/xft-2.0.1.ebuild b/x11-libs/xft/xft-2.0.1.ebuild
deleted file mode 100644
index 44e6f8a68634..000000000000
--- a/x11-libs/xft/xft-2.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1.ebuild,v 1.4 2003/03/11 11:07:50 gmsoft Exp $
-
-IUSE=""
-
-S="${WORKDIR}/fcpackage.${PV/\.0\./_}/Xft"
-PROVIDE="virtual/xft"
-DESCRIPTION="X FreeType library, also known as Xft2.0"
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\.0\./_}.tar.gz"     
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="0"
-KEYWORDS="x86 ~ppc hppa"
-
-RDEPEND="x11-base/xfree
-	>=media-libs/fontconfig-2.1"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.53a"	
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	export WANT_AUTOCONF_2_5=1
-	autoconf --force
-}
-
-src_compile() {
-	econf --x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		|| die "Xft2 config failed"
-	emake || die "Xft2 make failed"  
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	dodir /usr/X11R6/lib
-	dosym ../../lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so     
-}
-
-pkg_preinst() {
-	if [ "${ROOT}" = "/" -a ! -d /root/.Xft ]
-	then
-		mv -f /usr/X11R6/include/X11/Xft /root/.Xft
-	fi
-}
-
-pkg_postinst() {
-	einfo "Your old Xft includes have been saved to /root/.Xft"
-}