diff options
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index ebaf17af3e4d..2cb06298dda8 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.90 2010/01/23 21:17:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.91 2010/04/18 22:32:06 abcd Exp $ + + 18 Apr 2010; Jonathan Callen <abcd@gentoo.org> + xkeyboard-config-1.7.ebuild: + Bump to EAPI=3, add prefix keywords 23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild: diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild index 153ea7bc222e..0d60a0bec681 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2010 Gentoo Foundation # 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 $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild,v 1.12 2010/04/18 22:32:06 abcd Exp $ -EAPI="2" +EAPI=3 if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git" EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" else + GIT_ECLASS= SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2" fi @@ -16,7 +17,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,11 +37,10 @@ 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 \ - || die "configure failed" + --with-xkb-rules-symlink=xorg } src_install() { |