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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

8 files changed, 8 insertions, 305 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/Manifest b/x11-misc/xkeyboard-config/Manifest
index 415829944cce..9b90e46fbc69 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,19 +1,8 @@
-AUX add_missing_lsgt.patch 270 RMD160 2984483a8d8f7b8d7731b8afdabf4fb0019d2dec SHA1 b59f558232d6cc56718e05bb5f34e9db4ccb32e7 SHA256 5d4d0df3b209900f3357b5953be51c6c5ae2e017829a4b081d95d0637dfa92ad
-DIST xkeyboard-config-0.8.tar.bz2 410194 RMD160 f870d34f97c677a542fd953e3767b9516d10347c SHA1 5309e5e68343e6e6949c954bdbd9b54cb1c1d628 SHA256 55994318727ecdb61a7937862a87262b32c3655e2a39fb50cff514fb92793abb
-DIST xkeyboard-config-0.9.tar.bz2 471807 RMD160 2b6e127e0e4728c4c0ea4014bed0f383f80b88a2 SHA1 05139163da656001fd837c6678254665c0d8ca00 SHA256 bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
 DIST xkeyboard-config-1.1.tar.bz2 540972 RMD160 a127ab79ba3d6afac487baa34d8f6b97f46d72c6 SHA1 56aae0b152f468c0627637e632cbfc1527f26a62 SHA256 fef905029f033859c7f8897f19dce6b7f10d107c51b8ad7c782214d7b2035ce6
-DIST xkeyboard-config-1.2.tar.bz2 586629 RMD160 a42f603630dd6ef67fb281207a022e55b79f3007 SHA1 d258d46dd2c5255aa60d489810ea246d5d224881 SHA256 64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7
-DIST xkeyboard-config-1.3.tar.bz2 592158 RMD160 e496233ba058125a46d585cd262df95eaa4a1e7c SHA1 1bc9bb0eeb9ffe6d044cc2c7b5853b5f4d9a5277 SHA256 49f02ed7b0b246a640fb129fcb3d24d7560305bb6f04e69b09739554857f79f5
-DIST xkeyboard-config-1.4.tar.bz2 559151 RMD160 c6c655c58b25ff81df48064eb29d2e7142b2556d SHA1 7ad0ff286233b3569ea38ab951f61efb2e4745b9 SHA256 921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1
 DIST xkeyboard-config-1.5.tar.bz2 571579 RMD160 d0eccaab7a517e45a71f1c1d4da1b99903cab708 SHA1 d446a8ca9bff44499b950a58d046b87153c13fa9 SHA256 ce15ff22ad6bc0ff7ae735d5ec65dd6dfd736d7eef0cf5ff394f823e663447e4
 DIST xkeyboard-config-1.6.tar.bz2 631474 RMD160 a2cf0bc65e90c3244612660fb896dd9fd03b878a SHA1 312f2e142f7d2bea6cabe6fcd8da4fb6c0711396 SHA256 50784b02a434887c5abd1b7e73986eb6cad8a7efa79248bfc192f1f1769a3f9a
-EBUILD xkeyboard-config-0.8-r1.ebuild 1785 RMD160 96114db7001e988349ef1c80393991697f62352a SHA1 d19ee0ad967f6652bf54c743a4bee27f6dabbe6d SHA256 5b14670969d45c6da2a388adf57d33334ca14bcfc8a1cbfba903f7e0ba8f7699
-EBUILD xkeyboard-config-0.9.ebuild 1679 RMD160 aebf1d526df29a8691e198a4ab7ad6c061e318f7 SHA1 21a3d7d152d0c5b0a6219b194bb6f01d96b0066d SHA256 41446663656cc8eb61a6d8fdc34099fc8badc5672f4a4e9eae80c3a71ade28df
 EBUILD xkeyboard-config-1.1.ebuild 1574 RMD160 ebfbc9efe2ce4f8715e20ffac7037e3f0377dcfa SHA1 d7d6b6dbe90368cd33d63fb909ffd096ea7b5d68 SHA256 dd6632c788e80b059cf498a54a4b9ba52e3d7b91ac6ed239885b00f172108566
-EBUILD xkeyboard-config-1.2.ebuild 1584 RMD160 690cfc9308e9a7c024e498c99d984552301aa339 SHA1 73b30ce915ee300dd8c874aa75998e6ea145c67e SHA256 070920957f6691e845c960a43f3f22a949b3852856f40cfa489662679c09e9d9
-EBUILD xkeyboard-config-1.3.ebuild 1584 RMD160 c0f16e53b808df5ba7c7a9d23a83bb49032b1060 SHA1 1179cf4d5a183c64a4b584c89da1a8c429339163 SHA256 029be02cbca168c5ed6e45082c6170381bafba6b115e8294d15cf863c52c82f9
-EBUILD xkeyboard-config-1.4.ebuild 1579 RMD160 56a9d8fe0c963e2b389650ad71d36aa839f07c94 SHA1 66d30cecc4998c6cf05663e36330da86b1cd17e2 SHA256 da6376caf6449e845e3d56e82bcee2127cdd7be01e9ac447993536b42b5a8bdb
 EBUILD xkeyboard-config-1.5.ebuild 1614 RMD160 b006e4c3ac3fbb43e7a61fef2bc3d9fb2f5df904 SHA1 dad348bc7e617adc83305e9680e7e101f3849060 SHA256 0477ad54f77910c69829626b8a995c08dc47193e8e481f8008644cbac8f9218b
 EBUILD xkeyboard-config-1.6.ebuild 982 RMD160 39120154de3cfec7f6b549c11b343543450bb1a4 SHA1 641f6bc3bd38082af2b60abf19b09512504e0d52 SHA256 ed755bd8d4748c21a1808a1954eb28faf49d229468688a9bbe80ef63029400ac
-MISC ChangeLog 10158 RMD160 b539f8927bb954388e998c2c40a5645882a84d20 SHA1 ddeee480f1f6c86a4ee1a661646fc34118c31bfb SHA256 fad5b12d56c123b0a65f2e0b8d6f53e5a930899b5467cde612c69dca7b19b714
+MISC ChangeLog 10437 RMD160 d4e677e510daa3289bf05b850d8461513616c50a SHA1 b413ce4391114d41b4e4a120efc597ad011a4046 SHA256 62aa9dd1e7ad89c5acfb1119de347ef04a1684e4a5ddfc8cc6fefe89ae285282
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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"
-}