* [gentoo-commits] proj/x11:multilib-r1 commit in: x11-libs/libvdpau/, eclass/, media-libs/freetype/, media-libs/fontconfig/
@ 2013-02-01 23:48 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2013-02-01 23:48 UTC (permalink / raw
To: gentoo-commits
commit: 6abde7ba71cf6838596feb6fcea1125bbe536cd1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 1 23:28:15 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 1 23:28:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6abde7ba
Add blockers on old emul-linux packages.
---
eclass/xorg-2.eclass | 4 ++++
media-libs/fontconfig/fontconfig-2.9.0.ebuild | 3 ++-
media-libs/freetype/freetype-2.4.11.ebuild | 3 ++-
x11-libs/libvdpau/libvdpau-0.5.ebuild | 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index f63b882..c93968e 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -284,6 +284,10 @@ DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}"
unset COMMON_DEPEND
+if [[ ${XORG_MULTILIB} == yes ]]; then
+ RDEPEND+=" !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
+fi
+
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
diff --git a/media-libs/fontconfig/fontconfig-2.9.0.ebuild b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
index 36fafca..e55754d 100644
--- a/media-libs/fontconfig/fontconfig-2.9.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
@@ -20,7 +20,8 @@ IUSE="doc static-libs"
# default and used by every distro. See bug #283191.
RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
- >=dev-libs/expat-1.95.3"
+ >=dev-libs/expat-1.95.3
+ !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
diff --git a/media-libs/freetype/freetype-2.4.11.ebuild b/media-libs/freetype/freetype-2.4.11.ebuild
index d8ea3a8..36bcf62 100644
--- a/media-libs/freetype/freetype-2.4.11.ebuild
+++ b/media-libs/freetype/freetype-2.4.11.ebuild
@@ -24,7 +24,8 @@ DEPEND="sys-libs/zlib
x11-libs/libXau
x11-libs/libXdmcp )"
RDEPEND="${DEPEND}
- infinality? ( media-libs/fontconfig-infinality )"
+ infinality? ( media-libs/fontconfig-infinality )
+ !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
src_prepare() {
enable_option() {
diff --git a/x11-libs/libvdpau/libvdpau-0.5.ebuild b/x11-libs/libvdpau/libvdpau-0.5.ebuild
index 75098b9..ae619cf 100644
--- a/x11-libs/libvdpau/libvdpau-0.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-0.5.ebuild
@@ -18,7 +18,8 @@ RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
dri? ( x11-libs/libXext[${MULTILIB_USEDEP}] )
!=x11-drivers/nvidia-drivers-180*
!=x11-drivers/nvidia-drivers-185*
- !=x11-drivers/nvidia-drivers-190*"
+ !=x11-drivers/nvidia-drivers-190*
+ !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/x11:multilib-r1 commit in: x11-libs/libvdpau/, eclass/, media-libs/freetype/, media-libs/fontconfig/
@ 2013-02-05 13:10 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2013-02-05 13:10 UTC (permalink / raw
To: gentoo-commits
commit: a0524e5c7a7a4e231494e6cc7186d6509e7d2f1b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 13:08:42 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 13:09:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a0524e5c
Make the old emul-linux blockers conditional to multilib.
Instead of blocking emul-linux packages unconditionally, block them only
if abi_x86_32 flag is enabled.
---
eclass/xorg-2.eclass | 2 +-
media-libs/fontconfig/fontconfig-2.9.0.ebuild | 2 +-
media-libs/freetype/freetype-2.4.11.ebuild | 2 +-
x11-libs/libvdpau/libvdpau-0.5.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index c93968e..4b71707 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -285,7 +285,7 @@ RDEPEND+=" ${COMMON_DEPEND}"
unset COMMON_DEPEND
if [[ ${XORG_MULTILIB} == yes ]]; then
- RDEPEND+=" !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
+ RDEPEND+=" abi_x86_32? ( !<app-emulation/emul-linux-x86-xlibs-20121202-r1 )"
fi
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
diff --git a/media-libs/fontconfig/fontconfig-2.9.0.ebuild b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
index 4e19838..cc57693 100644
--- a/media-libs/fontconfig/fontconfig-2.9.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
@@ -21,7 +21,7 @@ IUSE="doc static-libs"
RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
>=dev-libs/expat-1.95.3
- !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
+ abi_x86_32? ( !<app-emulation/emul-linux-x86-xlibs-20121202-r1 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
diff --git a/media-libs/freetype/freetype-2.4.11.ebuild b/media-libs/freetype/freetype-2.4.11.ebuild
index fa2d17d..1e5b57d 100644
--- a/media-libs/freetype/freetype-2.4.11.ebuild
+++ b/media-libs/freetype/freetype-2.4.11.ebuild
@@ -25,7 +25,7 @@ DEPEND="sys-libs/zlib
x11-libs/libXdmcp )"
RDEPEND="${DEPEND}
infinality? ( media-libs/fontconfig-infinality )
- !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
+ abi_x86_32? ( !<app-emulation/emul-linux-x86-xlibs-20121202-r1 )"
src_prepare() {
enable_option() {
diff --git a/x11-libs/libvdpau/libvdpau-0.5.ebuild b/x11-libs/libvdpau/libvdpau-0.5.ebuild
index ae619cf..8bcf628 100644
--- a/x11-libs/libvdpau/libvdpau-0.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-0.5.ebuild
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
!=x11-drivers/nvidia-drivers-180*
!=x11-drivers/nvidia-drivers-185*
!=x11-drivers/nvidia-drivers-190*
- !<app-emulation/emul-linux-x86-xlibs-20121202-r1"
+ abi_x86_32? ( !<app-emulation/emul-linux-x86-xlibs-20121202-r1 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-05 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-01 23:48 [gentoo-commits] proj/x11:multilib-r1 commit in: x11-libs/libvdpau/, eclass/, media-libs/freetype/, media-libs/fontconfig/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2013-02-05 13:10 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