[QA] Revision bump to 4.2_p46-r1 for EAPI 5 and Prefix support.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 42 insertions, 38 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8fdf8375965c..d97632ea66df 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.360 2014/04/01 06:47:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.361 2014/04/02 09:11:25 tomwij Exp $
+
+*bash-4.2_p46-r1 (02 Apr 2014)
+
+  02 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +bash-4.2_p46-r1.ebuild,
+  -bash-4.2_p46.ebuild:
+  [QA] Revision bump to 4.2_p46-r1 for EAPI 5 and Prefix support.
 
 *bash-4.2_p46 (01 Apr 2014)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 34d52253e9b4..a8aec46a6c6c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -219,24 +219,18 @@ EBUILD bash-4.0_p38.ebuild 4464 SHA256 d6aa599f3e77808c09095c892c684a5a589fa7db9
 EBUILD bash-4.1_p11.ebuild 4199 SHA256 b6163a5d4aef950e3b5dad8c2590323549072b9f8819a939eda692fefccfb38c SHA512 06b47daa5e875b03408f2acc8108d52275a4e4681a0f88b9bd89ee43fb6db3d963b54086d0039c4bae90916b5b059bfdb53288877ffe3d08a0d4a91bcde634e5 WHIRLPOOL bf23eed9aba5773e423171c89ebeff05106864a4a3507ed186d1cbfd8fe982fc53e081b389937aaa7d6ee6ea54a98ecfc618a6fe67170ac9600573054bee3a8f
 EBUILD bash-4.2_p45-r1.ebuild 6627 SHA256 4279e47b504a597dd6be4ecb6eef33c7909c8f6d226117dd0565f0d0835b7914 SHA512 76cef739863b630608ac416037d4ae273b1ee9eaeb5c65e1f5b9ea9c4d987460d9406ead515a5d85f87175b866ef194c839d1341b3cb3615b276c45cbdefec2f WHIRLPOOL 554c2b95883066936dab181f5540cfdae5f4c197bd37b34ff0a8be60398ef8e5285041e813d669cc5b4140aebf622441a35c86e0daa98d07c35bd5a332cbb211
 EBUILD bash-4.2_p45.ebuild 6525 SHA256 784442914f6f6740031598a0cf1baaec087d973e6460d76a32baa120a2794b8e SHA512 8b6c57dead7a18b429632694e5d1e35791b262cd09c3d49919287c2b07ab9e524b9a758e247a8d2706ddfae2576d19e535c9467b7ef99ed08ddb041ef60025da WHIRLPOOL 55954d5cb13b064f89305af8c5de0c7f84714afb08c0f07bf4703ef62860cf08f9e9f38ba60a4e891d5cb0f26f0e46d26e2eea553b0785bc9e82d790b6c4d111
-EBUILD bash-4.2_p46.ebuild 6624 SHA256 9df5501768621e508d782ae73457aedd0632df8ffbb6052e41214d812aaafa50 SHA512 676b2dd02b5ce9b888da71c7452b9ec4507405cee9707cb9d1a5df70890a2c7c5b6c7bb6f6237d574163ff2f59ffa3a359ecb7a34ad81021ca2b2972831a2c54 WHIRLPOOL d93ed91c0632af8d93a1ebaa4797e5123dfd8fe1c99038d577ee1ba32ce2544aec2215f5dc6c922a06c622e1c0ebb53d058cf4d080b12ae1bb08790b1cc625fd
+EBUILD bash-4.2_p46-r1.ebuild 6644 SHA256 832f00d4150a35bfb521dd7926f5a070705a4573787c574f65616193c1329887 SHA512 ae96b80613d9157c03cb9c1c95f5665ccdce0dc0590b4e386bea94453bb1125d7391bb0a758bfa3146e0f74794fad42eba43b310d8856d08427afd7ec3646896 WHIRLPOOL d60cd1e0625fa545bf6aa7fda42b805e508b5be616e86678e691569f873d0928606484eb174b834698b182d35cad60449d91cab2be0ade635ec0b735bb819b2c
 EBUILD bash-4.3_p8.ebuild 6797 SHA256 7ef3886c960ae87840c96c267bd6b318857ff0442a6e14df1cf1f55d2df4123b SHA512 6589d4d705dc3af927b2387c8e92015d2454ef9b579c238c81f8912019c14681522343f6c060f970fe71834f07b2b56e6fa3d9fb3ff06233090add53d7828d12 WHIRLPOOL 1c7d84ffb04f80b3e936e9158022095c1124d1c2a230ed0bd038a48a65cb5124e8831f9677cdcf00d540f2f7374fed0215cc6350b2dbddec803816200a777a37
