Index: pkgconf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v retrieving revision 1.12 diff -u -B -r1.12 pkgconf-9999.ebuild --- pkgconf-9999.ebuild 17 Oct 2012 15:51:49 -0000 1.12 +++ pkgconf-9999.ebuild 28 Mar 2014 11:49:55 -0000 @@ -2,13 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v 1.12 2012/10/17 15:51:49 ryao Exp $ -EAPI="4" +EAPI=5 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 + inherit autotools git-2 multilib-minimal else - inherit autotools vcs-snapshot + inherit autotools multilib-minimal vcs-snapshot SRC_URI="https://github.com/pkgconf/pkgconf/tarball/${P} -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" fi @@ -28,15 +28,26 @@ !dev-util/pkgconfig-openbsd[pkg-config] )" +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf +) + src_prepare() { [[ -e configure ]] || eautoreconf + + if use pkg-config; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config + ) + fi } -src_configure() { +multilib_src_configure() { + ECONF_SOURCE=${S} \ econf $(use_enable strict) } -src_install() { +multilib_src_install() { default use pkg-config \ && dosym pkgconf /usr/bin/pkg-config \