diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-06-21 05:48:51 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-06-21 05:48:51 +0000 |
| commit | 0d423efc2a379473f660023e9469c6083b1919e1 (patch) | |
| tree | 7e3dd3d0a2390a7bc5c6626804268d2e15fbc072 /x11-misc/xkbdata | |
| parent | (#130590) Ensure that the old XKB directory gets out of the way (Patrick Alla... (diff) | |
| download | gentoo-2-0d423efc2a379473f660023e9469c6083b1919e1.tar.gz gentoo-2-0d423efc2a379473f660023e9469c6083b1919e1.tar.bz2 gentoo-2-0d423efc2a379473f660023e9469c6083b1919e1.zip | |
(#130590) Ensure that the old XKB directory gets out of the way (Patrick Allaert).
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'x11-misc/xkbdata')
| -rw-r--r-- | x11-misc/xkbdata/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xkbdata/xkbdata-1.0.1.ebuild | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/x11-misc/xkbdata/ChangeLog b/x11-misc/xkbdata/ChangeLog index 57f459684e9b..71b16fdf579b 100644 --- a/x11-misc/xkbdata/ChangeLog +++ b/x11-misc/xkbdata/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xkbdata # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.18 2006/02/14 22:54:59 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.19 2006/06/21 05:48:51 spyderous Exp $ + + 21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; xkbdata-1.0.1.ebuild: + (#130590) Ensure that the old XKB directory gets out of the way (Patrick + Allaert). 14 Feb 2006; Markus Rothe <corsair@gentoo.org> xkbdata-1.0.1.ebuild: Added ~ppc64 diff --git a/x11-misc/xkbdata/xkbdata-1.0.1.ebuild b/x11-misc/xkbdata/xkbdata-1.0.1.ebuild index 0e122605aab1..6f8f9f7423c9 100644 --- a/x11-misc/xkbdata/xkbdata-1.0.1.ebuild +++ b/x11-misc/xkbdata/xkbdata-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.5 2006/02/14 22:54:59 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-1.0.1.ebuild,v 1.6 2006/06/21 05:48:51 spyderous Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -13,6 +13,16 @@ RDEPEND="x11-apps/xkbcomp !x11-misc/xkeyboard-config" DEPEND="${RDEPEND}" +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 +} + src_install() { x-modular_src_install keepdir /var/lib/xkb |