diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-08 12:54:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-08 12:54:37 +0000 |
| commit | 1c09de38c3c0b9327753d967b569b924c11c4609 (patch) | |
| tree | 0db91d11007642837aceabc3c4325420e24728c8 /sys-fs | |
| parent | Convert to multilib, bug #479320 (diff) | |
| download | gentoo-2-1c09de38c3c0b9327753d967b569b924c11c4609.tar.gz gentoo-2-1c09de38c3c0b9327753d967b569b924c11c4609.tar.bz2 gentoo-2-1c09de38c3c0b9327753d967b569b924c11c4609.zip | |
Block revision of emul-linux-x86-baselibs that dropped the colliding files.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/eudev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/eudev/eudev-1.2-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-fs/eudev/eudev-9999.ebuild | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index 4deef928a97f..68c04ef2f58b 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/eudev # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.57 2013/08/07 20:18:37 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.58 2013/08/08 12:54:37 ssuominen Exp $ + + 08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> eudev-1.2-r1.ebuild, + eudev-9999.ebuild: + Block revision of emul-linux-x86-baselibs that dropped the colliding files. 07 Aug 2013; Ian Stakenvicius <axs@gentoo.org> eudev-9999.ebuild: Initial multilib-minimal.eclass conversion (to build libudev.so.1) diff --git a/sys-fs/eudev/eudev-1.2-r1.ebuild b/sys-fs/eudev/eudev-1.2-r1.ebuild index 19bc91026d78..3fa7e165033e 100644 --- a/sys-fs/eudev/eudev-1.2-r1.ebuild +++ b/sys-fs/eudev/eudev-1.2-r1.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/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.1 2013/08/07 20:11:25 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.2 2013/08/08 12:54:37 ssuominen Exp $ EAPI="5" @@ -29,7 +29,11 @@ COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 - !<sys-libs/glibc-2.11" + !<sys-libs/glibc-2.11 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${COMMON_DEPEND} keymap? ( dev-util/gperf ) diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index e1e0aa14e7f2..38dbf6c5b652 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-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/sys-fs/eudev/eudev-9999.ebuild,v 1.35 2013/08/07 20:18:37 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.36 2013/08/08 12:54:37 ssuominen Exp $ EAPI="5" @@ -29,7 +29,11 @@ COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 - !<sys-libs/glibc-2.11" + !<sys-libs/glibc-2.11 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${COMMON_DEPEND} keymap? ( dev-util/gperf ) |