summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-05-24 02:38:03 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-05-24 02:38:03 +0000
commit3dd539d84d8c514aa5137c3a10cb399e563971ef (patch)
tree1bc9e2a83dfc305b171bdedb4fd1c43d3ad8104a /x11-base
parentseveral changes, new ebuilds, cleaned old ebuilds/files, fixed a few scripts ... (diff)
downloadhistorical-3dd539d84d8c514aa5137c3a10cb399e563971ef.tar.gz
historical-3dd539d84d8c514aa5137c3a10cb399e563971ef.tar.bz2
historical-3dd539d84d8c514aa5137c3a10cb399e563971ef.zip
(#93034) There's a new FontEncDir that we also need to change to fit our FHS compatibility.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild4
3 files changed, 11 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 613a4798fd3e..a3d6cabd5182 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.386 2005/05/24 02:34:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.387 2005/05/24 02:38:03 spyderous Exp $
+
+ 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.99.5.ebuild:
+ (#93034) There's a new FontEncDir that we also need to change to fit our FHS
+ compatibility.
24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index fa952cdbfdc0..be45b717eb13 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,9 +1,9 @@
MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
MD5 2a9834518373d30105bf3deba9f2624e xorg-x11-6.8.99.3.ebuild 60101
MD5 2b6b5fe53c72644f715c3bf732f5578e xorg-x11-6.8.2-r2.ebuild 60231
-MD5 212647bb2e6de0f6168c587fd2b1c662 ChangeLog 91326
+MD5 3fb2dccc2bc393af7a1dc7d6253cc3a6 ChangeLog 91506
MD5 fb5fe55f00e3567aeb6ea6d4465fc62b xorg-x11-6.8.2-r1.ebuild 59275
-MD5 bf34c47c9be2d669d1ca0a5f5a613e18 xorg-x11-6.8.99.5.ebuild 60170
+MD5 d00badaeba8646be6e710e25286d4199 xorg-x11-6.8.99.5.ebuild 60279
MD5 a98e64cce8a02182077d2a3705073df3 files/digest-xorg-x11-6.8.99.3 514
MD5 45f54f18766a2e962703c8d05070fd9e files/digest-xorg-x11-6.8.99.5 514
MD5 9f999f4ac0b474d1a8f41cb3d15602f1 files/digest-xorg-x11-6.8.2-r2 504
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
index 792df46e7904..3590b196aa1e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.5.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-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.7 2005/05/24 02:34:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.8 2005/05/24 02:38:03 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -539,6 +539,8 @@ host_def_setup() {
echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF}
echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF}
echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
+ # Single quotes so FONTDIR doesn't get run
+ echo '#define FontEncDir $(FONTDIR)/encodings' >> ${HOSTCONF}
echo "#define BinDir /usr/bin" >> ${HOSTCONF}
echo "#define IncRoot /usr/include" >> ${HOSTCONF}
# This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR)