[gentoo-commits] gentoo-x86 commit in x11-misc/xkeyboard-config: ChangeLog xkeyboard-config-2.4.1-r2.ebuild xkeyboard-config-2.4.1-r1.ebuild

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/11/21 00:00:00

  Modified:             ChangeLog
  Added:                xkeyboard-config-2.4.1-r2.ebuild
  Removed:              xkeyboard-config-2.4.1-r1.ebuild
  Log:
  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.145                x11-misc/xkeyboard-config/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?r1=1.144&r2=1.145

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog	14 Oct 2011 22:07:52 -0000	1.144
+++ ChangeLog	21 Nov 2011 00:00:00 -0000	1.145
@@ -1,6 +1,13 @@
 # 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.144 2011/10/14 22:07:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.145 2011/11/21 00:00:00 chithanh Exp $
+
+*xkeyboard-config-2.4.1-r2 (20 Nov 2011)
+
+  20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
+  -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild,
+  +files/xkeyboard-config-2.4.1-shift-backspace.patch:
+  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
 
 *xkeyboard-config-2.4.1-r1 (14 Oct 2011)
 



1.1                  x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: xkeyboard-config-2.4.1-r2.ebuild
===================================================================
# 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.4.1-r2.ebuild,v 1.1 2011/11/21 00:00:00 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/${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}
	x11-proto/xproto
	>=dev-util/intltool-0.30
	dev-perl/XML-Parser"

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
)

PATCHES=(
	"${FILESDIR}"/${P}-extended-function-keys.patch
	"${FILESDIR}"/${P}-shift-backspace.patch
)

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
}