* [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
@ 2011-04-15 19:04 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2011-04-15 19:04 UTC (permalink / raw
To: gentoo-commits
commit: dbdc3f6e824f71cbfa24698e634e8b31282eeb44
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:32:32 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:32:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=dbdc3f6e
x11-libs/libX11: Migrate to XORG_CONFIGURE_OPTIONS.
(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
---
x11-libs/libX11/libX11-9999.ebuild | 4 ++--
x11-libs/libX11/metadata.xml | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 323488f..6bb3d17 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -30,12 +30,12 @@ PATCHES=(
pkg_setup() {
xorg-2_pkg_setup
- CONFIGURE_OPTIONS="
+ XORG_CONFIGURE_OPTIONS=(
$(use_with doc xmlto)
$(use_enable doc specs)
$(use_enable ipv6)
--without-fop
- "
+ )
}
src_configure() {
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/x11-libs/libX11/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
@ 2012-01-05 19:13 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 5+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-01-05 19:13 UTC (permalink / raw
To: gentoo-commits
commit: c05bdf259b9f15c06b32a5c4ae60bc04a63249c1
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 19:13:37 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Jan 5 19:13:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c05bdf25
x11-libs/libX11: raise xproto dependency
---
x11-libs/libX11/libX11-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 6bb3d17..1c8cf48 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -14,7 +14,7 @@ IUSE="ipv6 test"
RDEPEND=">=x11-libs/libxcb-1.1.92
x11-libs/xtrans
- >=x11-proto/xproto-7.0.13
+ >=x11-proto/xproto-7.0.17
x11-proto/xf86bigfontproto
x11-proto/inputproto
x11-proto/kbproto
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
@ 2013-05-25 20:41 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 5+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2013-05-25 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 0fc88f68170176ed2e7971c260697209efa4a838
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 20:41:02 2013 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat May 25 20:41:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0fc88f68
x11-libs/libX11: sync dependencies and keywords with portage
---
x11-libs/libX11/libX11-9999.ebuild | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 58dfc7d..385cd63 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.2 2011/03/21 14:05:45 flameeyes Exp $
+# $Header: $
EAPI=5
@@ -10,10 +10,10 @@ inherit xorg-2 toolchain-funcs flag-o-matic
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 test"
-RDEPEND=">=x11-libs/libxcb-1.1.92[${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
x11-libs/xtrans
>=x11-proto/xproto-7.0.17[${MULTILIB_USEDEP}]
x11-proto/xf86bigfontproto[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
@ 2013-07-22 22:06 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2013-07-22 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 7885bce2a145d028161205febde50b766a3d9fdb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 19:30:06 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 19:30:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7885bce2
x11-libs/libX11: Fix cross-compilation in multilib ebuild.
Package-Manager: portage-2.2.0_alpha188
---
x11-libs/libX11/libX11-9999.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 385cd63..0ef85dc 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -46,7 +46,12 @@ src_compile() {
if tc-is-cross-compiler; then
(
filter-flags -m*
- emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die
+ multilib_for_best_abi run_in_build_dir \
+ emake -C src/util \
+ CC=$(tc-getBUILD_CC) \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="" \
+ clean all || die
)
fi
xorg-2_src_compile
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/
@ 2014-04-30 14:01 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2014-04-30 14:01 UTC (permalink / raw
To: gentoo-commits
commit: c1e1badb602a20e53b7fad0d499cf7074b4b9669
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 30 14:01:11 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 30 14:01:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c1e1badb
x11-libs/libX11: Use multilib_src_compile() rather than hackery on top of multilib_for_best_abi.
Package-Manager: portage-2.2.10
---
x11-libs/libX11/libX11-9999.ebuild | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index eceaa43..369e900 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -41,18 +41,18 @@ src_configure() {
xorg-2_src_configure
}
-src_compile() {
+multilib_src_compile() {
# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
if tc-is-cross-compiler; then
(
filter-flags -m*
- multilib_for_best_abi run_in_build_dir \
- emake -C src/util \
- CC=$(tc-getBUILD_CC) \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="" \
- clean all || die
+ emake -C src/util \
+ CC=$(tc-getBUILD_CC) \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="" \
+ clean all || die
)
fi
- xorg-2_src_compile
+
+ default
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-04-30 14:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-15 19:04 [gentoo-commits] proj/x11:master commit in: x11-libs/libX11/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2012-01-05 19:13 Chi-Thanh Christopher Nguyen
2013-05-25 20:41 Chi-Thanh Christopher Nguyen
2013-07-22 22:06 Michał Górny
2014-04-30 14:01 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox