Fix headers to /usr/X11R6/include, bug #18688

3 files changed, 76 insertions, 2 deletions

diff --git a/x11-libs/xft/ChangeLog b/x11-libs/xft/ChangeLog
index a997e79ee388..fdea4ce62ed0 100644
--- a/x11-libs/xft/ChangeLog
+++ b/x11-libs/xft/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2003/03/15 20:13:14 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.19 2003/04/08 13:36:33 azarah Exp $
+
+*xft-2.0.1-r2 (08 Apr 2003)
+
+  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
+  archs are, and its been a while.
 
   11 Mar 2003; Guy Martin <gmsoft@gentoo.org> xft-2.0.1-r1.ebuild :
   Added hppa to keywords.
diff --git a/x11-libs/xft/files/digest-xft-2.0.1-r2 b/x11-libs/xft/files/digest-xft-2.0.1-r2
index c8052e8fe964..82c8f02682de 100644
--- a/x11-libs/xft/files/digest-xft-2.0.1-r2
+++ b/x11-libs/xft/files/digest-xft-2.0.1-r2
@@ -1,3 +1,3 @@
 MD5 bdbcdd7f9f71d975bec7ca0c235d8677 /files/xft-2.0.1-cvs-update-20021221.patch 6560
-MD5 c8c3741ef2d92232ff91d5199740e976 /xft-2.0.1-r2.ebuild 1556
+MD5 89ed92b9b26fca5b2ae4d95bb64b9333 /xft-2.0.1-r2.ebuild 1556
 MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
diff --git a/x11-libs/xft/xft-2.0.1-r2.ebuild b/x11-libs/xft/xft-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..e7ab16478c3d
--- /dev/null
+++ b/x11-libs/xft/xft-2.0.1-r2.ebuild
@@ -0,0 +1,67 @@
+# 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.1 2003/04/08 13:36:33 azarah 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 \
+		--includedir=/usr/X11R6/include \
+		|| die "Xft2 config failed"
+	emake || die "Xft2 make failed"  
+}
+
+src_install() {
+	einstall confdir=${D}/etc/fonts \
+		datadir=${D}/usr/share \
+		includedir=${D}/usr/X11R6/include || 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 ..."
+}
+