ottxor 15/02/19 16:00:12 Modified: mpibash-1.2.ebuild mpibash-9999.ebuild ChangeLog Removed: mpibash-1.1.ebuild Log: fixed build without examples (bug #540592) (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.2 app-shells/mpibash/mpibash-1.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild?r1=1.1&r2=1.2 Index: mpibash-1.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpibash-1.2.ebuild 17 Feb 2015 23:21:14 -0000 1.1 +++ mpibash-1.2.ebuild 19 Feb 2015 16:00:12 -0000 1.2 @@ -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 @@ 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 } 1.2 app-shells/mpibash/mpibash-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild?r1=1.1&r2=1.2 Index: mpibash-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpibash-9999.ebuild 17 Feb 2015 23:10:31 -0000 1.1 +++ mpibash-9999.ebuild 19 Feb 2015 16:00:12 -0000 1.2 @@ -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 @@ 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 } 1.4 app-shells/mpibash/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/ChangeLog?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/ChangeLog?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/mpibash/ChangeLog?r1=1.3&r2=1.4 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/mpibash/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 17 Feb 2015 23:21:14 -0000 1.3 +++ ChangeLog 19 Feb 2015 16:00:12 -0000 1.4 @@ -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 <[email protected]> -mpibash-1.1.ebuild, + mpibash-1.2.ebuild, mpibash-9999.ebuild: + fixed build without examples (bug #540592) *mpibash-1.2 (17 Feb 2015)
