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

[Donnie Berkholz (dberkholz)]

dberkholz    08/01/30 23:57:16

  Modified:             ChangeLog
  Added:                xkeyboard-config-1.2.ebuild
  Log:
  Bump.
  (Portage version: 2.1.4)

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

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	27 Jan 2008 19:18:32 -0000	1.44
+++ ChangeLog	30 Jan 2008 23:57:15 -0000	1.45
@@ -1,6 +1,12 @@
 # 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.44 2008/01/27 19:18:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.45 2008/01/30 23:57:15 dberkholz Exp $
+
+*xkeyboard-config-1.2 (30 Jan 2008)
+
+  30 Jan 2008; Donnie Berkholz <dberkholz@g.o>;
+  +xkeyboard-config-1.2.ebuild:
+  Bump.
 
   27 Jan 2008; Raúl Porcel <armin76@g.o>
   xkeyboard-config-1.1.ebuild:



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

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

Index: xkeyboard-config-1.2.ebuild
===================================================================
# 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.2.ebuild,v 1.1 2008/01/30 23:57:15 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() {
	emake DESTDIR="${D}" install || die "install failed"
}



-- 
gentoo-commits@l.g.o mailing list