Change LibDir to /usr/libdir/X11 instead of /usr/libdir. Remove some related hacks...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 0a1d2895f3e2de4dc62ca87905db3491bb28a635..e7e52b9fbc4f8a79de735750a166d32f6dd80c7e 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.233 2004/12/06 23:43:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.234 2004/12/07 02:13:11 spyderous Exp $
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Change LibDir to /usr/libdir/X11 instead of /usr/libdir. Remove some related
+  hacks, and fix paths of relevant things. Suggested by 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 f45a7b213bf5d77efd6939b953146a0cdd170754..310ff92c07f5d83de69c4744fb5eb926b9b85a3d 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 218f24d55774e6621f563691c1c217d0 ChangeLog 53956
+MD5 3d9188676130a222340d7448d975b800 ChangeLog 54210
 MD5 b45f1c127c54662901d9e88a9dc7ad1e xorg-x11-6.7.0-r3.ebuild 38105
 MD5 1ad6566a5ebfc982d9f8567214e5b7e5 xorg-x11-6.8.0-r3.ebuild 39794
-MD5 33e77a33d4f04b410b36a921d7f603cf xorg-x11-6.8.0-r4.ebuild 51914
+MD5 ee8fc9e20561e14c7ef40148b7f3cfad xorg-x11-6.8.0-r4.ebuild 50656
 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 c611708a8ae4ffd5122d426666a01b8ddc9cbc12..41e0d939ae0b5662c1d60247c0e3a812c54ed6ef 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.22 2004/12/06 23:43:36 spyderous Exp $
+# $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 $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -320,7 +320,7 @@ src_install() {
 
        # Fix perms
        if ! use minimal; then
-               fperms 755 /usr/$(get_libdir)/xkb/geometry/sgi /usr/X11R6/bin/dga
+               fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/X11R6/bin/dga
        fi
 
        compose_files_setup
@@ -598,7 +598,7 @@ host_def_setup() {
                # Saving this for a later revision
                # echo "#define BinDir /usr/bin" >> ${HOSTCONF}
                # /usr/X11R6/lib/X11
-               echo "#define LibDir /usr/$(get_libdir)" >> ${HOSTCONF}
+               echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
                # /usr/X11R6/lib with exception of /usr/X11R6/lib/X11
                echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
 
@@ -1017,17 +1017,12 @@ backward_compat_setup() {
        dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
 #      dosym ../share/bin /usr/X11R6/bin
 
-       # Another symlink for the keysym database (#70927)
-       dosym ../XKeysymDB /usr/$(get_libdir)/X11/XKeysymDB
-
-       # dev-java/sun-j2sdk wants /usr/X11R6/libdir/X11/config (#71654)
-       dosym ../../../$(get_libdir)/config /usr/X11R6/$(get_libdir)/X11/config
 }
 
 fix_permissions() {
        # Fix permissions on locale/common/*.so
        local x
-       for x in ${D}/usr/$(get_libdir)/locale/$(get_libdir)/common/*.so*; do
+       for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do
                if [ -f ${x} ]; then
                        fperms 0755 ${x/${D}}
                fi
@@ -1042,10 +1037,10 @@ fix_permissions() {
 }
 
 zap_host_def_cflags() {
-       ebegin "Fixing $(get_libdir)/config/host.def"
-               cp ${D}/usr/$(get_libdir)/config/host.def ${T}
+       ebegin "Fixing $(get_libdir)/X11/config/host.def"
+               cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T}
                awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \
-                       ${T}/host.def > ${D}/usr/$(get_libdir)/config/host.def \
+                       ${T}/host.def > ${D}/usr/$(get_libdir)/X11/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
@@ -1074,17 +1069,14 @@ setup_standard_symlinks() {
        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)/xkb /etc/X11/xkb
-       # Added one to reflect xkb move from /usr/X11R6/libdir/X11/xkb
-       # to /usr/libdir/xkb
-       dosym ../../$(get_libdir)/xkb /usr/X11R6/$(get_libdir)/X11/xkb
+       dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
 }
 
 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)/locale/ -mindepth 1 -type d); do
+       for x in $(find ${D}/usr/$(get_libdir)/X11/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
@@ -1104,7 +1096,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)/locale/*/Compose; do
+       for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do
                sed -i \
                        -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \
                        -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \
@@ -1242,7 +1234,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)/locale/$(get_libdir)/common}/*.so.*; do
+                       ${D}/usr/{$(get_libdir),$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
                        if [ -f ${x} ]; then
                                echo "$(echo ${x/${D}})"
                                ${STRIP} --strip-debug ${x} || :
@@ -1327,26 +1319,6 @@ migrate_usr_x11r6_lib() {
        # Put a symlink in its place if there's not one there
        [ ! -L ${ROOT}usr/X11R6/$(get_libdir) ] \
                && ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir)
-
-       # We also need to create a symlink from /usr/X11R6/libdir/X11/xkb
-       # to /usr/libdir/xkb, so libxklavier and xkb stuff is happy
-
-       einfo "Migrating from /usr/X11R6/$(get_libdir)/X11/xkb to /usr/$(get_libdir)/xkb..."
-       # Make the new dir if it doesn't already exist
-       [ ! -e ${ROOT}usr/$(get_libdir)/xkb ] \
-               && mkdir ${ROOT}usr/$(get_libdir)/xkb
-       # Move anything in the old xkb dir if it's not a symlink
-       [ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
-               && mv -f ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb/* \
-               ${ROOT}usr/$(get_libdir)/xkb
-       # Get rid of the directory if it's not a symlink
-       [ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
-               && rmdir ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb
-       # Add symlink to reflect xkb move from /usr/X11R6/libdir/X11/xkb
-       # to /usr/libdir/xkb
-       [ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
-               && ln -s ../../$(get_libdir)/xkb \
-               ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb
 }
 
 update_config_files() {
@@ -1585,7 +1557,7 @@ switch_opengl_implem() {
 }
 
 remove_old_compose_files() {
-       for x in $(find ${ROOT}/usr/$(get_libdir)/locale/ -mindepth 1 -type d); do
+       for x in $(find ${ROOT}/usr/$(get_libdir)/X11/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