Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 24637
Collapse All | Expand All

(-)ebuild.sh.orig (-8 / +19 lines)
Lines 257-262 Link Here
257
	local y
257
	local y
258
	local myfail
258
	local myfail
259
	local tarvars
259
	local tarvars
260
	local srcdir
260
261
261
	if [ "$USERLAND" == "BSD" ]; then
262
	if [ "$USERLAND" == "BSD" ]; then
262
		tarvars=""
263
		tarvars=""
Lines 268-299 Link Here
268
		myfail="failure unpacking ${x}"
269
		myfail="failure unpacking ${x}"
269
		echo ">>> Unpacking ${x} to $(pwd)"
270
		echo ">>> Unpacking ${x} to $(pwd)"
270
		y="$(echo $x | sed 's:.*\.\(tar\)\.[a-zA-Z0-9]*:\1:')"
271
		y="$(echo $x | sed 's:.*\.\(tar\)\.[a-zA-Z0-9]*:\1:')"
272
		if [ -e ${DISTDIR}/${x} ] ; then
273
			srcdir=${DISTDIR}
274
		elif [ -e ${PWD}/${x} ] ; then
275
			srcdir=${PWD}
276
		elif [ -e /${x} ] ; then
277
			srcdir=/
278
		else
279
			echo "Could not find ${x}"
280
			die "$myfail"
281
		fi
271
282
272
		case "${x##*.}" in
283
		case "${x##*.}" in
273
			tar) 
284
			tar) 
274
				tar ${tarvars} -xf ${DISTDIR}/${x} || die "$myfail"
285
				tar ${tarvars} -xf ${srcdir}/${x} || die "$myfail"
275
				;;
286
				;;
276
			tgz) 
287
			tgz) 
277
				tar ${tarvars} -xzf ${DISTDIR}/${x} || die "$myfail"
288
				tar ${tarvars} -xzf ${srcdir}/${x} || die "$myfail"
278
				;;
289
				;;
279
			tbz2) 
290
			tbz2) 
280
				bzip2 -dc ${DISTDIR}/${x} | tar ${tarvars} -xf - || die "$myfail"
291
				bzip2 -dc ${srcdir}/${x} | tar ${tarvars} -xf - || die "$myfail"
281
				;;
292
				;;
282
			ZIP|zip) 
293
			ZIP|zip) 
283
				unzip -qo ${DISTDIR}/${x} || die "$myfail"
294
				unzip -qo ${srcdir}/${x} || die "$myfail"
284
				;;
295
				;;
285
			gz|Z|z) 
296
			gz|Z|z) 
286
				if [ "${y}" == "tar" ]; then
297
				if [ "${y}" == "tar" ]; then
287
					tar ${tarvars} -xzf ${DISTDIR}/${x} || die "$myfail"
298
					tar ${tarvars} -xzf ${srcdir}/${x} || die "$myfail"
288
				else
299
				else
289
					gzip -dc ${DISTDIR}/${x} > ${x%.*} || die "$myfail"
300
					gzip -dc ${srcdir}/${x} > ${x%.*} || die "$myfail"
290
				fi
301
				fi
291
				;;
302
				;;
292
			bz2) 
303
			bz2) 
293
				if [ "${y}" == "tar" ]; then
304
				if [ "${y}" == "tar" ]; then
294
					bzip2 -dc ${DISTDIR}/${x} | tar ${tarvars} -xf - || die "$myfail"
305
					bzip2 -dc ${srcdir}/${x} | tar ${tarvars} -xf - || die "$myfail"
295
				else
306
				else
296
					bzip2 -dc ${DISTDIR}/${x} > ${x%.*} || die "$myfail"
307
					bzip2 -dc ${srcdir}/${x} > ${x%.*} || die "$myfail"
297
				fi
308
				fi
298
				;;
309
				;;
299
			*)
310
			*)

Return to bug 24637