Clean up.

Package-Manager: portage-2.1.4

3 files changed, 5 insertions, 58 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index d22cdc48c097..aaf2c3f01e9d 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.45 2008/01/30 23:57:15 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.46 2008/01/31 04:41:37 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xkeyboard-config-0.8.ebuild:
+  Clean up.
 
 *xkeyboard-config-1.2 (30 Jan 2008)
 
diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8
deleted file mode 100644
index 5e692d8ed9bc..000000000000
--- a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48e694ebe816065670dda2a36f0581a2 xkeyboard-config-0.8.tar.bz2 410194
-RMD160 f870d34f97c677a542fd953e3767b9516d10347c xkeyboard-config-0.8.tar.bz2 410194
-SHA256 55994318727ecdb61a7937862a87262b32c3655e2a39fb50cff514fb92793abb xkeyboard-config-0.8.tar.bz2 410194
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild
deleted file mode 100644
index 38088d4a194c..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.11 2006/08/16 18:06:04 ranger 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"
-
-RDEPEND="x11-apps/xkbcomp
-	!x11-misc/xkbdata"
-DEPEND="${RDEPEND}
-	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
-}