* [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
@ 2011-04-15 17:21 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2011-04-15 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 49b66b6d664e4c9cdf134c84cbcd74dfc5d27555
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 17:11:40 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 17:21:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=49b66b6d
x11-misc/xkeyboard-config: Use XORG_CONFIGURE_OPTIONS array. This should fix bug #358637 (broken .pc file) as well.
(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
---
.../xkeyboard-config/xkeyboard-config-9999.ebuild | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index d222741..fa8980b 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -26,12 +26,13 @@ DEPEND="${RDEPEND}
>=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\"
+XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
--enable-compat-rules
+ # do not check for runtime deps
--disable-runtime-deps
- --with-xkb-rules-symlink=xorg"
+ --with-xkb-rules-symlink=xorg
+)
src_prepare() {
xorg-2_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
@ 2012-05-30 9:58 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 4+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-05-30 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 0a21b1975e0acf01d94d0fb1a8677be1861e42f9
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 09:59:00 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed May 30 09:59:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0a21b197
x11-misc/xkeyboard-config: sync with portage.
---
.../xkeyboard-config/xkeyboard-config-9999.ebuild | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 0eceb0c..5c45130 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: $
EAPI=4
@@ -11,20 +11,19 @@ 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="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
LICENSE="MIT"
SLOT="0"
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
- >=x11-libs/libX11-1.4.2"
+RDEPEND=">=x11-apps/xkbcomp-1.2.3
+ >=x11-libs/libX11-1.4.3"
DEPEND="${RDEPEND}
- x11-proto/xproto
- >=dev-util/intltool-0.30
- dev-perl/XML-Parser"
+ dev-util/intltool
+ >=x11-proto/xproto-7.0.20"
XORG_CONFIGURE_OPTIONS=(
--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
@ 2011-07-30 2:46 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2011-07-30 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 048a7d772788bfaebd55cb0da57b7c8050bf82f3
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 02:46:18 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jul 30 02:46:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=048a7d77
x11-misc/xkeyboard-config: update xkbcomp dependency to >=1.2.1
Bug 375547.
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>
---
.../xkeyboard-config/xkeyboard-config-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index fa8980b..0eceb0c 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
LICENSE="MIT"
SLOT="0"
-RDEPEND="x11-apps/xkbcomp
+RDEPEND=">=x11-apps/xkbcomp-1.2.1
>=x11-libs/libX11-1.4.2"
DEPEND="${RDEPEND}
x11-proto/xproto
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/
@ 2011-04-04 9:49 Tomas Chvatal
0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-04-04 9:49 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-30 9:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-15 17:21 [gentoo-commits] proj/x11:master commit in: x11-misc/xkeyboard-config/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2012-05-30 9:58 Chi-Thanh Christopher Nguyen
2011-07-30 2:46 Matt Turner
2011-04-04 9:49 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox