From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1K595v-0008DK-Kv for garchives@archives.gentoo.org; Sun, 08 Jun 2008 00:49:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1557E037F; Sun, 8 Jun 2008 00:49:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7DF6AE037F for ; Sun, 8 Jun 2008 00:49:14 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 18BC166F7C for ; Sun, 8 Jun 2008 00:49:14 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1K595q-0001uT-2e for gentoo-commits@lists.gentoo.org; Sun, 08 Jun 2008 00:49:10 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_unpack.eblit X-VCS-Repository: gentoo-x86 X-VCS-Files: src_unpack.eblit X-VCS-Directories: sys-libs/glibc/files/eblits X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Sun, 08 Jun 2008 00:49:10 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d0aa3b68-d3c6-49de-a9c1-4ad8c1ab5c50 X-Archives-Hash: d938b1240829d214aa108de30f007e1b vapier 08/06/08 00:49:10 Modified: src_unpack.eblit Log: Version bump #225175 by Arfrever Frehtes Taifersar Arahesis. (Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dua= l Core Processor 4200+) Revision Changes Path 1.5 sys-libs/glibc/files/eblits/src_unpack.eblit file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/fil= es/eblits/src_unpack.eblit?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/fil= es/eblits/src_unpack.eblit?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/fil= es/eblits/src_unpack.eblit?r1=3D1.4&r2=3D1.5 Index: src_unpack.eblit =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.= eblit,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- src_unpack.eblit 11 Nov 2007 20:12:38 -0000 1.4 +++ src_unpack.eblit 8 Jun 2008 00:49:09 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpac= k.eblit,v 1.4 2007/11/11 20:12:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpac= k.eblit,v 1.5 2008/06/08 00:49:09 vapier Exp $ =20 check_kheader_version() { local version=3D$( @@ -44,26 +44,29 @@ fi } =20 -unpack_addon() { - local addon=3D$1 ver=3D${2:-${RELEASE_VER}} - unpack glibc-${addon}-${ver}.tar.bz2 - mv glibc-${addon}-${ver} ${addon} || die +unpack_pkg() { + local a=3D${PN} + [[ -n ${SNAP_VER} ]] && a=3D"${a}-${RELEASE_VER}" + [[ -n $1 ]] && a=3D"${a}-$1" + [[ -n ${SNAP_VER} ]] && a=3D"${a}-${SNAP_VER}" || a=3D"${a}-${RELEASE_V= ER}" + unpack ${a}.tar.bz2 + [[ -n $1 ]] && mv ${a} $1 } =20 toolchain-glibc_src_unpack() { # Check NPTL support _before_ we unpack things to save some time want_nptl && check_nptl_support =20 - unpack glibc-${RELEASE_VER}.tar.bz2 + unpack_pkg =20 cd "${S}" - [[ -n ${LT_VER} ]] && unpack glibc-linuxthreads-${LT_VER}.tar.bz2 - [[ -n ${PORTS_VER} ]] && unpack_addon ports ${PORTS_VER} - unpack_addon libidn + [[ -n ${LT_VER} ]] && unpack_pkg linuxthreads ${LT_VER} + [[ -n ${PORTS_VER} ]] && unpack_pkg ports ${PORTS_VER} + [[ -n ${LIBIDN_VER} ]] && unpack_pkg libidn =20 if [[ -n ${PATCH_VER} ]] ; then cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER}-patches-${PATCH_VER}.tar.bz2 + unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 # pull out all the addons local d for d in extra/*/configure ; do @@ -95,17 +98,19 @@ unpack glibc-infopages-${INFOPAGE_VER}.tar.bz2 fi =20 + # tag, glibc is it + cd "${S}" + [[ -e csu/Banner ]] && die "need new banner location" + [[ -n ${SNAP_VER} ]] && echo "Gentoo snapshot ${SNAP_VER}" >> csu/Banne= r + [[ -n ${BRANCH_UPDATE} ]] && echo "Gentoo branch ${BRANCH_UPDATE}" >> c= su/Banner if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then cd "${S}" - EPATCH_MULTI_MSG=3D"Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER}-= ${PATCH_VER} ..." \ + EPATCH_MULTI_MSG=3D"Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PA= TCH_VER} ..." \ EPATCH_EXCLUDE=3D${GLIBC_PATCH_EXCLUDE} \ EPATCH_SUFFIX=3D"patch" \ ARCH=3D$(tc-arch) \ epatch "${WORKDIR}"/patches - - # tag, glibc is it - [[ -e csu/Banner ]] && die "need new banner location" - echo "Gentoo patchset ${PATCH_VER}" > csu/Banner + echo "Gentoo patchset ${PATCH_VER}" >> csu/Banner fi =20 gnuconfig_update --=20 gentoo-commits@lists.gentoo.org mailing list