From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q6gPZ-0000pf-5R for garchives@archives.gentoo.org; Mon, 04 Apr 2011 09:49:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B6871C036; Mon, 4 Apr 2011 09:49:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1EB701C036 for ; Mon, 4 Apr 2011 09:49:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6D311B4079 for ; Mon, 4 Apr 2011 09:49:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D2C7B80065 for ; Mon, 4 Apr 2011 09:49:20 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: Subject: [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: ec974e66d42f5404d674f3f21110397de0a0956a Date: Mon, 4 Apr 2011 09:49:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 451ad6ebb2cea04949f7acac34e3bfb5 commit: ec974e66d42f5404d674f3f21110397de0a0956a Author: Tomas Chvatal gentoo org> AuthorDate: Mon Apr 4 09:43:16 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Mon Apr 4 09:43:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Dec974e66 [x11-misc/xkeyboard-config] sync with main tree --- .../xkeyboard-config/xkeyboard-config-9999.ebuild | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11= -misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 05b16ca..d222741 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -1,18 +1,17 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-c= onfig-2.2.ebuild,v 1.1 2011/04/04 09:48:39 scarabeus Exp $ =20 EAPI=3D4 =20 XORG_STATIC=3Dno - inherit xorg-2 =20 EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/xkeyboard-config" =20 DESCRIPTION=3D"X keyboard configuration database" HOMEPAGE=3D"http://www.freedesktop.org/wiki/Software/XKeyboardConfig" -[[ ${PV} =3D=3D *9999* ]] || SRC_URI=3D"${BASE_INDIVIDUAL_URI}/data/${PN= }/${P}.tar.bz2" +[[ ${PV} =3D=3D *9999* ]] || SRC_URI=3D"${XORG_BASE_INDIVIDUAL_URI}/data= /${PN}/${P}.tar.bz2" =20 KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc= -solaris ~x86-solaris" IUSE=3D"" @@ -20,14 +19,18 @@ IUSE=3D"" LICENSE=3D"MIT" SLOT=3D"0" =20 -RDEPEND=3D"x11-apps/xkbcomp" +RDEPEND=3D"x11-apps/xkbcomp + >=3Dx11-libs/libX11-1.4.2" DEPEND=3D"${RDEPEND} + x11-proto/xproto >=3Ddev-util/intltool-0.30 dev-perl/XML-Parser" =20 +# do not check for runtime deps CONFIGURE_OPTIONS=3D" --with-xkb-base=3D\"${EPREFIX}/usr/share/X11/xkb\" --enable-compat-rules + --disable-runtime-deps --with-xkb-rules-symlink=3Dxorg" =20 src_prepare() { @@ -40,5 +43,6 @@ src_prepare() { src_compile() { # cleanup to make sure .dir files are regenerated # bug #328455 c#26 - xorg-2_src_compile clean all + xorg-2_src_compile clean + xorg-2_src_compile }