diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-20 23:50:35 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-20 23:50:35 +0000 |
| commit | eb09e2bb8bc6532cf75880b8d329d59aa42b2d0a (patch) | |
| tree | c7cd3ac23b80e1892c68a0a2190513cd5991e29c /x11-misc | |
| parent | Bump, fixes memory leaks. Drop old. (diff) | |
| download | gentoo-2-eb09e2bb8bc6532cf75880b8d329d59aa42b2d0a.tar.gz gentoo-2-eb09e2bb8bc6532cf75880b8d329d59aa42b2d0a.tar.bz2 gentoo-2-eb09e2bb8bc6532cf75880b8d329d59aa42b2d0a.zip | |
Version bump.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild | 48 |
2 files changed, 55 insertions, 1 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 44893e24e1e6..a20f0fcad6cd 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.153 2012/01/19 21:40:16 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.154 2012/01/20 23:50:35 ssuominen Exp $ + +*xkeyboard-config-2.5 (20 Jan 2012) + + 20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + +xkeyboard-config-2.5.ebuild: + Version bump. 19 Jan 2012; Michael Weber <xmw@gentoo.org> xkeyboard-config-2.4.1-r3.ebuild: arm stable (security bug 399347) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild new file mode 100644 index 000000000000..f4e2a16eefa7 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.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.5.ebuild,v 1.1 2012/01/20 23:50:35 ssuominen 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/${P}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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.1 + >=x11-libs/libX11-1.4.2" +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 +} |