commit: bd139592590c0d807b04476adfb096f6633ddd99
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Jul 22 13:20:11 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 14:59:49 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bd139592
remove !emul-linux statements globally from RDEPS
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild | 6 +-----
media-libs/alsa-lib/alsa-lib-1.1.5.ebuild | 6 +-----
media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild | 4 +---
media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild | 4 +---
sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 6 +-----
sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild | 6 +-----
sys-libs/gpm/gpm-1.20.7-r2.ebuild | 6 +-----
sys-libs/pam/pam-1.2.1-r2.ebuild | 6 +-----
sys-libs/slang/slang-2.3.0.ebuild | 6 +-----
9 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
index 854749a..18010e5 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
IUSE="alisp debug doc elibc_uclibc python"
-RDEPEND="python? ( ${PYTHON_DEPS} )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
doc? ( >=app-doc/doxygen-1.2.6 )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
index 8a749a7..a7cc442 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
IUSE="alisp debug doc elibc_uclibc python"
-RDEPEND="python? ( ${PYTHON_DEPS} )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
doc? ( >=app-doc/doxygen-1.2.6 )"
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
b/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
index afaa8b6..14b5ce8 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
@@ -17,9 +17,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="media-libs/ladspa-sdk"
-RDEPEND="
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
S="${WORKDIR}/${MY_P}"
DOCS=( README CHANGES )
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index 1b30fde..af6ec95 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sparc x86"
IUSE="static-libs"
-RDEPEND="app-eselect/eselect-cdparanoia
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
DEPEND=${RDEPEND}
S=${WORKDIR}/${MY_P}
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index b89660c..6eaef66 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
KEYWORDS="amd64 arm arm64 ~mips ppc x86"
IUSE="test"
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+RDEPEND=""
DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
pkg_setup() {
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 726335b..0cc3097 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -18,11 +18,7 @@ SLOT="0"
KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86"
IUSE="ipv6 netgroups static-libs"
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+RDEPEND=""
S=${WORKDIR}/${MY_P}
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index a3c1643..a6fee43 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86"
IUSE="selinux static-libs"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
- selinux? ( sec-policy/selinux-gpm )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+ selinux? ( sec-policy/selinux-gpm )"
DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
app-arch/xz-utils
sys-apps/texinfo
diff --git a/sys-libs/pam/pam-1.2.1-r2.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild
index 08d77a3..45f6838 100644
--- a/sys-libs/pam/pam-1.2.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.2.1-r2.ebuild
@@ -35,11 +35,7 @@ PDEPEND="sys-auth/pambase"
RDEPEND="${RDEPEND}
!<sys-apps/openrc-0.11.8
!sys-auth/openpam
- !sys-auth/pam_userdb
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+ !sys-auth/pam_userdb"
S="${WORKDIR}/${MY_P}"
diff --git a/sys-libs/slang/slang-2.3.0.ebuild
b/sys-libs/slang/slang-2.3.0.ebuild
index 2474c14..cd95454 100644
--- a/sys-libs/slang/slang-2.3.0.ebuild
+++ b/sys-libs/slang/slang-2.3.0.ebuild
@@ -20,11 +20,7 @@ RDEPEND="sys-libs/ncurses:0=
png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
cjk? ( >=dev-libs/oniguruma-5.9.5[${MULTILIB_USEDEP}] )
readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
- )"
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
MAKEOPTS="${MAKEOPTS} -j1"
