Bad logic on BuildXprintLib. It should've been defined only when the rest of xprint...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2101febc3018d0c2dbb9f797d8de83bea87293d2..1c0165aef9154023c794b02c4e4bd4c055f99d19 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # 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.156 2004/10/13 20:37:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.157 2004/10/13 21:46:37 spyderous Exp $
+
+  13 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  Bad logic on BuildXprintLib. It should've been defined only when the rest of
+  xprint WASN'T built, because when xprint is built, it's turned on
+  automatically (#67400).
 
   13 Oct 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
   Stable on hppa.

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index d99b9ab6570b79c4bcb37bf5798ac3d515df694e..cba22577f93e6088ae078bf8e8cad76e899b04f8 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
-MD5 7662d06e155de0813d09cec110ce8433 ChangeLog 34848
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
+MD5 47b91dff67f3582f098d65ef84d57856 xorg-x11-6.8.0-r2.ebuild 43193
 MD5 896c81cfe6581f770f7ea0cc7c11b518 xorg-x11-6.7.0-r2.ebuild 38113
-MD5 f10d44e7c3da55ab229bae5cbbc79d87 xorg-x11-6.8.0-r1.ebuild 41405
-MD5 fdc3dffd39db1e2b9fd6b6453f846886 xorg-x11-6.8.0-r2.ebuild 43191
+MD5 1f03ef30510ae13cfdcca132161dfc35 xorg-x11-6.8.0-r1.ebuild 41410
+MD5 f03d22cf2e4722b7f08eedccc861f7a4 ChangeLog 35134
 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

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 04166351080df287d99e72679152c32f8ab12b3c..6c27cbab7d992604a6fc6155c9f51f23e1692624 100644 (file)
--- 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.23 2004/10/13 20:37:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.24 2004/10/13 21:46:37 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -493,7 +493,7 @@ host_def_setup() {
                # Make xprint optional
                use_build xprint BuildXprint
                # Build libXp even when xprint is off. It's just for clients, server
-               if use xprint
+               if ! use xprint
                then
                        echo "#define BuildXprintLib YES" >> ${HOSTCONF}
                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 413f7637c854dd6b744fc3b9b1cd67521d895d91..cbe2ca8711f1a35f68eecc7ff7c41d79546a12a4 100644 (file)
--- 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.14 2004/10/13 05:46:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.15 2004/10/13 21:46:37 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -539,7 +539,7 @@ host_def_setup() {
                # Make xprint optional
                use_build xprint BuildXprint
                # Build libXp even when xprint is off. It's just for clients, server
-               if use xprint
+               if ! use xprint
                then
                        echo "#define BuildXprintLib YES" >> ${HOSTCONF}
                fi