Bug 315817 – x11-misc/xkeyboard-config-1.7: Prefix changes

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Jonathan Callen (RETIRED) 2010-04-17 23:33:03 UTC]

Please review and comment on the following changes to xkeyboard-config-1.7.ebuild. If you prefer, these can be committed as -r1.

--- /home/portage/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild 2010-01-19 16:46:41.342536819 -0500
+++ xkeyboard-config-1.7.ebuild 2010-04-17 19:30:06.711524196 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild,v 1.11 2010/01/19 20:28:30 armin76 Exp $
 
-EAPI="2"
+EAPI="3"
 
 if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git"
@@ -16,7 +16,7 @@ inherit ${GIT_ECLASS} autotools
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
        econf \
-               --with-xkb-base=/usr/share/X11/xkb \
+               --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
                --enable-compat-rules \
                --disable-xkbcomp-symlink \
                --with-xkb-rules-symlink=xorg \

[Comment 1 Tomáš Chvátal (RETIRED) 2010-04-18 11:46:59 UTC]

NAK, migrate to xorg-2 eclass too.

[Comment 2 Tomáš Chvátal (RETIRED) 2010-04-18 11:52:05 UTC]

just replace the inherit line.
And doublecheck if XORG_STATIC=no is not required to be set (see eclass manpages for explanation)

[Comment 3 Jonathan Callen (RETIRED) 2010-04-22 17:20:45 UTC]

Fixed in gx86 and overlay