From 0a580069931b41ad8d314c81f4923f497a6642be Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Tue, 19 Oct 2004 06:13:23 +0000 Subject: [PATCH] Combine two consecutive instances of "use ! bitmap-fonts." --- x11-base/xorg-x11/ChangeLog | 6 +++++- x11-base/xorg-x11/Manifest | 10 +++++----- x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild | 5 +---- x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 5 +---- 4 files changed, 12 insertions(+), 14 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 ; + 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 xorg-x11-6.8.0-r1.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 59e4f58fbc19..b424937ef5c7 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ -MD5 ca34ddd369d94ea86b0774e029f54efb xorg-x11-6.7.0-r2.ebuild 38072 -MD5 40966237c98f03b8372c039d14e567dc xorg-x11-6.8.0-r2.ebuild 43488 -MD5 5107b6e5bc11caab4d535811ca973a62 xorg-x11-6.8.0-r1.ebuild 41349 -MD5 5ed9b45160454b77207bb5188979087a ChangeLog 35895 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 +MD5 fec09eef46993f558e07cc9e0ac549d9 xorg-x11-6.8.0-r2.ebuild 43455 +MD5 ca34ddd369d94ea86b0774e029f54efb xorg-x11-6.7.0-r2.ebuild 38072 +MD5 c81b82b9a07e0975156358918886607e xorg-x11-6.8.0-r1.ebuild 41319 +MD5 53dc6665dae1e55a1c2c5d6841eb12f3 ChangeLog 36069 +MD5 5f6772219f532c3baf3fb3ceecf1ab65 files/digest-xorg-x11-6.8.0-r2 906 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 -MD5 5f6772219f532c3baf3fb3ceecf1ab65 files/digest-xorg-x11-6.8.0-r2 906 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 -- 2.26.2