Remove double definition of HOSTCONF. Thanks to Georgi Georgiev <chutz@gg3.net>.

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index e7e52b9fbc4f8a79de735750a166d32f6dd80c7e..57af399d5a829f6d1b936bcc38efa09448e444db 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.234 2004/12/07 02:13:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.235 2004/12/07 02:26:52 spyderous Exp $
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Remove double definition of HOSTCONF. Thanks to Georgi Georgiev
+  <chutz@gg3.net>.
 
   06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 310ff92c07f5d83de69c4744fb5eb926b9b85a3d..8a4b314115ae5f4f2cc9421094622fb87ccbd886 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 398036bb9c0b024279b79de650d294f9 xorg-x11-6.7.0-r2.ebuild 38087
 MD5 186fd28bc746a6e98ae52356c8246348 xorg-x11-6.8.0-r1.ebuild 41341
-MD5 3d9188676130a222340d7448d975b800 ChangeLog 54210
+MD5 e5b911b384e506b709b2474c58983c72 ChangeLog 54379
 MD5 b45f1c127c54662901d9e88a9dc7ad1e xorg-x11-6.7.0-r3.ebuild 38105
 MD5 1ad6566a5ebfc982d9f8567214e5b7e5 xorg-x11-6.8.0-r3.ebuild 39794
-MD5 ee8fc9e20561e14c7ef40148b7f3cfad xorg-x11-6.8.0-r4.ebuild 50656
+MD5 207ccccc4237a71682c05269d77805ae xorg-x11-6.8.0-r4.ebuild 50627
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 41e0d939ae0b5662c1d60247c0e3a812c54ed6ef..091e53e9001381df440330cd8b5d2f2e698f89c3 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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-r4.ebuild,v 1.23 2004/12/07 02:13:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.24 2004/12/07 02:26:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -142,8 +142,6 @@ PROVIDE="virtual/x11
 
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
 
-HOSTCONF="config/cf/host.def"
-
 pkg_setup() {
        FILES_DIR="${WORKDIR}/files"
        PATCHDIR="${WORKDIR}/patch"
@@ -570,7 +568,7 @@ check_use_combos() {
 ################
 
 host_def_setup() {
-       HOSTCONF=config/cf/host.def
+       HOSTCONF="config/cf/host.def"
 
        ebegin "Setting up ${HOSTCONF}"
                cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \