Version bump. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 11 insertions, 147 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 25b7c3e8432c..a84aacbc28c5 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.201 2014/04/19 17:47:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.202 2014/05/30 14:44:08 chithanh Exp $
+
+*xkeyboard-config-2.12 (30 May 2014)
+
+  30 May 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.12.ebuild, -xkeyboard-config-2.10.1.ebuild,
+  -xkeyboard-config-2.6.ebuild, -xkeyboard-config-2.7.ebuild,
+  -xkeyboard-config-2.8.ebuild:
+  Version bump. Remove old.
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.11.ebuild:
   Stable for sparc, wrt bug #500368
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1.ebuild
deleted file mode 100644
index 4251104b6b12..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 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.10.1.ebuild,v 1.1 2013/10/04 10:12:14 chithanh Exp $
-
-EAPI=5
-
-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 ~arm-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
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.8.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.12.ebuild
index adad9d323eec..2571390dba91 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.8.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8.ebuild,v 1.2 2013/02/25 08:42:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.12.ebuild,v 1.1 2014/05/30 14:44:08 chithanh Exp $
 
 EAPI=5
 
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
deleted file mode 100644
index 3717877b9e1b..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.6.ebuild,v 1.8 2012/08/26 19:31:08 armin76 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
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild
deleted file mode 100644
index 86926307cbff..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 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.11 2013/01/04 18:03:26 jer 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
-}