old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5d5d9fcc14420c83e58569e9996397c148f7163d..1f0c9c896752988e2650bdc8870e2a361fe982b5 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -28,8 +28,6 @@ AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f
 DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6bd1044ec28 SHA1 2448fa11229deeaf7a2135510d35bbdbfe9f31e0 SHA256 36a838d5be4fb96f0471d288f172443df28867c301e7790667e1cb57615e6c04
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
 DIST glibc-2.11-patches-5.tar.bz2 106033 RMD160 57fc0ebbe7e7abf82af90dd8085a0a61a7c3ac8f SHA1 a03b9071d80a094acafbafa621c0033a100a6b87 SHA256 b628984de9123a33d03180ec53472e2f0209dabeadef9561eceee32f4cd9ecbe
-DIST glibc-2.11.1-patches-1.tar.bz2 101293 RMD160 eb05b62c4226729375b963fffa3b13d23afe9de9 SHA1 bbf416a73a4b78b22d136fd6fcd1f7c35f219042 SHA256 815ce16eb71136e962b2efd979e2c2d03b781023387fe1603a667ad58a37744f
-DIST glibc-2.11.1.tar.bz2 15669361 RMD160 f89cce2685d000602d6417b08e27b05efc82a553 SHA1 29f492ae56fd4ef79f32b45c29c0edb6aa8a35a7 SHA256 64e01d0cfc964a8d8a8c74b5d36bd655e800c12d22b756dd84d867148a595fa1
 DIST glibc-2.11.2-patches-2.tar.bz2 101885 RMD160 bd0bdf20c13f27433e40687b0962e399bbb1878b SHA1 2deb5e1b43cb0e3301ffdeff4daa62e594a265be SHA256 2ef81829b6064f3081d22ade7b1488a286e0e53e1d296d29c3e22cb8dcb48acf
 DIST glibc-2.11.2.tar.bz2 15675392 RMD160 15d14fb6b0b58ec3fb7781efa2f8a558fcb99a7e SHA1 23b477f4816a97e007be1e98abc1ffe2af13ba9e SHA256 c2ac76ee363eed31b2a377489fb2818139f4668b5505ad583009eb9b0e228713
 DIST glibc-2.11.tar.bz2 15684114 RMD160 817ed8febe8876602d6fe37983505908046d0925 SHA1 f89c0651ca25423523c872a27b0ccf70f5670b6e SHA256 9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
@@ -65,7 +63,6 @@ DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.10.1-r1.ebuild 8161 RMD160 b21cba3d443ff63ebb776c9f15959c1e1e660136 SHA1 e08b8a9ef1f33e85912c5a9e70ce5fd885727bcd SHA256 19b9232a48a904243440581472a71f79bae7cc9674d26d875a6ab0b53ccee75d
 EBUILD glibc-2.11-r1.ebuild 8320 RMD160 6dad54929a17f654d0fae162ad1219ee702ac526 SHA1 4dabc2634a5d8a791fe580d08facb33189e0ec0a SHA256 0344b2ca86f354fd751e80bc687c2fa0a2f23c2700e421d30f84c594c2e7f760
-EBUILD glibc-2.11.1.ebuild 8297 RMD160 a06b2e7583df45b868972e5f8bf67a50d085426c SHA1 faaff5cefb0f757f8fb11c9d28d97d378ec7a8bb SHA256 25a3ea88437cbe1f605f2ce11e4722991ee69f0d932c617e7c2e95e99bfe382b
 EBUILD glibc-2.11.2.ebuild 8297 RMD160 3148b2008f1f98282f339004acfef9fef3ebf64f SHA1 7c89eed361e9c949afe8ac6b8301b005c054903f SHA256 0faaa6b6864347bf7a43db3b6042629bf78052d3a63cf0420027ec319bc6571d
 EBUILD glibc-2.2.5-r10.ebuild 4847 RMD160 829dc6d11434ff2d8d202277595b0817b1a9ab28 SHA1 19523459701cabf750a777b17cbe0af34d4688dd SHA256 454a2b5d6201ab615f00c50987c7ac0328d22cc66db582851fcd27e2a967b17f
 EBUILD glibc-2.5-r4.ebuild 38684 RMD160 7cc84f40f23c1b78303a7b38d2579b8fde32efc1 SHA1 509f71b1d4c22105d6c30b5759711cb4a407fae8 SHA256 afe1d1ce196d191712767adf21dfb3c92d2bfc7a3c65e0f9c319d65701c2e6de
@@ -80,7 +77,7 @@ MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwqWLgACgkQTwhj9JtAlp532wEAifWFOcnsU1B1/Y4tfP+yUFUX
-2uWIhgdsTqWWxSi9FhcA/jKw0zGVD65fzZQVjCS9En2gEA21EbF4yVPp5mYwSJ8i
-=AwwF
+iF4EAREIAAYFAkwqWSwACgkQTwhj9JtAlp5pmAEAoBzDwN7z5jaepHH/HxlYa5Nf
+ur4IsmPEeWBrlLyRoHoA/AyeMYNy1VdCG/HN+V/TObyPkntl1dg9PbSOB8HcRSQT
+=qVmD
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.11.1.ebuild b/sys-libs/glibc/glibc-2.11.1.ebuild
deleted file mode 100644 (file)
index 5f9e0bb..0000000
--- a/sys-libs/glibc/glibc-2.11.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.1.ebuild,v 1.6 2010/06/25 19:53:44 vapier Exp $
-
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-if [[ ${PV} == *_p* ]] ; then
-RELEASE_VER=${PV%_p*}
-BRANCH_UPDATE=""
-SNAP_VER=${PV#*_p}
-else
-RELEASE_VER=${PV}
-BRANCH_UPDATE=""
-SNAP_VER=""
-fi
-MANPAGE_VER=""                                 # pregenerated manpages
-INFOPAGE_VER=""                                # pregenerated infopages
-LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="1"                                  # Gentoo patchset
-PORTS_VER=${RELEASE_VER%.?}                    # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
-
-IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
-S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-               export CTARGET=${CATEGORY/cross-}
-       fi
-fi
-
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
-
-is_crosscompile() {
-       [[ ${CHOST} != ${CTARGET} ]]
-}
-alt_libdir() {
-       if is_crosscompile ; then
-               echo /usr/${CTARGET}/$(get_libdir)
-       else
-               echo /$(get_libdir)
-       fi
-}
-
-if is_crosscompile ; then
-       SLOT="${CTARGET}-2.2"
-else
-       # Why SLOT 2.2 you ask yourself while sippin your tea ?
-       # Everyone knows 2.2 > 0, duh.
-       SLOT="2.2"
-       PROVIDE="virtual/libc"
-fi
-
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-       arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-       x86? ( >=sys-devel/gcc-4.3 )
-       amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-       ppc? ( >=sys-devel/gcc-4.1.0 )
-       ppc64? ( >=sys-devel/gcc-4.1.0 )
-       >=sys-devel/binutils-2.15.94
-       ${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
-       >=sys-devel/gcc-config-1.3.12
-       >=app-misc/pax-utils-0.1.10
-       virtual/os-headers
-       nls? ( sys-devel/gettext )
-       >=sys-apps/sandbox-1.2.18.1-r2
-       !<sys-apps/portage-2.1.2
-       selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-       nls? ( sys-devel/gettext )
-       selinux? ( sys-libs/libselinux )"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-       DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-       [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-else
-       DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c"
-       RDEPEND="${RDEPEND} sys-libs/timezone-data"
-fi
-
-SRC_URI=$(
-       upstream_uris() {
-               echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-       }
-       gentoo_uris() {
-               local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-               devspace=${devspace//HTTP/http://dev.gentoo.org/}
-               echo mirror://gentoo/$1 ${devspace//URI/$1}
-       }
-
-       TARNAME=${PN}
-       if [[ -n ${SNAP_VER} ]] ; then
-               TARNAME="${PN}-${RELEASE_VER}"
-               [[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
-               upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
-       else
-               upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
-       fi
-       [[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-       [[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.bz2
-       [[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
-       [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-       [[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-       [[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
-       [[ -n ${INFOPAGE_VER}  ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2
-)
-
-# eblit-include [--skip] <function> [version]
-eblit-include() {
-       local skipable=false
-       [[ $1 == "--skip" ]] && skipable=true && shift
-       [[ $1 == pkg_* ]] && skipable=true
-
-       local e v func=$1 ver=$2
-       [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
-       for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-               e="${FILESDIR}/eblits/${func}${v}.eblit"
-               if [[ -e ${e} ]] ; then
-                       source "${e}"
-                       return 0
-               fi
-       done
-       ${skipable} && return 0
-       die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe <function>
-# run the specified function if it is defined
-eblit-run-maybe() {
-       [[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run <function> [version]
-# aka: src_unpack() { eblit-run src_unpack ; }
-eblit-run() {
-       eblit-include --skip common "${*:2}"
-       eblit-include "$@"
-       eblit-run-maybe eblit-$1-pre
-       eblit-${PN}-$1
-       eblit-run-maybe eblit-$1-post
-}
-
-src_unpack()  { eblit-run src_unpack  ; }
-src_compile() { eblit-run src_compile ; }
-src_test()    { eblit-run src_test    ; }
-src_install() { eblit-run src_install ; }
-
-# FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
-       e="${FILESDIR}/eblits/pkg_${x}.eblit"
-       if [[ -e ${e} ]] ; then
-               . "${e}"
-               eval "pkg_${x}() { eblit-run pkg_${x} ; }"
-       fi
-done
-
-eblit-src_unpack-post() {
-       if use hardened ; then
-               cd "${S}"
-               einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-               gcc-specs-pie && epatch "${FILESDIR}"/2.11/glibc-2.11-hardened-pie.patch
-               epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
-               epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
-
-               einfo "Patching Glibc to support older SSP __guard"
-               epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-ssp-compat.patch
-
-               einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-               cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
-                       debug/stack_chk_fail.c || die
-               cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
-                       debug/chk_fail.c || die
-
-               if use debug ; then
-                       # When using Hardened Gentoo stack handler, have smashes dump core for
-                       # analysis - debug only, as core could be an information leak
-                       # (paranoia).
-                       sed -i \
-                               -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-                               debug/Makefile \
-                               || die "Failed to modify debug/Makefile for debug stack handler"
-                       sed -i \
-                               -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-                               debug/Makefile \
-                               || die "Failed to modify debug/Makefile for debug fortify handler"
-               fi
-
-               # Build nscd with ssp-all
-               sed -i \
-                       -e 's:-fstack-protector$:-fstack-protector-all:' \
-                       nscd/Makefile \
-                       || die "Failed to ensure nscd builds with ssp-all"
-       fi
-}
-
-maint_pkg_create() {
-       local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
-       cd ${base}
-       local stamp=$(date +%Y%m%d)
-       local d
-       for d in libc ports ; do
-               #(cd ${d} && cvs up)
-               case ${d} in
-                       libc)  tarball="${P}";;
-                       ports) tarball="${PN}-ports-${PV}";;
-               esac
-               rm -f ${tarball}*
-               ln -sf ${d} ${tarball}
-               tar hcf - ${tarball} --exclude-vcs | lzma > "${T}"/${tarball}.tar.lzma
-               du -b "${T}"/${tarball}.tar.lzma
-       done
-}