From 0b76204d854b42cf818260e37c517831007d6f3e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Oct 2015 18:34:52 -0400 Subject: [PATCH] sys-devel/gettext: drop old emul-linux-x86-baselibs logic These packages were dropped from the tree a while ago, and they're masked now entirely in the profile, so drop them to simplify things a bit. --- sys-devel/gettext/gettext-0.19.4.ebuild | 6 +----- sys-devel/gettext/gettext-0.19.5.1-r1.ebuild | 6 +----- sys-devel/gettext/gettext-0.19.5.ebuild | 6 +----- sys-devel/gettext/gettext-0.19.6.ebuild | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild index 200eba88743e..e6e034c0c853 100644 --- a/sys-devel/gettext/gettext-0.19.4.ebuild +++ b/sys-devel/gettext/gettext-0.19.4.ebuild @@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] RDEPEND="${DEPEND} !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 - )" + java? ( >=virtual/jre-1.4 )" PDEPEND="emacs? ( app-emacs/po-mode )" MULTILIB_WRAPPED_HEADERS=( diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild index 3e112e38c113..6ed948083a6d 100644 --- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild +++ b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild @@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] RDEPEND="${DEPEND} !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 - )" + java? ( >=virtual/jre-1.4 )" PDEPEND="emacs? ( app-emacs/po-mode )" MULTILIB_WRAPPED_HEADERS=( diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild index fffdf0bccab5..b0b52a2412e8 100644 --- a/sys-devel/gettext/gettext-0.19.5.ebuild +++ b/sys-devel/gettext/gettext-0.19.5.ebuild @@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] RDEPEND="${DEPEND} !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 - )" + java? ( >=virtual/jre-1.4 )" PDEPEND="emacs? ( app-emacs/po-mode )" MULTILIB_WRAPPED_HEADERS=( diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild index 29acbbeeb338..b32247947cbc 100644 --- a/sys-devel/gettext/gettext-0.19.6.ebuild +++ b/sys-devel/gettext/gettext-0.19.6.ebuild @@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] RDEPEND="${DEPEND} !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 - )" + java? ( >=virtual/jre-1.4 )" PDEPEND="emacs? ( app-emacs/po-mode )" MULTILIB_WRAPPED_HEADERS=( -- 2.26.2