[QA] Do not rely on executable script in files/, do not call Portage internal functions, bug 550540.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 38 insertions, 62 deletions

diff --git a/sys-freebsd/ubin-wrappers/ChangeLog b/sys-freebsd/ubin-wrappers/ChangeLog
index d1259f3e60bd..a7afaa65be97 100644
--- a/sys-freebsd/ubin-wrappers/ChangeLog
+++ b/sys-freebsd/ubin-wrappers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/ubin-wrappers
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog,v 1.2 2012/12/08 09:06:05 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog,v 1.3 2015/05/30 08:28:18 ulm Exp $
+
+  30 May 2015; Ulrich Müller <ulm@gentoo.org> ubin-wrappers-0.ebuild,
+  -files/dowrap:
+  [QA] Do not rely on executable script in files/, do not call Portage internal
+  functions, bug 550540.
 
   08 Dec 2012; Ulrich Müller <ulm@gentoo.org> ubin-wrappers-0.ebuild:
   Change LICENSE to public-domain, bug 441832.
diff --git a/sys-freebsd/ubin-wrappers/Manifest b/sys-freebsd/ubin-wrappers/Manifest
index c5c53913db8e..7cdcaf9a9edd 100644
--- a/sys-freebsd/ubin-wrappers/Manifest
+++ b/sys-freebsd/ubin-wrappers/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dowrap 897 SHA256 15ac4cce068345349f26ba5cc9447f653af43ad566f537822cbc0f6a2ee2ba78 SHA512 d6623425e5ac9f5f6d328aeb1ecc4c8738028c3ebced4f72a017b9dd0d5a15b8daf08a27c724c6598e2419254aa3fdf6ca5d0a28f36b34c62d37ee67f896e863 WHIRLPOOL 0fb7d17e2ee0dab296f813d65e2bfa08f8ab26c1fb114f645c54d74eab825f7fe05d05e81d30ec4f0fac96bcbd820ba96ae6dddb6748257a55ad12bf08ad7439
-EBUILD ubin-wrappers-0.ebuild 787 SHA256 7f76238df9e7eabec4de8aff4efdf70f7adf9d71c70fe2696c9b16c243280863 SHA512 d4564fbd669e6e71e2c94f69800b7d98c6335f182d7b250f18b65385431ddcfecfe6c733b023322d7974fcb64667dee650d4eaeffe35fbfcaa6f9c225e9dc24e WHIRLPOOL 64629d80edb94535c57a882d4b8c303fbe9adb8f48699f3881664a05c7a1fde398dca6ddd5f7eddf3ff0add99abed2a7ab1a98cacc27f0c5a2afa676bb12c155
-MISC ChangeLog 546 SHA256 4bd7438b031f32b32a198985777b8c8e8e5d93118fe727a9dc9ab0f65818da2a SHA512 e69aaa1be21a7fd6c6627a4bd0baf0479ffbd3dc24de9ea40d646d6a0a1281617a974192191d05339871dffdb1320665167f2723dc5f903b8a99051c10897428 WHIRLPOOL 874fe9c33b18eac2195dd15a3fda180dccbd497a5f893f419e6bbb70123ab80ad9ca844c64a284510bf2e8b18d901af2151daba678b809e18b03c02a7a31981e
+EBUILD ubin-wrappers-0.ebuild 900 SHA256 60101cfa68532dc2980c650734d4f853a83d91ab813e2ba139a7678d5625418f SHA512 d08454b1a962c78bc964c0fee8d47c635885782077cbe9186894e293851ba008614a9c3436ecf090bc78c0faf547bdf78329cd63758d33ce05e89cdcb9a4c191 WHIRLPOOL 0bd05a1d691218e491fdbd74783bf2f6b9376209039be1100f52b539120af436177c233a2c0eb0b89297ed19c27d9a6d49b2853d6c1a8abda25dffc658e15f5e
+MISC ChangeLog 740 SHA256 7b6bc7e69e64037e55a4142db3ad2af4d22de27be7103cd359a5f841435358f3 SHA512 b484591639d7bced237e5e30ba665c26ebbcd091a03da0aa2baa1190b0156d5f634908bb9b4ddb52faffb9cfe07a32d73ef174ef2b964853634ebc03c384fb5e WHIRLPOOL 91c24cc24bbca8a0d7fdea5239541756d2c9c93a07265dfe3c14ed6d01a920b1b1240e16b072fafd5f33cb18cb0639c81037650657af6a1a703d57b34dd1bec8
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQwwNbAAoJEDxpGckxwJCBLI4P/239xqyVVpfZwJu/KQ8mod4U
-W9Z670AG4hcRtxA721LOL3D/jzNIwiEoMyqph9Bin61anFqFLBtWWau7lSVpou7R
-bhSk+SNIO464Zg7QXaT9QjjUJnFGAx0YqFnpDtw/OwN3q98Q06T3eLz+lUWn9vGk
-+yvYCKb4wN5IFlLc/71E4Qa/zJctFZOHK+3BfypbIHA1bwgQ6FraWMmGhbnHd9Gs
-DxFJJ9jNsaAbiRiYXuJqE0vFRy9JGammv91ZnonlisE+exIkk3l/cs/z5IpkUnVf
-mcznoL/L9V0ziwXJnTjA+/aOjqXxS1q0AO0Q6L1tgotJVKmy7AVk1u9NkLtyP7P0
-RXZqEEDQCkcDzKjxtw/YpdpNgKvaVdsUHeTC5JPHv8q3RbBg/eTu1+D+y8Y8qBmB
-a9KeVXt9O5ISxIXvxLitxFaXm3nhkIRPZ4iDy4i/3MCOFIoSBqRIsA2bKtObd2t7
-mKGo6Qu2qiYCGzOn0/NGPzBuwAAWguyNopX/gjDJZchbY4EMfPgXe/6kMGfQnV/q
-InCVINkEH9rheGC9s4Z7Pu7LH4gMgDl8WxinVCRHGgq78UyL6mclgZ9coQjAMhFW
-RY2FdAzc09t/fb1i7n1haZ86qYDWti1L2OXy60OYqLmc7JrlKu+OOBl+kPJkFQB/
-9U31mImHMXeuep3d68cp
-=QtXJ
+iQGcBAEBCAAGBQJVaXQ0AAoJEJQzkH1pP7W4kOoMAJxAGn9EZtc5im12cIBhgY7q
+9iuiUL9ZB0YlStVRxU1kOE+FgFn1ghRQ+gUP4HZaXgvmOBMG2+ekusybc76ZgkLV
+KH9yG6R16F+0i7KHnSIC6V/cYYIKrnjVsbntdJOO1Nj/l26PZuSQDwjgtaPWmuhj
+cjNOi7Z6DPWP/huuCNQXTAHcCXG7HE7RCJUiE31TMRD2fZEGggzxHa2Xj2J2oz4Q
+ngvFQlPsOl5ZfEGTL5v0cq0VaO3OSO8VjClBpfT3L/nhR6kaaIbvHUCVA3pXP1Ha
+jpEwLVEdD6WQ85OSFzgEFwq6jxtPXoJ/nmwBAqY4/9QNX0EFsdBiSeXGEnmS5HmJ
+N5wgKmIWpJaYa/BcDiYBkYFmKI58rdxrQfkEXLcnmIO/3T+i59jXSjaagJ2viB3w
+j+trCh7LHqp4TlXjYd9PnL3P4gBKZfRXr2+gjloFdySyKU7sJ3Z5IOqxT8fNj2bg
+twKKexVXsGFTVNZcP6CBli71EmHzimpBZDeu22xe/A==
+=h20T
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/ubin-wrappers/files/dowrap b/sys-freebsd/ubin-wrappers/files/dowrap
deleted file mode 100755
index be8d016ad894..000000000000
--- a/sys-freebsd/ubin-wrappers/files/dowrap
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
-
-
-if [[ $# -lt 1 ]] ; then
-	helpers_die "${0##*/}: at least one argument needed"
-	exit 1
-fi
-
-if [[ ! -d ${ED}${DESTTREE} ]] ; then
-	install -d "${ED}${DESTTREE}" || { helpers_die "${0##*/}: failed to install ${ED}${DESTTREE}"; exit 2; }
-fi
-
-ret=0
-
-for x in "$@" ; do
-	if [[ -e ${x} ]] ; then
-		echo "#!/bin/sh" > "${ED}${DESTTREE}/$(basename ${x})"
-		echo "exec ${x} "'${1:+"$@"}' >> "${ED}${DESTTREE}/$(basename ${x})"
-		chmod 0755 "${ED}${DESTTREE}/$(basename ${x})"
-		chown ${PORTAGE_INST_UID:-0}:${PORTAGE_INST_GID:-0} "${ED}${DESTTREE}/$(basename ${x})"
-	else
-		echo "!!! ${0##*/}: $x does not exist" 1>&2
-		false
-	fi
-	((ret|=$?))
-done
-
-[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
-exit ${ret}
diff --git a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
index a5b59651a8e5..b1935147837c 100644
--- a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
+++ b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild,v 1.2 2012/12/08 09:06:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild,v 1.3 2015/05/30 08:28:18 ulm Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="/usr/bin wrapper scripts for FreeBSD script compatibility"
 HOMEPAGE="http://www.gentoo.org"
@@ -18,12 +18,20 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
-src_install()
-{
-
-	into /usr/bin
-	"${FILESDIR}/dowrap" "${EPREFIX}/bin/"{bunzip2,bzcat,cpio,egrep,fgrep,grep,gunzip,gzip,zcat}
-	use userland_BSD && "${FILESDIR}/dowrap" "${EPREFIX}/bin/sort"
-	use userland_GNU && "${FILESDIR}/dowrap" "${EPREFIX}/bin/"{fuser,sed,uncompress}
+dowrap() {
+	local x
+	for x do
+		[[ -e ${x} ]] || die "${x} does not exist"
+		newbin - "$(basename "${x}")" <<-EOF
+			#!/bin/sh
+			exec ${x} \${1:+"\$@"}
+		EOF
+	done
+}
 
+src_install() {
+	dowrap \
+		"${EPREFIX}"/bin/{bunzip2,bzcat,cpio,egrep,fgrep,grep,gunzip,gzip,zcat}
+	use userland_BSD && dowrap "${EPREFIX}"/bin/sort
+	use userland_GNU && dowrap "${EPREFIX}"/bin/{fuser,sed,uncompress}
 }