[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_unpack.eblit

[Mike Frysinger (vapier)]

vapier      07/11/10 04:07:21

  Modified:             src_unpack.eblit
  Log:
  Add support for USE=vanilla.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.3                  sys-libs/glibc/files/eblits/src_unpack.eblit

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?r1=1.2&r2=1.3

Index: src_unpack.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src_unpack.eblit	7 Oct 2007 03:43:52 -0000	1.2
+++ src_unpack.eblit	10 Nov 2007 04:07:21 -0000	1.3
@@ -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_unpack.eblit,v 1.2 2007/10/07 03:43:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.3 2007/11/10 04:07:21 vapier Exp $
 
 check_kheader_version() {
 	local version=$(
@@ -67,7 +67,9 @@
 		# pull out all the addons
 		local d
 		for d in extra/*/configure ; do
-			mv "${d%/configure}" "${S}" || die "moving ${d}"
+			d=${d%/configure}
+			[[ -d ${S}/${d} ]] && die "${d} already exists in \${S}"
+			mv "${d}" "${S}" || die "moving ${d} failed"
 		done
 	fi
 
@@ -93,7 +95,7 @@
 		unpack glibc-infopages-${INFOPAGE_VER}.tar.bz2
 	fi
 
-	if [[ -n ${PATCH_VER} ]] ; then
+	if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then
 		cd "${S}"
 		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER}-${PATCH_VER} ..." \
 		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \



-- 
gentoo-commits@g.o mailing list