fixed build without examples (bug #540592)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 31 insertions, 57 deletions

diff --git a/app-shells/mpibash/ChangeLog b/app-shells/mpibash/ChangeLog
index e5c775b5a593..a53902ced73a 100644
--- a/app-shells/mpibash/ChangeLog
+++ b/app-shells/mpibash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/mpibash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/ChangeLog,v 1.3 2015/02/17 23:21:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/ChangeLog,v 1.4 2015/02/19 16:00:12 ottxor Exp $
+
+  19 Feb 2015; Christoph Junghans <ottxor@gentoo.org> -mpibash-1.1.ebuild,
+  mpibash-1.2.ebuild, mpibash-9999.ebuild:
+  fixed build without examples (bug #540592)
 
 *mpibash-1.2 (17 Feb 2015)
 
diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index 091903fc6fb0..306a6adc6761 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mpibash-1.1.tar.gz 346708 SHA256 bbcb4b93db7e58be11c4cebb369b52fe8ea9de1abd474f7834c9937002335877 SHA512 9729ed92025f0470dac110a2cc0a6ed971082ed98fa09493dc029dc32029474b8a51c55a571e01ee79a026f67829fc6011bcc074e318b5dfc327b3186f5d6f28 WHIRLPOOL e40b98e6762916aa30f9bdb851c8667a0d1afd11cfdf89c76125df822b41f3dccb351581168b5090bb2b890be720c4943222cbd8917d6a3065925d835da820e4
 DIST mpibash-1.2.tar.gz 347083 SHA256 5c2faaa74464111205dbae4799bd89c2425810ec3708d004237b42d620c8be57 SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104 WHIRLPOOL 94fcf50d89250a6478a2ed56a0c1769dd678869884e1e80066ebdb479dd0c6d64048ade7829020fdad050b1e77a2315ab7e325a97aa472291d3e9a4888c915e3
-EBUILD mpibash-1.1.ebuild 769 SHA256 f8919bbcf0f1ded6c90e691e1875337a34a6d2c49d86afee7d5afbb2ec6ad6fe SHA512 4bf1e2ca7bafbfe37f98fa09133fe5c97f81e79dad5b21a3736f017281a2ab179fe244fc09c1426b5adeade5da4b586328717d3c4f3fcf4cbda455f230bffa3e WHIRLPOOL 7bf3b15f60ef191bab9c3d5359e6f179920914602e5517156d6ad595716dfbf82228ae031b970412e0a3852e33b2ac4b8e2aecfacf8797fad09e4ff797df2070
-EBUILD mpibash-1.2.ebuild 1142 SHA256 793c25172cb663e369e373d89a78ea2e8ef48d20532d837c9e0477325a974b51 SHA512 168fc023f4e3c288184370b1a602b1790bcefbdd193d416c354b93ad69b10f1b2f8529192a6a89757a251af7429e36d84fa80139630f332cf619165c6ca81cae WHIRLPOOL 39d31d4265df5e65df41cc471dd6f8b015bb9b796fd0ef935e6bb28e26acf0c5a03afc64c773618514e632677013427fee8184adf47da0da2bd6653567f55707
-EBUILD mpibash-9999.ebuild 1143 SHA256 83fa85be22e1148ae14454d4f0985901028255b8b4dfe29f56543fa1190e4f9a SHA512 1cedc830234e23c5fa1214f1194389b767414d15750226ff26fd120d8727c95488e5923bbcf1028096192715011e9d89408f662c7bfc60fa178df867fef6c74d WHIRLPOOL 697928c85f226805e55b55e194f0261b8ca5c380d540506e285359f4f34f2e897d0b8567ecce6094524c27d08e3bc496c67a6cd44e5a2a154e8885590e6a3117
-MISC ChangeLog 604 SHA256 3360f9dee013d20640f60a45d0e385eabebbae5a83c145f0d5149eda6585319b SHA512 bd99bac97247299e3b61fbc66a23f0b564d4db9a08b7ed6c93d2a8ffbe54f0962afe5b57d3698d5e4f7b8ed853169ab487c56b61703cbb6702cd807417d11037 WHIRLPOOL e85fdc0cfc3a68d3dd72613dd0384087a324f45980091251633b5704b39853ae3c1415b66240a336716fd48ebc2a38974a0fdc4abdad65b0640b7d373619d497
+EBUILD mpibash-1.2.ebuild 1184 SHA256 fdf31a4b95ad23f742d262b787be12898df28e0f915aac0f27cd81d73b2b4689 SHA512 4dad8c985094b0b966591b222ea0d6054a7c67c4e1e195fd9c42d0a8f29b773157faff29fdd2c16f4ed62a1b02f757d8bca5413db5d5272d41b4092e5a2511e6 WHIRLPOOL 1f4f44f23b7f0ebe2d7959d5b4b2c36744090f17e7747c96e40868e363d0780d3bb8c7dd45a24a10478afe2a6b56154344902574dd6be03553d622716ba1a3eb
+EBUILD mpibash-9999.ebuild 1185 SHA256 6eee17c6d9e15b93e6e7656f2294e483458637c8abe3d536876fdcfd3608a4e5 SHA512 5e64f8ee3eefdbb1cd36786c5e1389666fa8c385391858f2335895004424e6793734dfb0ece01f97f39b238afae07e68d44e8509cb7a61586cf06445155ce928 WHIRLPOOL 83062cbb39d8e276d34a91f028614288423b6af18efa441235caf54dae4411f29a2779cdc6bd01c55468abf67d345eff342addd5d8069e97638fe5379c571cde
+MISC ChangeLog 768 SHA256 e550c0177df3b5ec14f000135a2b5c04f631a6d2c58793ae525546d9b70e7fdd SHA512 42efe7463cdc9ebe4b50bbc9dbb9922dea191e7efbfd5aea73a365ef0c22d8cdf6d7de67f2c080afb22c290724234a166cde33b143457aee4088e5948812347c WHIRLPOOL ddc4556016dfbe08576724a0ef8a7c85c623893c3c49499d27ff743ba6c114f2979eea28a6d427d6bc0a79bb19af44401e8f799ffb68c23afafd9aa9c1c55a50
 MISC metadata.xml 255 SHA256 0da10db3f5e42de5c943d049c66694fd96ca133308b461943c25b1f0dfa89b74 SHA512 ace4fc961efb6ff9bde0f3a2a82101c973af2e32322bc48f4c13d2c9d3e0e441722b567492652d24c471a4a4ddd5465d26baf7aac94d46de81d9b539c07e1462 WHIRLPOOL c3e442ca6808e66a196647716f43c9809e044c26509586dfb2b07fe90b5d802898ffe1b1ca4d23c7cf22da0909f4f92fd491eb1cb4cf6c97740676f7a0434f12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU48zsAAoJEOeBhlrCAAWGmywIAIQtoMvi+YlGcjFctaq4yFIP
-fXSdqbv7vtxfGzDeEmPGlTXfGD5BqJficEnuBCvoZRLpR4z37GN89T263uv1WSzR
-oBT+EK8mIq2/Disnd3Hby0RRQ/tqx1dtJH+tDqqKsyD4WCY0lKnvlgdq/aZGczpu
-qR1whGNfi1jHofvkmtWjlv/g+Qy2lm9NhcdPfT1U0ym6YoAKxocUkR+n3tnAQQQ3
-hi5UPIADJ0PX5RDwDBK/NZEzM+eaTF/34DSiWAegGRIcqtAN/XnTEldNQ2xtkGxV
-SrskXborP5BTHnzepk2AytSKw3SY5/GDJfTuIyNW2K7YMd2NvXZBMrhC/7dDbyA=
-=4zqy
+iQEcBAEBCAAGBQJU5giUAAoJEOeBhlrCAAWGPJUH/38t8QcmR1BApTh57w11qTDJ
+EZnN/XFnVTRpfG8PO/4x05HG9sJwhhmr5bpChqZQj8YLKx9+90AVCRRzSMMUqnQE
+IFjhCZEb5BVYruc81uUULZZirmw6S8nBly7UTwvAv0PrFoq0dzgvtXyo8UV9IkG2
+55qwaJBQTEfpsEh5mkdhsYlVyZCIByxXDhoCQAtC7Q/YSRw3AH0NKfOhpf7+tGRy
+9THjmkpBe2jM5VT1aFz38TLrwPbV/jMIM8ht1Z3/WcVDpCpgQ3zBx5Uii3RPbv9G
+bJ3ocTkP4dSpokwdDkO31xeTqM6+f4hfK58gJtppOTMrUxuKFhD3wWCzeeNW0GQ=
+=v+n1
 -----END PGP SIGNATURE-----
diff --git a/app-shells/mpibash/mpibash-1.1.ebuild b/app-shells/mpibash/mpibash-1.1.ebuild
deleted file mode 100644
index 700b9784ad70..000000000000
--- a/app-shells/mpibash/mpibash-1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-1.1.ebuild,v 1.1 2015/02/13 23:26:09 ottxor Exp $
-
-EAPI=5
-
-DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
-HOMEPAGE="https://github.com/losalamos/MPI-Bash"
-SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
-	sys-cluster/libcircle"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --with-bashdir="${EPREFIX}"/usr/include/bash-plugins
-}
-
-src_install() {
-	default
-	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
-}
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild
index daa43915d129..6122adfc8897 100644
--- a/app-shells/mpibash/mpibash-1.2.ebuild
+++ b/app-shells/mpibash/mpibash-1.2.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild,v 1.1 2015/02/17 23:21:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild,v 1.2 2015/02/19 16:00:12 ottxor Exp $
 
 EAPI=5
 
-inherit autotools multilib
+inherit autotools-utils multilib
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git http://github.com/losalamos/MPI-Bash.git"
 	inherit git-r3
 	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -27,17 +28,16 @@ DEPEND="virtual/mpi
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	[[ "${PV}" = 9999 ]] && eautoreconf
-}
-
 src_configure() {
-	econf --with-bashdir="${EPREFIX}"/usr/include/bash-plugins \
+	local myeconfargs=(
+		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
 	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
 }
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
index 56644f654c2d..f2754f59f3ba 100644
--- a/app-shells/mpibash/mpibash-9999.ebuild
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild,v 1.1 2015/02/17 23:10:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild,v 1.2 2015/02/19 16:00:12 ottxor Exp $
 
 EAPI=5
 
-inherit autotools multilib
+inherit autotools-utils multilib
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git http://github.com/losalamos/MPI-Bash.git"
 	inherit git-r3
 	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -27,17 +28,16 @@ DEPEND="virtual/mpi
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	[[ "${PV}" = 9999 ]] && eautoreconf
-}
-
 src_configure() {
-	econf --with-bashdir="${EPREFIX}"/usr/include/bash-plugins \
+	local myeconfargs=(
+		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
 	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
 }