-MISC ChangeLog 55583 SHA256 a91de75e8df1629b792823fb057e863a8d23397bc7bf529bbe215e8ee28099ad SHA512 93d399f89a9ece87f52c7a8627ed870776f8a00dc26e3e036e318c030fc5d3e41c7e44fd74af80e97828579e757c9c92071a829296f33b10c14503566fc2e7ef WHIRLPOOL ad2db8177365670d7191b8c264207e0fc7546047d506c5c5bc5cc175b8eae711327e1a803e300d8dabcef8dabc7d1ed3af51cbb2313b123499ee5decaabcb884
+MISC ChangeLog 55778 SHA256 ef4a7a5fc9e03e27f3f91adf9b56677dd467befc514a4457e4eae23eacc2a553 SHA512 d0865b5edc686ac43ba5bc88b69aaae9150c96a3299fdce8096cbc5aa7744a84f5162eab3dc97efc06c34233b489169a53915155ddf606bcb3572f9d5a191243 WHIRLPOOL 1c4c72f4a66b48c8490a6a5da0267e8e1f20ec579a6733d35f53d89c43fbace3a2b2a608b7b9fb0ea4b54744c5fcb93229ff92ac8e9d346d956e84658af104e0
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTOmEYAAoJEPGu1DbS6WIAwCUP/1uXGL9MhTO91YceoUujzeIf
-EPH78gO0AICT1IYt/fCb2MZfPSP5zuWvm1Qj5I9KpjbqduW89mvgrVnbOfxzbfTD
-69NGLk3vup3R4vvCMTsDOO5b8DCfwb7HZUtfpoGDRoObTLCCEL/6Pfg/kXQI3I1r
-ZesoFp1Ou0kXBMRS8ejU/7O79qyFHnqjAj5xGipgm+BbOfKXN/t7Gr6GHma1s2sy
-74AKK66dtZzYW/NOZabcsQBjKfifG6drM+ezVRFTk+qqLBahhtnkCJuGZOpUxULU
-+VOAPPUUpGBjSs8l3B4emKSCSTsJbhXd64Uh1QhvJaWd4WZuK8N19otSA9JQr74Y
-VxXXZ5OS6uVEyUb5MC5H0lX0o9Axp7B+uhdUrBej86Heabtvw6t5dHgRxABZAqKU
-enX2uDYCZy6/cWW5yuurayPjjPpPWD3DJULQqoIM+FI3PbklsbpHK2bB9f1PB0eJ
-GPO8GTcybHytjRF5GwfhdEAXyA2xf5LxQox6+DgBp5weh357FadlULYPdB6Vdqyq
-t20bY/RpkNDYZcwSvFKGMMQFqJS17bRBcKQEDXSTGTpV6xT5e3HjWR+3e8Bys48P
-JaLwRsFp9n50pjM1NVD62tPkNoCvylLSwuWrKK2oBg9jZdd8/wx5haK5569arjP/
-e0lt2BnBQCTs2TIiirC7
-=h2PH
+iQEcBAEBCAAGBQJTO9QmAAoJEJWyH81tNOV9714H+gLA3xs1s+rWVvMdngS11MUN
++LIr0KvkuEIbbXPhSdS+MhKvfgynmyi/pIb/iW9KmG87Gt75D1QbZf5x5LVzpOBp
+qz0IE6HBGH7ppT1yeti1nD9REzU/NdVsOrasy6j3vLAx6z+Q4r2/yz37RW/av1GG
+jsQWjcKcewECmFJyCgKVeytqjOOGbcMnui0Y3IEaJtb0yewkHNUGxxkmy6bO51/1
+L6YcgDjGE+juGzjKZT73Fj15OSi7L4TAT2wG8N3M9ydXe5dK3Lvaow7GMNk1pM7J
+wB8sezpMs6byUhGts+GgXOpUSOl4GM8ig2UxJp3MqomyHJ0zHvFdwhGBIqUiYrQ=
+=Qnf+
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p46.ebuild b/app-shells/bash/bash-4.2_p46-r1.ebuild
index 4c2967f2abcb..63c587b2c0bf 100644
--- a/app-shells/bash/bash-4.2_p46.ebuild
+++ b/app-shells/bash/bash-4.2_p46-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p46.ebuild,v 1.1 2014/04/01 06:47:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p46-r1.ebuild,v 1.1 2014/04/02 09:11:25 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -41,8 +41,8 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
 	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
+	!!<sys-apps/portage-2.1.6.7_p1
+	!!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
 
@@ -62,8 +62,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
 
@@ -87,7 +88,7 @@ src_unpack() {
 	epatch_user
 }
 
-src_compile() {
+src_configure() {
 	local myconf=()
 
 	# For descriptions of these, see config-top.h
@@ -135,18 +136,21 @@ src_compile() {
 		$(use_enable readline history) \
 		$(use_enable readline bang-history) \
 		"${myconf[@]}"
-	emake || die
+}
+
+src_compile() {
+	emake
 
 	if use plugins ; then
-		emake -C examples/loadables all others || die
+		emake -C examples/loadables all others
 	fi
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}"
 
 	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
@@ -168,12 +172,12 @@ src_install() {
 	fi
 	sed -i \
 		"${sed_args[@]}" \
-		"${D}"/etc/skel/.bashrc \
-		"${D}"/etc/bash/bashrc || die
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
 
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
 		insinto /usr/include/bash-plugins
 		doins *.h builtins/*.h examples/loadables/*.h include/*.h \
 			lib/{glob/glob.h,tilde/tilde.h}
@@ -199,24 +203,24 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
-		mkdir -p "${ROOT}"/etc/bash
-		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
 	fi
 
-	if [[ -L ${ROOT}/bin/sh ]]; then
+	if [[ -L ${EROOT}/bin/sh ]]; then
 		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
 		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${ROOT}"/bin/sh)
-		local tmp=$(emktemp "${ROOT}"/bin)
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
 		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${ROOT}"/bin/sh
+		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
 }
 
 pkg_postinst() {
 	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${ROOT}/bin/sh ]]; then
-		ln -sf bash "${ROOT}"/bin/sh
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf bash "${EROOT}"/bin/sh
 	fi
 }