/usr/libdir, not /usr/libdir/X11.

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 4c84b4f50faefb46e356a59b49dfd849315c73c0..8d416618255bc637a4bef074b2309465c1d99426 100644 (file)
--- 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.179 2004/10/28 20:31:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.180 2004/10/29 06:20:00 spyderous Exp $
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  /usr/libdir, not /usr/libdir/X11.
 
   28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index a4857ed86c49dbe7054be1630618ee41730de38c..5ee754e91d8153bf0041ccea1506935ea2b6c410 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
-MD5 72bb0e0be9b346a6009bcfcc0d702442 ChangeLog 38758
+MD5 880834d3fd0484c1885af0133fe93872 ChangeLog 38878
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 bb2a6dd709ede97d0b5a582d358285fd xorg-x11-6.8.0-r2.ebuild 43909
+MD5 60424645dd9b3195430fcec726eef6a4 xorg-x11-6.8.0-r2.ebuild 43837
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 4948d68fce0cc80c309f112474e37303 files/digest-xorg-x11-6.8.0-r2 906

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 6cbd7055f07f1e6c101ddf0ee9bb1b3fb79b8aa6..36d560f537eb43dc9e3b85152b8a3bc5f6382a58 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.34 2004/10/28 20:31:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.35 2004/10/29 06:20:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -691,7 +691,7 @@ compose_files_setup() {
        # Hack from Mandrake (update ours that just created Compose files for
        # all locales)
        local x
-       for x in $(find ${D}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
+       for x in $(find ${D}/usr/$(get_libdir)/locale/ -mindepth 1 -type d); do
                # make empty Compose files for some locales
                # CJK must not have that file (otherwise XIM don't works some times)
                case $(basename ${x}) in
@@ -711,7 +711,7 @@ compose_files_setup() {
        # Another hack from Mandrake -- to fix dead + space for the us
        # international keyboard
        local i
-       for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do
+       for i in ${D}/usr/$(get_libdir)/locale/*/Compose; do
                sed -i \
                        -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \
                        -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \
@@ -822,7 +822,7 @@ strip_execs() {
                done
                # Now do the libraries ...
                for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/$(get_libdir)}/*.so.* \
-                       ${D}/usr/{$(get_libdir),$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
+                       ${D}/usr/{$(get_libdir),$(get_libdir)/locale/$(get_libdir)/common}/*.so.*; do
                        if [ -f ${x} ]; then
                                echo "$(echo ${x/${D}})"
                                ${STRIP} --strip-debug ${x} || :
@@ -931,7 +931,7 @@ src_install() {
 
        # Fix permissions on locale/common/*.so
        local x
-       for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do
+       for x in ${D}/usr/$(get_libdir)/locale/$(get_libdir)/common/*.so*; do
                if [ -f ${x} ]; then
                        fperms 0755 ${x/${D}}
                fi
@@ -946,10 +946,10 @@ src_install() {
 
        # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can
        # mess up other things that use xmkmf
-       ebegin "Fixing $(get_libdir)/X11/config/host.def"
-               cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T}
+       ebegin "Fixing $(get_libdir)/config/host.def"
+               cp ${D}/usr/$(get_libdir)/config/host.def ${T}
                awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \
-                       ${T}/host.def > ${D}/usr/$(get_libdir)/X11/config/host.def \
+                       ${T}/host.def > ${D}/usr/$(get_libdir)/config/host.def \
                        || eerror "Munging host.def failed"
                # theoretically, /usr/lib/X11/config is a possible candidate for
                # config file management. If we find that people really worry about imake
@@ -975,7 +975,7 @@ src_install() {
        dosym ../X11R6/include/X11 /usr/include/X11
        dosym ../X11R6/include/DPS /usr/include/DPS
        dosym ../X11R6/include/GL /usr/include/GL
-       dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
+       dosym ../../usr/$(get_libdir)/xkb /etc/X11/xkb
 
        if use opengl; then
                fix_opengl_symlinks
@@ -993,7 +993,7 @@ src_install() {
        dosym ../../usr/X11R6/bin/Xorg /etc/X11/X
 
        # Fix perms
-       fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/X11R6/bin/dga
+       fperms 755 /usr/$(get_libdir)/xkb/geometry/sgi /usr/X11R6/bin/dga
 
        compose_files_setup
 
@@ -1112,26 +1112,26 @@ pkg_preinst() {
                rm -f ${ROOT}/etc/X11/app-defaults
        fi
 
-       if [ ! -L ${ROOT}/usr/$(get_libdir)/X11/app-defaults ] \
-               && [ -d ${ROOT}/usr/$(get_libdir)/X11/app-defaults ]; then
+       if [ ! -L ${ROOT}/usr/$(get_libdir)/app-defaults ] \
+               && [ -d ${ROOT}/usr/$(get_libdir)/app-defaults ]; then
                if [ ! -d ${ROOT}/etc/X11/app-defaults ]; then
                        mkdir -p ${ROOT}/etc/X11/app-defaults
                fi
 
-               mv -f ${ROOT}/usr/$(get_libdir)/X11/app-defaults ${ROOT}/etc/X11
+               mv -f ${ROOT}/usr/$(get_libdir)/app-defaults ${ROOT}/etc/X11
        fi
 
-       if [ -L ${ROOT}/usr/$(get_libdir)/X11/xkb ]; then
-               rm -f ${ROOT}/usr/$(get_libdir)/X11/xkb
+       if [ -L ${ROOT}/usr/$(get_libdir)/xkb ]; then
+               rm -f ${ROOT}/usr/$(get_libdir)/xkb
        fi
 
        if [ ! -L ${ROOT}/etc/X11/xkb ] \
                && [ -d ${ROOT}/etc/X11/xkb ]; then
-               if [ ! -d ${ROOT}/usr/$(get_libdir)/X11/xkb ]; then
-                       mkdir -p ${ROOT}/usr/$(get_libdir)/X11
+               if [ ! -d ${ROOT}/usr/$(get_libdir)/xkb ]; then
+                       mkdir -p ${ROOT}/usr/$(get_libdir)
                fi
 
-           mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir)/X11
+           mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir)
        fi
 
        # Run this even for USE=-opengl, to clean out old stuff from possible
@@ -1316,7 +1316,7 @@ pkg_postinst() {
                fi
        fi
 
-       for x in $(find ${ROOT}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
+       for x in $(find ${ROOT}/usr/$(get_libdir)/locale/ -mindepth 1 -type d); do
                # Remove old compose files we might have created incorrectly
                # CJK must not have that file (otherwise XIM don't works some times)
                case $(basename ${x}) in