diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:06:48 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:06:48 +0000 |
| commit | c81a49ba43b456553891ffc206aa0668a7fb4d4a (patch) | |
| tree | 15cb70a60157e4725ffa655bbc2caa80354836ed /app-emulation | |
| parent | remove mask for multilib bzip2 and zlib so that I can start fixing packages d... (diff) | |
| download | gentoo-2-c81a49ba43b456553891ffc206aa0668a7fb4d4a.tar.gz gentoo-2-c81a49ba43b456553891ffc206aa0668a7fb4d4a.tar.bz2 gentoo-2-c81a49ba43b456553891ffc206aa0668a7fb4d4a.zip | |
New revision that can use multilib enabled zlib and bzip2.
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'app-emulation')
3 files changed, 57 insertions, 1 deletions
diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog index 40e74ae589f5..a6a3057771d0 100644 --- a/app-emulation/emul-linux-x86-baselibs/ChangeLog +++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-baselibs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.140 2013/03/16 15:18:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.141 2013/07/28 14:06:48 aballier Exp $ + +*emul-linux-x86-baselibs-20130224-r1 (28 Jul 2013) + + 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> + +emul-linux-x86-baselibs-20130224-r1.ebuild, +files/remove-native: + New revision that can use multilib enabled zlib and bzip2. 16 Mar 2013; Pacho Ramos <pacho@gentoo.org> emul-linux-x86-baselibs-20130224.ebuild: diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r1.ebuild new file mode 100644 index 000000000000..a85e600c7bab --- /dev/null +++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r1.ebuild,v 1.1 2013/07/28 14:06:48 aballier Exp $ + +EAPI=5 +inherit emul-linux-x86 + +LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT + public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP + Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff + openssl tcp_wrappers_license" + +KEYWORDS="-* ~amd64" +IUSE="abi_x86_32" + +DEPEND="" +RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2 + abi_x86_32? ( + >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] + >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] + ) + >=sys-libs/glibc-2.15" # bug 340613 + +PYTHON_UPDATER_IGNORE="1" + +src_prepare() { + export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)" + emul-linux-x86_src_prepare + rm -rf "${S}/etc/env.d/binutils/" \ + "${S}/usr/i686-pc-linux-gnu/lib" \ + "${S}/usr/lib32/engines/" \ + "${S}/usr/lib32/openldap/" || die + + ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die + + # Remove migrated stuff. + use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native") +} diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native b/app-emulation/emul-linux-x86-baselibs/files/remove-native new file mode 100644 index 000000000000..0ae5576036e6 --- /dev/null +++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native @@ -0,0 +1,12 @@ +lib32/libz.so.1 +lib32/libz.so.1.2.7 +usr/lib32/libz.so +usr/lib32/pkgconfig/zlib.pc +usr/lib32/libminizip.so +usr/lib32/libminizip.so.1 +usr/lib32/libminizip.so.1.0.0 +usr/lib32/pkgconfig/minizip.pc +lib32/libbz2.so.1 +lib32/libbz2.so.1.0 +lib32/libbz2.so.1.0.6 +usr/lib32/libbz2.so |