From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RIUzZ-00055r-Ps for garchives@archives.gentoo.org; Tue, 25 Oct 2011 00:35:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C13D521C035; Tue, 25 Oct 2011 00:35:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A75E21C035 for ; Tue, 25 Oct 2011 00:35:37 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADAB51B400C for ; Tue, 25 Oct 2011 00:35:36 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 810702004B; Tue, 25 Oct 2011 00:35:35 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/v8: v8-9999.ebuild ChangeLog v8-3.6.6.5.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: v8-9999.ebuild ChangeLog v8-3.6.6.5.ebuild X-VCS-Directories: dev-lang/v8 X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Message-Id: <20111025003535.810702004B@flycatcher.gentoo.org> Date: Tue, 25 Oct 2011 00:35:35 +0000 (UTC) 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: X-Archives-Hash: 3b72bc7194da3ddebe7e85304ace9830 floppym 11/10/25 00:35:35 Modified: v8-9999.ebuild ChangeLog v8-3.6.6.5.ebuild Log: Rewrite pkg_preinst to properly handle ROOT, EPREFIX, and whitespace. =20 (Portage version: 2.2.0_alpha71/cvs/Linux x86_64) Revision Changes Path 1.18 dev-lang/v8/v8-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-999= 9.ebuild?rev=3D1.18&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-999= 9.ebuild?rev=3D1.18&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-999= 9.ebuild?r1=3D1.17&r2=3D1.18 Index: v8-9999.ebuild =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/dev-lang/v8/v8-9999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- v8-9999.ebuild 22 Oct 2011 11:44:36 -0000 1.17 +++ v8-9999.ebuild 25 Oct 2011 00:35:35 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.17 201= 1/10/22 11:44:36 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.18 201= 1/10/25 00:35:35 floppym Exp $ =20 EAPI=3D"3" =20 @@ -95,21 +95,27 @@ } =20 pkg_preinst() { - local preserved_candidates=3D"$(find /usr/$(get_libdir) -maxdepth 1 -na= me libv8-\*$(get_libname))" - preserved_libs=3D"" - for candidate in ${preserved_candidates}; do - if [[ -f "${D}/usr/$(get_libdir)/`basename ${candidate}`" ]]; then - continue + preserved_libs=3D() + local baselib + + eshopts_push -s nullglob + + for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do + baselib=3D${candidate##*/} + if [[ ${baselib} !=3D libv8-${soname_version}$(get_libname) ]]; then + preserved_libs+=3D( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) fi - preserved_libs+=3D" ${candidate}" done - if [[ "${preserved_libs}" !=3D "" ]]; then - preserve_old_lib ${preserved_libs} + + eshopts_pop + + if [[ ${#preserved_libs[@]} -gt 0 ]]; then + preserve_old_lib "${preserved_libs[@]}" fi } =20 pkg_postinst() { - if [[ "${preserved_libs}" !=3D "" ]]; then - preserve_old_lib_notify ${preserved_libs} + if [[ ${#preserved_libs[@]} -gt 0 ]]; then + preserve_old_lib_notify "${preserved_libs[@]}" fi } 1.94 dev-lang/v8/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/Change= Log?rev=3D1.94&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/Change= Log?rev=3D1.94&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/Change= Log?r1=3D1.93&r2=3D1.94 Index: ChangeLog =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/dev-lang/v8/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- ChangeLog 22 Oct 2011 11:53:36 -0000 1.93 +++ ChangeLog 25 Oct 2011 00:35:35 -0000 1.94 @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/v8 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.93 2011/10/= 22 11:53:36 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.94 2011/10/= 25 00:35:35 floppym Exp $ + + 25 Oct 2011; Mike Gilbert v8-3.6.6.5.ebuild, + v8-9999.ebuild: + Rewrite pkg_preinst to properly handle ROOT, EPREFIX, and whitespace. =20 *v8-3.5.10.22 (22 Oct 2011) =20 1.3 dev-lang/v8/v8-3.6.6.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-3.6= .6.5.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-3.6= .6.5.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/v8/v8-3.6= .6.5.ebuild?r1=3D1.2&r2=3D1.3 Index: v8-3.6.6.5.ebuild =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/dev-lang/v8/v8-3.6.6.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- v8-3.6.6.5.ebuild 22 Oct 2011 11:44:36 -0000 1.2 +++ v8-3.6.6.5.ebuild 25 Oct 2011 00:35:35 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.6.5.ebuild,v 1.2 2= 011/10/22 11:44:36 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.6.5.ebuild,v 1.3 2= 011/10/25 00:35:35 floppym Exp $ =20 EAPI=3D"3" =20 @@ -94,21 +94,27 @@ } =20 pkg_preinst() { - local preserved_candidates=3D"$(find /usr/$(get_libdir) -maxdepth 1 -na= me libv8-\*$(get_libname))" - preserved_libs=3D"" - for candidate in ${preserved_candidates}; do - if [[ -f "${D}/usr/$(get_libdir)/`basename ${candidate}`" ]]; then - continue + preserved_libs=3D() + local baselib + + eshopts_push -s nullglob + + for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do + baselib=3D${candidate##*/} + if [[ ${baselib} !=3D libv8-${soname_version}$(get_libname) ]]; then + preserved_libs+=3D( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) fi - preserved_libs+=3D" ${candidate}" done - if [[ "${preserved_libs}" !=3D "" ]]; then - preserve_old_lib ${preserved_libs} + + eshopts_pop + + if [[ ${#preserved_libs[@]} -gt 0 ]]; then + preserve_old_lib "${preserved_libs[@]}" fi } =20 pkg_postinst() { - if [[ "${preserved_libs}" !=3D "" ]]; then - preserve_old_lib_notify ${preserved_libs} + if [[ ${#preserved_libs[@]} -gt 0 ]]; then + preserve_old_lib_notify "${preserved_libs[@]}" fi }