diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-12-07 03:48:15 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-12-07 03:48:15 +0000 |
| commit | b4af414daf778d7e2f9fa9a17d5819c632177a07 (patch) | |
| tree | 018ec933d51da38901aa0edb4859e795878f1478 /x11-base | |
| parent | All non-cascading sparc profiles are now deprecated. (diff) | |
| download | historical-b4af414daf778d7e2f9fa9a17d5819c632177a07.tar.gz historical-b4af414daf778d7e2f9fa9a17d5819c632177a07.tar.bz2 historical-b4af414daf778d7e2f9fa9a17d5819c632177a07.zip | |
Move from custom is_kernel() in x11.eclass to kernel_is() in linux-info.eclass. It's not maintained by us, and that's a plus in itself.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 9 |
3 files changed, 13 insertions, 7 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index a4baa4614b5c..3b98a75098b9 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.237 2004/12/07 02:43:17 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.238 2004/12/07 03:48:15 spyderous Exp $ + + 06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.0-r4.ebuild: + Move from custom is_kernel() in x11.eclass to kernel_is() in + linux-info.eclass. It's not maintained by us, and that's a plus in itself. 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 544cc8f10bdd..288871d0422a 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ 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 109f788d494ffc6f34d8f41914a22ff1 ChangeLog 54817 -MD5 97ca5256394b530335d71926e5ece298 xorg-x11-6.8.0-r4.ebuild 50537 +MD5 28650fe48ddb98246306fa1db4d1050a ChangeLog 55041 +MD5 c78d386df2aad6937ce9721f36db7fe5 xorg-x11-6.8.0-r4.ebuild 50549 MD5 b45f1c127c54662901d9e88a9dc7ad1e xorg-x11-6.7.0-r3.ebuild 38105 MD5 1ad6566a5ebfc982d9f8567214e5b7e5 xorg-x11-6.8.0-r3.ebuild 39794 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 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 cfd8d5e0c01a..ef85a8ce9b2d 100644 --- 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.26 2004/12/07 02:43:17 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.27 2004/12/07 03:48:15 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -30,7 +30,8 @@ # TARGET: 6.8.0-r4 # Same for /usr/X11R6/bin -inherit eutils flag-o-matic toolchain-funcs x11 +inherit eutils flag-o-matic toolchain-funcs x11 linux-info + # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -669,7 +670,7 @@ host_def_setup() { fi if ( [ -e "${ROOT}/usr/src/linux" ] \ - && [ ! $(is_kernel "2" "2") ] ) \ + && [ ! $(kernel_is "2" "2") ] ) \ || [ "$(uname -r | cut -d. -f1,2)" != "2.2" ]; then echo "#define HasLinuxInput YES" >> ${HOSTCONF} fi @@ -793,7 +794,7 @@ host_def_setup() { echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} fi if ( [ -e "${ROOT}/usr/src/linux" ] \ - && !( $(is_kernel "2" "6") ) ) \ + && !( $(kernel_is "2" "6") ) ) \ || [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then einfo "Building for kernels less than 2.6 requires special treatment" echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF} |