From: "Tomas Chvatal" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
Date: Mon, 4 Apr 2011 09:49:20 +0000 (UTC) [thread overview]
Message-ID: <ec974e66d42f5404d674f3f21110397de0a0956a.scarabeus@gentoo> (raw)
commit: ec974e66d42f5404d674f3f21110397de0a0956a
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 09:43:16 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 09:43:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ec974e66
[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-config-2.2.ebuild,v 1.1 2011/04/04 09:48:39 scarabeus Exp $
EAPI=4
XORG_STATIC=no
-
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
DESCRIPTION="X keyboard configuration database"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
KEYWORDS="~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=""
@@ -20,14 +19,18 @@ IUSE=""
LICENSE="MIT"
SLOT="0"
-RDEPEND="x11-apps/xkbcomp"
+RDEPEND="x11-apps/xkbcomp
+ >=x11-libs/libX11-1.4.2"
DEPEND="${RDEPEND}
+ x11-proto/xproto
>=dev-util/intltool-0.30
dev-perl/XML-Parser"
+# do not check for runtime deps
CONFIGURE_OPTIONS="
--with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
--enable-compat-rules
+ --disable-runtime-deps
--with-xkb-rules-symlink=xorg"
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
}
next reply other threads:[~2011-04-04 9:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 9:49 Tomas Chvatal [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-04-15 17:21 [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/ Michał Górny
2011-07-30 2:46 Matt Turner
2012-05-30 9:58 Chi-Thanh Christopher Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ec974e66d42f5404d674f3f21110397de0a0956a.scarabeus@gentoo \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox