Version bump. Drop older.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 38 insertions, 49 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/Manifest b/x11-misc/xkeyboard-config/Manifest
index 3b948bc64b4d..048e0d1a920c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,8 +1,16 @@
-DIST xkeyboard-config-1.9.tar.bz2 650829 RMD160 a5d5561b4bcfc3c442c0b8c82ee4478d9e630398 SHA1 2a3f29d003c0fe23cb6c8b4389bb7002c66b557c SHA256 2b519c2ce4a013a00f68c288ced573002a9ce37120f4f9dde0fda2549a8ac235
-DIST xkeyboard-config-2.0.tar.bz2 656757 RMD160 d8dcddff34ab96c2e85b2ebfafa8edb287df4d6a SHA1 3959678edd23368d208738e979dc5a605c155bee SHA256 d71b3947b8d6f9b68ebbb7df79d98f7cf5fb8cc644dfdba3cb069570bbd568a1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
-EBUILD xkeyboard-config-1.9.ebuild 1099 RMD160 5e7e5e02d907fdf3d0747d2b0758d581e569e6a9 SHA1 40ed909ad9bb4830e7eb7488c4080881a5046d7f SHA256 27b820d19c969ff4047a97d9519296f96a8e2983236a2842738d2ffc2562c3c8
-EBUILD xkeyboard-config-2.0-r1.ebuild 1080 RMD160 0e48c70cff9b01bf9c22fd441a1518e97ddb11ce SHA1 8e95067d083efa2692c67c3b6c4b964fe4b98d16 SHA256 47e1e9c846c029cd6a82b41e1814143d86ceeb4928c0e687c1e0bfb6bb34cc0a
+DIST xkeyboard-config-2.2.tar.bz2 737046 RMD160 1d445bf195ddecf07e8711244a2847baf52778ea SHA1 442c1803f5a7beb0fa16801d6c0a2bebc05472c1 SHA256 61e6a512e91d10d31906825cef1444586e62b0d0ad02f3cf6820aaa7e02a8dc3
 EBUILD xkeyboard-config-2.1.ebuild 1096 RMD160 c5659abced30f58c52542455715d7ae02231d884 SHA1 cc4d14382573b669e7a7f0a03f8afb15b7547859 SHA256 96895129730c0e4032d703d5260ad204e91a505b755d217c642b07bf8ebccbb5
-MISC ChangeLog 17101 RMD160 9e52a10e7a5d0ae9b5165a53417325d605a493b3 SHA1 884afaf95d145d50d7ea71fc07dd243701d98942 SHA256 ad764721a4c54d8f47a338d6af9f0d4470b7479c8b591335d848cee732793833
+EBUILD xkeyboard-config-2.2.ebuild 1328 RMD160 0b84e4a39b82fa0d5d2e4a8ecc85b5ba5984969d SHA1 53b4e2cff0388689e758c72038984f44951c529f SHA256 2a0f0b71d40f86e19e8fe439f2d30f6693eabdd6aec2afa53b339c540ed01c3c
+MISC ChangeLog 17319 RMD160 2e659a0283ff4bfb534f14782ae8b475d6804b3d SHA1 7fe1a8666b266ecdf1250f384eb15efb311093b2 SHA256 28393876eae6413e5b088ab3ecf144a08006c03a487617881fc1ead31bcd9d96
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ZkpsACgkQHB6c3gNBRYcljQCfRCh3Ui+1oRc8Vqcy1UZ3v6fh
+5nwAoKL6up1cDhtsmL0HSGv7F8jXav4D
+=X0vp
+-----END PGP SIGNATURE-----
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