From 35f63607907561d6f9b03531925d1c014b52a159 Mon Sep 17 00:00:00 2001 From: "amynka@gentoo.org" Date: Thu, 19 Apr 2018 21:32:45 +0200 Subject: */*: [QA] remove emul-linux-* blockers Closes: https://github.com/gentoo/gentoo/pull/8074 --- sys-libs/db/db-4.8.30-r2.ebuild | 6 +----- sys-libs/gdbm/gdbm-1.11.ebuild | 6 +----- sys-libs/gpm/gpm-1.20.7-r2.ebuild | 6 +----- sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild | 4 +--- sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild | 3 +-- sys-libs/libraw1394/libraw1394-2.1.1.ebuild | 3 +-- sys-libs/libraw1394/libraw1394-2.1.2.ebuild | 3 +-- sys-libs/ncurses/ncurses-6.1-r2.ebuild | 3 +-- sys-libs/pam/pam-1.2.1-r2.ebuild | 6 +----- sys-libs/readline/readline-6.3_p8-r3.ebuild | 6 +----- sys-libs/zlib/zlib-1.2.11-r1.ebuild | 6 +----- sys-libs/zlib/zlib-1.2.11.ebuild | 6 +----- 12 files changed, 12 insertions(+), 46 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild index 37d23a102be2..b19ec4fc505c 100644 --- a/sys-libs/db/db-4.8.30-r2.ebuild +++ b/sys-libs/db/db-4.8.30-r2.ebuild @@ -38,11 +38,7 @@ DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1" RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.5 ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + java? ( >=virtual/jre-1.5 )" src_prepare() { cd "${WORKDIR}"/"${MY_P}" || die diff --git a/sys-libs/gdbm/gdbm-1.11.ebuild b/sys-libs/gdbm/gdbm-1.11.ebuild index a1c16be88349..ab6f9f6401a5 100644 --- a/sys-libs/gdbm/gdbm-1.11.ebuild +++ b/sys-libs/gdbm/gdbm-1.11.ebuild @@ -16,11 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+berkdb exporter nls static-libs" -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" +RDEPEND="" EX_S="${WORKDIR}"/${EX_P} diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild index 943ef06732c3..4cef2cfe09fe 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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 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/libavc1394/libavc1394-0.5.4-r1.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild index cd8892d47731..530fa3d022b7 100644 --- a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild +++ b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild @@ -14,8 +14,6 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86" IUSE="static-libs" -RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild index e7f484ab5de5..90b9144911a3 100644 --- a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild +++ b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild @@ -17,5 +17,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86" IUSE="static-libs" DEPEND="app-arch/xz-utils" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND="" diff --git a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild index 65b0c7bf7d67..ec729644728f 100644 --- a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild +++ b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild @@ -17,5 +17,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="static-libs" DEPEND="app-arch/xz-utils" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND="" diff --git a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild index b9be065a79c0..f06036c8c1c4 100644 --- a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild +++ b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild @@ -17,5 +17,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="static-libs" DEPEND="app-arch/xz-utils" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +RDEPEND="" diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild index a13f47d42f2c..4a58bd1d79bb 100644 --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -25,8 +25,7 @@ RDEPEND="${DEPEND} !<=sys-libs/ncurses-5.9-r4:5 !