diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-04-20 17:23:04 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-04-20 17:23:04 +0000 |
| commit | 2ce0824911beb0ff4ccf689d9c0d73ecd1e02cce (patch) | |
| tree | 397cb9ae446b5ae5cf3ba193f780e23529cd478e /x11-misc/xkeyboard-config | |
| parent | [net-wireless/wimax] Version bump (diff) | |
| download | gentoo-2-2ce0824911beb0ff4ccf689d9c0d73ecd1e02cce.tar.gz gentoo-2-2ce0824911beb0ff4ccf689d9c0d73ecd1e02cce.tar.bz2 gentoo-2-2ce0824911beb0ff4ccf689d9c0d73ecd1e02cce.zip | |
Migrate to XORG_CONFIGURE_OPTIONS array. This fixes bug #358637.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild (renamed from x11-misc/xkeyboard-config/xkeyboard-config-2.2.1.ebuild) | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 42f4ac590d57..ffa8f7f1ef62 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.124 2011/04/06 12:09:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.125 2011/04/20 17:23:04 mgorny Exp $ + +*xkeyboard-config-2.2.1-r1 (20 Apr 2011) + + 20 Apr 2011; Michał Górny <mgorny@gentoo.org> + -xkeyboard-config-2.2.1.ebuild, +xkeyboard-config-2.2.1-r1.ebuild: + Migrate to XORG_CONFIGURE_OPTIONS array. This fixes bug #358637. *xkeyboard-config-2.2.1 (06 Apr 2011) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild index e074fd2b04c0..30106e221751 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1.ebuild,v 1.1 2011/04/06 12:09:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild,v 1.1 2011/04/20 17:23:04 mgorny Exp $ EAPI=4 @@ -26,11 +26,13 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.30 dev-perl/XML-Parser" -# do not check for runtime deps -CONFIGURE_OPTIONS=" - --with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\" +XORG_CONFIGURE_OPTIONS=( + --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" --enable-compat-rules - --with-xkb-rules-symlink=xorg" + # do not check for runtime deps + --disable-runtime-deps + --with-xkb-rules-symlink=xorg +) src_prepare() { xorg-2_src_prepare |