x11-misc/xkeyboard-config: drop old ebuilds (will drop 1.1 later)

(Portage version: 2.2_rc33/cvs/Linux i686)

7 files changed, 7 insertions, 293 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index ca3da1075981..372e9cf5216f 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.67 2009/06/23 21:14:13 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.68 2009/06/23 21:19:44 remi Exp $
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org>
+  -xkeyboard-config-0.8-r1.ebuild, -xkeyboard-config-0.9.ebuild,
+  -xkeyboard-config-1.2.ebuild, -xkeyboard-config-1.3.ebuild,
+  -xkeyboard-config-1.4.ebuild, -files/add_missing_lsgt.patch:
+  drop old ebuilds (will drop 1.1 later)
 
   23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.6.ebuild:
   drop accidental stable alpha keyword on 1.6
diff --git a/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch b/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch
deleted file mode 100644
index 0f1f3752acbd..000000000000
--- a/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- keycodes/evdev	2006/02/21 23:55:01	1.1
-+++ keycodes/evdev	2006/04/19 23:56:39	1.2
-@@ -346,6 +346,7 @@
- 	// <META> =   156; // <I1C>
- 	// <SUPR> =   127; // <U7F>
- 	// <HYPR> =   128; // <U80>
-+	<LSGT> = 94;
- 
- 	indicator 1 = "Caps Lock";
- 	indicator 2 = "Num Lock";
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild
deleted file mode 100644
index 2b32417de622..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild,v 1.12 2009/05/05 17:41:19 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X keyboard configuration database"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-pkg_setup() {
-	# (#130590) The old XKB directory can screw stuff up
-	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
-	if [[ -d ${DIR} ]] ; then
-		eerror "Directory ${DIR} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${DIR}"
-	fi
-
-	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
-	# let us overwrite a directory with a file
-	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
-	if [[ -d ${PC} ]] ; then
-		eerror "Directory ${PC} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${PC}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #145097
-	epatch "${FILESDIR}"/add_missing_lsgt.patch
-}
-
-src_compile() {
-	econf \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--enable-compat-rules \
-		--disable-xkbcomp-symlink \
-		--with-xkb-rules-symlink=xorg \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
-	doenvd "${T}"/10xkeyboard-config
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.9.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.9.ebuild
deleted file mode 100644
index 084005b88c6e..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.9.ebuild,v 1.10 2009/05/05 17:41:19 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X keyboard configuration database"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-pkg_setup() {
-	# (#130590) The old XKB directory can screw stuff up
-	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
-	if [[ -d ${DIR} ]] ; then
-		eerror "Directory ${DIR} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${DIR}"
-	fi
-
-	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
-	# let us overwrite a directory with a file
-	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
-	if [[ -d ${PC} ]] ; then
-		eerror "Directory ${PC} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${PC}"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--enable-compat-rules \
-		--disable-xkbcomp-symlink \
-		--with-xkb-rules-symlink=xorg \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
-	doenvd "${T}"/10xkeyboard-config
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild
deleted file mode 100644
index 6347d9973175..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.5 2009/05/05 17:41:19 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X keyboard configuration database"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-pkg_setup() {
-	# (#130590) The old XKB directory can screw stuff up
-	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
-	if [[ -d ${DIR} ]] ; then
-		eerror "Directory ${DIR} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${DIR}"
-	fi
-
-	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
-	# let us overwrite a directory with a file
-	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
-	if [[ -d ${PC} ]] ; then
-		eerror "Directory ${PC} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${PC}"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--enable-compat-rules \
-		--disable-xkbcomp-symlink \
-		--with-xkb-rules-symlink=xorg \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.3.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.3.ebuild
deleted file mode 100644
index 7e7f8298d9f1..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 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.3.ebuild,v 1.3 2009/05/05 17:41:19 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X keyboard configuration database"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-pkg_setup() {
-	# (#130590) The old XKB directory can screw stuff up
-	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
-	if [[ -d ${DIR} ]] ; then
-		eerror "Directory ${DIR} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${DIR}"
-	fi
-
-	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
-	# let us overwrite a directory with a file
-	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
-	if [[ -d ${PC} ]] ; then
-		eerror "Directory ${PC} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${PC}"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--enable-compat-rules \
-		--disable-xkbcomp-symlink \
-		--with-xkb-rules-symlink=xorg \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild
deleted file mode 100644
index 1191ed44c701..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 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.4.ebuild,v 1.3 2008/10/23 09:39:36 remi Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X keyboard configuration database"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE=""
-RDEPEND="!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser
-	x11-apps/xkbcomp"
-
-pkg_setup() {
-	# (#130590) The old XKB directory can screw stuff up
-	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
-	if [[ -d ${DIR} ]] ; then
-		eerror "Directory ${DIR} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${DIR}"
-	fi
-
-	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
-	# let us overwrite a directory with a file
-	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
-	if [[ -d ${PC} ]] ; then
-		eerror "Directory ${PC} should be"
-		eerror "manually deleted/renamed/relocated before installing!"
-		die "Manually remove ${PC}"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--enable-compat-rules \
-		--disable-xkbcomp-symlink \
-		--with-xkb-rules-symlink=xorg \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}