diff options
| author |   Brandon Hale <tseng@gentoo.org> | 2004-08-14 01:41:19 +0000 |
|---|---|---|
| committer | Brandon Hale <tseng@gentoo.org> | 2004-08-14 01:41:19 +0000 |
| commit | f5ca7136388e2ce1faaada27a8cf09fad971041f (patch) | |
| tree | 8a281126b0fcc177ae9b80bc6e389cc7a227a950 /x11-base | |
| parent | Added ~sparc keyword. (Manifest recommit) (diff) | |
| download | gentoo-2-f5ca7136388e2ce1faaada27a8cf09fad971041f.tar.gz gentoo-2-f5ca7136388e2ce1faaada27a8cf09fad971041f.tar.bz2 gentoo-2-f5ca7136388e2ce1faaada27a8cf09fad971041f.zip | |
Minor adjustment to einfo for USE=dlloader, rework sed to replace keyboard with kbd driver, move that bit into setup_config_files and clean up that function a bit.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild | 28 |
2 files changed, 17 insertions, 18 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 0ed3669f1330..db6e035b9893 100644 --- 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.88 2004/08/13 21:02:57 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.89 2004/08/14 01:41:19 tseng Exp $ + + 13 Aug 2004; Brandon Hale <tseng@gentoo.org> xorg-x11-6.7.99.2.ebuild: + Minor adjustment to einfo for USE=dlloader, rework sed to replace keyboard + with kbd driver, move that bit into setup_config_files and clean up that + function a bit. *xorg-x11-6.7.99.2 (13 Aug 2004) diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild index 4ff342be7029..7dfde0635916 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.99.2.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.7.99.2.ebuild,v 1.2 2004/08/13 21:11:20 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild,v 1.3 2004/08/14 01:41:19 tseng Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -274,7 +274,7 @@ host_def_setup() { echo "#define DoLoadableServer NO" >>config/cf/host.def else if use dlloader ; then - einfo "Setting DoLoadableServer/MakeDllModules to YES for etdyn building" + einfo "Setting DoLoadableServer/MakeDllModules to YES." echo "#define DoLoadableServer YES" >> config/cf/host.def echo "#define MakeDllModules YES" >> config/cf/host.def fi @@ -815,9 +815,15 @@ setup_config_files() { cp ${ROOT}${FILE} ${T}${DIR} # New font paths sed -i "s,/usr/X11R6/lib/X11/fonts,/usr/share/fonts,g" ${T}${FILE} - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*"XkbRules".*$::g" ${T}${FILE} + + if [ "${FILE}" = "/etc/X11/xorg.conf" ] + then + # "keyboard" driver is deprecated and will be removed, switch to "kbd" + sed -i "s:^.*Driver.*"keyboard".*$:^.*Driver.*"kbd":g" ${T}${FILE} + # Work around upgrade problem where people have + # Option "XkbRules" "xfree86" in their config file + sed -i "s:^.*Option.*"XkbRules".*$::g" ${T}${FILE} + fi dodir ${DIR} insinto ${DIR} @@ -826,16 +832,6 @@ setup_config_files() { done } -update_config_files() { - # The new keyboard driver is kbd instead of keyboard - if [ "${ROOT}" = "/" ] - then - sed 's:"keyboard":"kbd":' \ - ${ROOT}/etc/X11/xorg.conf > ${ROOT}/etc/X11/._cfg0001_xorg.conf - fi -} - - src_install() { unset MAKE_OPTS @@ -1255,8 +1251,6 @@ print_info() { pkg_postinst() { - update_config_files - env-update if [ "${ROOT}" = "/" ] |