From fabb0bbecafa32892a8aa419364958a6f86658f1 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Wed, 21 Aug 2013 15:57:12 +0000 Subject: new revision featuring migrated e2fsprogs-libs, ncurses and gpm (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A) --- app-emulation/emul-linux-x86-baselibs/ChangeLog | 9 +++- .../emul-linux-x86-baselibs-20130224-r12.ebuild | 60 --------------------- .../emul-linux-x86-baselibs-20130224-r13.ebuild | 63 ++++++++++++++++++++++ .../emul-linux-x86-baselibs/files/remove-native | 46 ++++++++++++++++ 4 files changed, 117 insertions(+), 61 deletions(-) delete mode 100644 app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r12.ebuild create mode 100644 app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r13.ebuild (limited to 'app-emulation') diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog index da9069d1403f..79a1761894f9 100644 --- a/app-emulation/emul-linux-x86-baselibs/ChangeLog +++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog @@ -1,6 +1,13 @@ # 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.156 2013/08/16 12:36:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.157 2013/08/21 15:57:12 aballier Exp $ + +*emul-linux-x86-baselibs-20130224-r13 (21 Aug 2013) + + 21 Aug 2013; Alexis Ballier + -emul-linux-x86-baselibs-20130224-r12.ebuild, + +emul-linux-x86-baselibs-20130224-r13.ebuild, files/remove-native: + new revision featuring migrated e2fsprogs-libs, ncurses and gpm *emul-linux-x86-baselibs-20130224-r12 (16 Aug 2013) diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r12.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r12.ebuild deleted file mode 100644 index 4f745526c1d8..000000000000 --- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r12.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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-r12.ebuild,v 1.1 2013/08/16 12:36:26 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="!=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] - >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] - >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] - >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] - >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] - >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] - >=media-libs/libjpeg-turbo-1.3.0-r2:0[abi_x86_32(-)] - >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] - >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] - >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] - >=virtual/libusb-0-r1:0[abi_x86_32(-)] - >=virtual/libusb-1-r1:1[abi_x86_32(-)] - >=virtual/udev-206-r1[abi_x86_32(-)] - >=media-libs/tiff-4.0.3-r3:0[abi_x86_32(-)] - >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] - >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] - >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] - >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] - >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] - || ( - >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] - >=dev-libs/libelf-0.8.13-r2[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/emul-linux-x86-baselibs-20130224-r13.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r13.ebuild new file mode 100644 index 000000000000..1ec724ceb3d6 --- /dev/null +++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r13.ebuild @@ -0,0 +1,63 @@ +# 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-r13.ebuild,v 1.1 2013/08/21 15:57:12 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="!=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] + >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] + >=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)] + >=dev-libs/udis86-1.7-r2[abi_x86_32(-)] + >=virtual/libffi-3.0.13-r1[abi_x86_32(-)] + >=sys-devel/llvm-3.3-r1[abi_x86_32(-)] + >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)] + >=media-libs/libjpeg-turbo-1.3.0-r2:0[abi_x86_32(-)] + >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)] + >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)] + >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] + >=virtual/libusb-0-r1:0[abi_x86_32(-)] + >=virtual/libusb-1-r1:1[abi_x86_32(-)] + >=virtual/udev-206-r1[abi_x86_32(-)] + >=media-libs/tiff-4.0.3-r3:0[abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] + >=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)] + >=media-libs/lcms-2.5-r1:2[abi_x86_32(-)] + >=app-text/libpaper-1.1.24-r2[abi_x86_32(-)] + >=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)] + || ( + >=dev-libs/elfutils-0.155-r1[abi_x86_32(-)] + >=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)] + ) + >=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] + >=sys-libs/gpm-1.20.7-r2[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 index 8b3fff2f1a69..db0b47d5ecf6 100644 --- a/app-emulation/emul-linux-x86-baselibs/files/remove-native +++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native @@ -144,3 +144,49 @@ usr/lib32/libasm.so.1 usr/lib32/libdw-0.149.so usr/lib32/libdw.so usr/lib32/libdw.so.1 +lib32/libss.so.2 +lib32/libss.so.2.0 +usr/lib32/libss.so +usr/lib32/pkgconfig/ss.pc +lib32/libcom_err.so.2 +lib32/libcom_err.so.2.1 +usr/lib32/libcom_err.so +usr/lib32/pkgconfig/com_err.pc +usr/lib32/libcurses.so +usr/lib32/libform.so +usr/lib32/libform.so.5 +usr/lib32/libform.so.5.9 +usr/lib32/libformw.so +usr/lib32/libformw.so.5 +usr/lib32/libformw.so.5.9 +usr/lib32/libmenu.so +usr/lib32/libmenu.so.5 +usr/lib32/libmenu.so.5.9 +usr/lib32/libmenuw.so +usr/lib32/libmenuw.so.5 +usr/lib32/libmenuw.so.5.9 +lib32/libncurses.so.5 +lib32/libncurses.so.5.9 +lib32/libncursesw.so.5 +lib32/libncursesw.so.5.9 +usr/lib32/libncurses.so +usr/lib32/libncursesw.so +usr/lib32/libpanel.so +usr/lib32/libpanel.so.5 +usr/lib32/libpanel.so.5.9 +usr/lib32/libpanelw.so +usr/lib32/libpanelw.so.5 +usr/lib32/libpanelw.so.5.9 +usr/lib32/pkgconfig/form.pc +usr/lib32/pkgconfig/formw.pc +usr/lib32/pkgconfig/ncurses++.pc +usr/lib32/pkgconfig/ncurses++w.pc +usr/lib32/pkgconfig/menuw.pc +usr/lib32/pkgconfig/menu.pc +usr/lib32/pkgconfig/ncurses.pc +usr/lib32/pkgconfig/ncursesw.pc +usr/lib32/pkgconfig/panel.pc +usr/lib32/pkgconfig/panelw.pc +lib32/libgpm.so.1 +lib32/libgpm.so.1.20.0 +usr/lib32/libgpm.so -- cgit v1.2.3-65-gdbad