From: Donnie Berkholz Date: Mon, 11 Oct 2004 07:53:23 +0000 (+0000) Subject: Build libXp even when USE=-xprint, at ajax's suggestion. RH does the same. USE=-xprin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=394cd73b05d6bd7d3c006f072931f3ad8607c9c3;p=gentoo.git Build libXp even when USE=-xprint, at ajax's suggestion. RH does the same. USE=-xprint now disables the Xprt server and clients. This means we can remove xprint from make.defaults. --- diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index daed404e98c4..277bb6aa482d 100644 --- 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.135 2004/10/11 07:47:37 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.136 2004/10/11 07:53:23 spyderous Exp $ + + 11 Oct 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r1.ebuild: + Build libXp even when USE=-xprint, at ajax's suggestion. RH does the same. + USE=-xprint now disables the Xprt server and clients. This means we can remove + xprint from make.defaults. 11 Oct 2004; Donnie Berkholz ; xorg-x11-6.8.0-r1.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index ce0d78d4c7a7..7adaed6b435f 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,6 +1,6 @@ -MD5 fac1677c2444f648268f2bbcb695ae1c ChangeLog 30195 +MD5 ba829f0d6af7f509c6d5e73edbd519ca ChangeLog 30466 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 MD5 c32f9bc44ffd10b49297b4898097096b xorg-x11-6.7.0-r2.ebuild 38142 -MD5 46fb6d5a7539b37b4806d2450e8c1503 xorg-x11-6.8.0-r1.ebuild 41398 +MD5 1f38931397ace3460858a03cab0982ed xorg-x11-6.8.0-r1.ebuild 41346 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r1 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 650e5d1cfd6f..b0fd28115ab8 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.15 2004/10/11 07:47:37 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.16 2004/10/11 07:53:23 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -204,7 +204,7 @@ pkg_setup() { [ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib - # Echo a message to the user about xprint and bitmap-fonts + # Echo a message to the user about bitmap-fonts if ! use bitmap-fonts then ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable" @@ -212,14 +212,7 @@ pkg_setup() { ewarn "screwy otherwise" fi - if ! use xprint - then - ewarn "Please emerge thie with USE=\"xprint\" to enable" - ewarn "the Xprint extenstion -- Motif and motif apps will break" - ewarn "without it." - fi - - if ! use bitmap-fonts || ! use xprint + if ! use bitmap-fonts then ebeep 5 epause 10 @@ -496,6 +489,11 @@ 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 + then + echo "#define BuildXprintLib YES" >> ${HOSTCONF} + fi # End the host.def definitions here eend 0