summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-10-19 06:13:23 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-10-19 06:13:23 +0000
commit7f7fc037ce91bb3621aca84c21f4cf51d20668e0 (patch)
tree0984a0079e4375f4a1b4ee2f2246c78d23d1609d /x11-base
parentStable amd64, sparc. (Manifest recommit) (diff)
downloadgentoo-2-7f7fc037ce91bb3621aca84c21f4cf51d20668e0.tar.gz
gentoo-2-7f7fc037ce91bb3621aca84c21f4cf51d20668e0.tar.bz2
gentoo-2-7f7fc037ce91bb3621aca84c21f4cf51d20668e0.zip
Combine two consecutive instances of "use ! bitmap-fonts."
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild5
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild5
3 files changed, 7 insertions, 9 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2b5795c17c04..219196713cfc 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.162 2004/10/18 22:55:44 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.163 2004/10/19 06:13:23 spyderous Exp $
+
+ 18 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+ Combine two consecutive instances of "use ! bitmap-fonts."
18 Oct 2004; Stephen P. Becker <geoman@gentoo.org>
xorg-x11-6.8.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index b88ee0397329..d91e7e5f7969 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.0-r1.ebuild,v 1.28 2004/10/18 22:55:44 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.29 2004/10/19 06:13:23 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -210,10 +210,7 @@ pkg_setup() {
ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable"
ewarn "75dpi and 100dpi fonts. Your GTK+-1.2 fonts may look"
ewarn "screwy otherwise"
- fi
- if ! use bitmap-fonts
- then
ebeep 5
epause 10
fi
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index be79625dbfd3..7ecb93dd223f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.0-r2.ebuild,v 1.19 2004/10/18 18:29:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.20 2004/10/19 06:13:23 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -239,10 +239,7 @@ pkg_setup() {
ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable"
ewarn "75dpi and 100dpi fonts. Your GTK+-1.2 fonts may look"
ewarn "screwy otherwise"
- fi
- if ! use bitmap-fonts
- then
ebeep 5
epause 10
fi