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 | 0f53d9643110fa3d6f4d0866e27df892cb233ae0 (patch) | |
| tree | 90f96d8afc041b52606127c1ecbcf78e404c1cf3 /x11-base | |
| parent | Added ~sparc keyword. (diff) | |
| download | historical-0f53d9643110fa3d6f4d0866e27df892cb233ae0.tar.gz historical-0f53d9643110fa3d6f4d0866e27df892cb233ae0.tar.bz2 historical-0f53d9643110fa3d6f4d0866e27df892cb233ae0.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/Manifest | 8 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.99.2.ebuild | 28 |
3 files changed, 21 insertions, 22 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/Manifest b/x11-base/xorg-x11/Manifest index 2b3cbd7b8e18..87805ec0c549 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ -MD5 9e6ebeef839a05c27f6daf805b2a1749 xorg-x11-6.7.0-r2.ebuild 38107 +MD5 e5a4d3ea05a2a540ef53b98b82976826 ChangeLog 21930 MD5 7d41a3dbef1f1dfcb9944201c27009b9 xorg-x11-6.7.0-r1.ebuild 41872 -MD5 899531349d02e259790991e5e612191b xorg-x11-6.7.99.2.ebuild 39468 -MD5 50e16d819acb3d84b35e3b5160d6c622 ChangeLog 21688 +MD5 9e6ebeef839a05c27f6daf805b2a1749 xorg-x11-6.7.0-r2.ebuild 38107 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232 -MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906 +MD5 c3fbc9d1e0ecaf9bbeab837fac257758 xorg-x11-6.7.99.2.ebuild 39420 MD5 51c9e80b73eced56c98721ff90648866 files/digest-xorg-x11-6.7.0-r2 904 +MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906 MD5 a604c8c88698750bb3b72914dd12b062 files/digest-xorg-x11-6.7.99.2 510 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}" = "/" ] |