summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2003-11-25 03:55:36 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2003-11-25 03:55:36 +0000
commitad77fed4ab21818bf576eecac3130b4385e88c08 (patch)
tree469564d148b3ca91a49e3bc173a704f937db50d0 /x11-base
parentVersion bump (diff)
downloadgentoo-2-ad77fed4ab21818bf576eecac3130b4385e88c08.tar.gz
gentoo-2-ad77fed4ab21818bf576eecac3130b4385e88c08.tar.bz2
gentoo-2-ad77fed4ab21818bf576eecac3130b4385e88c08.zip
Stopping PDF docs from building. With X and doc in USE, this creates a circular dep with ghostscript.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog6
-rw-r--r--x11-base/xfree/Manifest4
-rw-r--r--x11-base/xfree/xfree-4.3.99.16.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index f35a3a3fcf98..e9946352e65a 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.245 2003/11/23 22:22:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.246 2003/11/25 03:55:31 spyderous Exp $
+
+ 24 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.16.ebuild:
+ Stopping PDF docs from building. With X and doc in USE, this creates a
+ circular dep with ghostscript.
23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.14.ebuild:
Pulling old snapshot.
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index d5a50a61be3d..e9e2d1bd025b 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -5,8 +5,8 @@ MD5 e169e0fe0574ecb23f62d4787abe3dcb xfree-4.2.1-r2.ebuild 24144
MD5 4b75d7fb9200bbd2f4a57e822bc568b1 xfree-4.3.99.15.ebuild 32666
MD5 049549e84c67068017dcb7a4028fdec1 xfree-4.3.0-r2.ebuild 31516
MD5 4dd30eaef87c601c9a124ff2106f263e xfree-4.3.0-r3.ebuild 34753
-MD5 6dee613388c6a2d0202e8b176488ff35 ChangeLog 54093
-MD5 24bb8b66c46cf18b287693f649ae7396 xfree-4.3.99.16.ebuild 32562
+MD5 ec016785dff3203356ccdb180c996507 ChangeLog 54279
+MD5 403554002af94ed9a137b419e6bfe396 xfree-4.3.99.16.ebuild 32590
MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
diff --git a/x11-base/xfree/xfree-4.3.99.16.ebuild b/x11-base/xfree/xfree-4.3.99.16.ebuild
index 4f8efd6c6354..18646aa08256 100644
--- a/x11-base/xfree/xfree-4.3.99.16.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.16.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-base/xfree/xfree-4.3.99.16.ebuild,v 1.1 2003/11/23 22:07:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.16.ebuild,v 1.2 2003/11/25 03:55:31 spyderous Exp $
# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
# that only we only strip stuff that are safe to strip ...
@@ -116,7 +116,6 @@ DEPEND=">=sys-apps/baselayout-1.8.3
app-arch/unzip
pam? ( >=sys-libs/pam-0.75 )
truetype? ( app-arch/cabextract )
- doc? ( app-text/ghostscript )
>=sys-apps/portage-2.0.49-r13
!x11-libs/xft"
# RDEPEND="${DEPEND}"
@@ -441,7 +440,8 @@ src_unpack() {
local DOC="NO"
fi
- echo "#define HasGhostScript ${DOC}" >> config/cf/host.def
+ # with USE="X doc' circular dep w/ app-text/ghostscript
+ # echo "#define HasGhostScript ${DOC}" >> config/cf/host.def
echo "#define BuildLinuxDocText ${DOC}" >> config/cf/host.def
echo "#define BuildLinuxDocHtml ${DOC}" >> config/cf/host.def
echo "#define BuildLinuxDocPS ${DOC}" >> config/cf/host.def