mgorny 14/03/30 09:16:07 Modified: pkgconf-9999.ebuild ChangeLog Added: pkgconf-0.9.3-r1.ebuild Log: Enable multilib support, bug #506062. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.13 dev-util/pkgconf/pkgconf-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild?r1=1.12&r2=1.13 Index: pkgconf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pkgconf-9999.ebuild 17 Oct 2012 15:51:49 -0000 1.12 +++ pkgconf-9999.ebuild 30 Mar 2014 09:16:07 -0000 1.13 @@ -1,14 +1,14 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v 1.13 2014/03/30 09:16:07 mgorny 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 \ 1.83 dev-util/pkgconf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/ChangeLog?rev=1.83&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/ChangeLog?rev=1.83&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/ChangeLog?r1=1.82&r2=1.83 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ChangeLog 13 Feb 2014 19:20:29 -0000 1.82 +++ ChangeLog 30 Mar 2014 09:16:07 -0000 1.83 @@ -1,6 +1,12 @@ # ChangeLog for dev-util/pkgconf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.82 2014/02/13 19:20:29 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.83 2014/03/30 09:16:07 mgorny Exp $ + +*pkgconf-0.9.3-r1 (30 Mar 2014) + + 30 Mar 2014; Michał Górny <[email protected]> +pkgconf-0.9.3-r1.ebuild, + pkgconf-9999.ebuild: + Enable multilib support, bug #506062. 13 Feb 2014; Richard Yao <[email protected]> pkgconf-0.9.3.ebuild: keyword on ~x64-solaris 1.1 dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild?rev=1.1&content-type=text/plain Index: pkgconf-0.9.3-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild,v 1.1 2014/03/30 09:16:07 mgorny Exp $ EAPI=5 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" inherit autotools git-2 multilib-minimal else inherit eutils multilib-minimal SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"; KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" HOMEPAGE="https://github.com/pkgconf/pkgconf"; LICENSE="BSD-1" SLOT="0" IUSE="+pkg-config strict" DEPEND="" RDEPEND="${DEPEND} pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !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 } multilib_src_configure() { ECONF_SOURCE=${S} \ econf $(use_enable strict) } multilib_src_install() { default use pkg-config \ && dosym pkgconf /usr/bin/pkg-config \ || rm "${ED}"/usr/share/aclocal/pkg.m4 \ || die }
