diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-09-27 00:16:48 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-09-27 00:16:48 +0000 |
commit | 99221dd46dade001cf4da5e33756f0f5efa5b851 (patch) | |
tree | ee3ed31418d602ac157d5a53fd9ecaadca77453e /x11-misc/xkeyboard-config | |
parent | stable ppc, bug #429056 (diff) | |
download | gentoo-2-99221dd46dade001cf4da5e33756f0f5efa5b851.tar.gz gentoo-2-99221dd46dade001cf4da5e33756f0f5efa5b851.tar.bz2 gentoo-2-99221dd46dade001cf4da5e33756f0f5efa5b851.zip |
Version bump.
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xkeyboard-config')
-rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 9 | ||||
-rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild | 4 | ||||
-rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild | 48 |
3 files changed, 57 insertions, 4 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index f2c2e6f5af30..fd66abfaa112 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.168 2012/08/26 19:31:08 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.169 2012/09/27 00:16:48 chithanh Exp $ + +*xkeyboard-config-2.7 (27 Sep 2012) + + 27 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +xkeyboard-config-2.7.ebuild, xkeyboard-config-2.4.1-r2.ebuild: + Version bump. 26 Aug 2012; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.6.ebuild: alpha/ia64/s390/sh/sparc stable wrt #419473 @@ -705,4 +711,3 @@ New, restructured, maintained package for XKB configuration data, expected to supercede xkbdata. Since it's the same collection of data files, keyworded ~arch for the same arches. - diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild index 39b812661931..8f1dd6275d92 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.4.1-r2.ebuild,v 1.5 2011/12/27 21:12:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild,v 1.6 2012/09/27 00:16:48 chithanh Exp $ EAPI=4 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild new file mode 100644 index 000000000000..075ac3f91481 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2012 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.7.ebuild,v 1.1 2012/09/27 00:16:48 chithanh Exp $ + +EAPI=4 + +XORG_STATIC=no +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=">=x11-apps/xkbcomp-1.2.3 + >=x11-libs/libX11-1.4.3" +DEPEND="${RDEPEND} + dev-util/intltool + >=x11-proto/xproto-7.0.20" + +XORG_CONFIGURE_OPTIONS=( + --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" + --enable-compat-rules + # do not check for runtime deps + --disable-runtime-deps + --with-xkb-rules-symlink=xorg +) + +src_prepare() { + xorg-2_src_prepare + if [[ ${XORG_EAUTORECONF} != no ]]; then + intltoolize --copy --automake || die + fi +} + +src_compile() { + # cleanup to make sure .dir files are regenerated + # bug #328455 c#26 + xorg-2_src_compile clean + xorg-2_src_compile +} |