[gentoo-commits] gentoo-x86 commit in x11-misc/xkeyboard-config: ChangeLog xkeyboard-config-1.1.ebuild

[Donnie Berkholz (dberkholz)]

dberkholz    07/09/26 08:49:04

  Modified:             ChangeLog
  Added:                xkeyboard-config-1.1.ebuild
  Log:
  Bugfixes, some new layouts.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.37                 x11-misc/xkeyboard-config/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	10 Sep 2007 03:30:20 -0000	1.36
+++ ChangeLog	26 Sep 2007 08:49:03 -0000	1.37
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.36 2007/09/10 03:30:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.37 2007/09/26 08:49:03 dberkholz Exp $
+
+*xkeyboard-config-1.1 (26 Sep 2007)
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@g.o>;
+  +xkeyboard-config-1.1.ebuild:
+  Bugfixes, some new layouts.
 
   10 Sep 2007; Jeroen Roovers <jer@g.o> xkeyboard-config-0.9.ebuild:
   Stable for HPPA (bug #191615).



1.1                  x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild?rev=1.1&content-type=text/plain

Index: xkeyboard-config-1.1.ebuild
===================================================================
# Copyright 1999-2007 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.1.ebuild,v 1.1 2007/09/26 08:49:03 dberkholz 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
}



-- 
gentoo-commits@g.o mailing list