Version bump. Drop older.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 25 insertions, 44 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index c23c5f72adca..de990a2ed916 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -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.122 2011/03/18 15:34:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.123 2011/04/04 09:48:39 scarabeus Exp $
+
+*xkeyboard-config-2.2 (04 Apr 2011)
+
+  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.9.ebuild, -xkeyboard-config-2.0-r1.ebuild,
+  +xkeyboard-config-2.2.ebuild:
+  Version bump. Drop older.
 
   18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   xkeyboard-config-1.9.ebuild, xkeyboard-config-2.0-r1.ebuild:
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
deleted file mode 100644
index 96e5252c825d..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-1.9.ebuild,v 1.11 2011/03/18 15:34:05 scarabeus Exp $
-
-EAPI=3
-
-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"
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/xkeyboard-config/${P}.tar.bz2"
-
-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"
-SLOT="0"
-
-RDEPEND="x11-apps/xkbcomp"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-CONFIGURE_OPTIONS="
-	--with-xkb-base=${EPREFIX}/usr/share/X11/xkb
-	--enable-compat-rules
-	--with-xkb-rules-symlink=xorg"
-
-src_install() {
-	xorg-2_src_install
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
-	doenvd "${T}"/10xkeyboard-config
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.0-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild
index 3f50b377724e..d222741e7959 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.0-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild
@@ -1,8 +1,8 @@
 # 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.0-r1.ebuild,v 1.9 2011/03/18 15:34:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.ebuild,v 1.1 2011/04/04 09:48:39 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 XORG_STATIC=no
 inherit xorg-2
@@ -11,24 +11,35 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/xkeyboard-config/${P}.tar.bz2"
+[[ ${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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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"
 SLOT="0"
 
-RDEPEND="x11-apps/xkbcomp"
+RDEPEND="x11-apps/xkbcomp
+	>=x11-libs/libX11-1.4.2"
 DEPEND="${RDEPEND}
+	x11-proto/xproto
 	>=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
+	--with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
 	--enable-compat-rules
+	--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