commit: 526fb15e0d3122564e0211c466cac4e9e35ef687 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Sun Sep 25 14:44:01 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 22 09:27:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526fb15e
dev-util/pkgconf: bump to version 1.0.1 - fixes test failures (bug #562220) - migrate to EAPI6 and git-r3 Gentoo-Bug: https://bugs.gentoo.org/562220 Closes: https://github.com/gentoo/gentoo/pull/2410 Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-util/pkgconf/Manifest | 1 + dev-util/pkgconf/metadata.xml | 1 - .../{pkgconf-9999.ebuild => pkgconf-1.0.1.ebuild} | 30 +++++++++++++--------- dev-util/pkgconf/pkgconf-9999.ebuild | 30 +++++++++++++--------- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index c86c49e..366e7db 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,2 +1,3 @@ DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2 DIST pkgconf-0.9.12.tar.bz2 87109 SHA256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f SHA512 efe13db7a46992eb44ead493fc12b3fc6a5567e0206f701b6c48d9b5eb0bc90fcc9ae7a7e08ae641bb10df869287e5b68291701d4013d6cf27bd2b1518c29192 WHIRLPOOL 9fa7336e111f29648f5c37310bdeb2266bead1b86ff18183cfb57c06054916d235da20a5723bd364497d20a1f4db399eaf77f38c0bfc1519f2b7b825ab4666d0 +DIST pkgconf-1.0.1.tar.gz 362653 SHA256 45ce2f6ab032451345185b800badd77c054040879bd2e56225dafc7fbe583cf1 SHA512 b379ed366327eb4de3a7ed732be58a3757fdcd231637f0fbc2f9b762fda08173244d05fd853d683cfa6bdad90f1d8ee663b3eae9aee024456ef46e8a021e7122 WHIRLPOOL ba9a26874d14b6dfd62858da1b50397bc0aa9637bfe0824d4911f4df1e430e60a9f589242f8dc60a792b16f5201f9e0944d637e0d3a4749a211b976459152d69 diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml index 818df19..bd273d8 100644 --- a/dev-util/pkgconf/metadata.xml +++ b/dev-util/pkgconf/metadata.xml @@ -4,7 +4,6 @@ <maintainer type="person"> <email>elizab...@interlinked.me</email> <name>Elizabeth Myers</name> - <description>Proxied maintainer; set to assignee in all bugs</description> </maintainer> <maintainer type="project"> <email>proxy-ma...@gentoo.org</email> diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-1.0.1.ebuild similarity index 52% copy from dev-util/pkgconf/pkgconf-9999.ebuild copy to dev-util/pkgconf/pkgconf-1.0.1.ebuild index aed82b2..eff8a40 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-1.0.1.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 multilib-minimal + EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git ) + inherit autotools git-r3 else - 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" + SRC_URI="https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +inherit multilib-minimal + DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" HOMEPAGE="https://github.com/pkgconf/pkgconf"; @@ -33,8 +36,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { - [[ -e configure ]] || eautoreconf + default + [[ ${PV} == "9999" ]] && eautoreconf if use pkg-config; then MULTILIB_CHOST_TOOLS+=( /usr/bin/pkg-config @@ -49,8 +53,10 @@ multilib_src_configure() { multilib_src_install() { default - use pkg-config \ - && dosym pkgconf /usr/bin/pkg-config \ - || rm "${ED}"/usr/share/aclocal/pkg.m4 \ - || die + + if use pkg-config; then + dosym pkgconf /usr/bin/pkg-config + else + rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die + fi } diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index aed82b2..eff8a40 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 multilib-minimal + EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git ) + inherit autotools git-r3 else - 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" + SRC_URI="https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +inherit multilib-minimal + DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" HOMEPAGE="https://github.com/pkgconf/pkgconf"; @@ -33,8 +36,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { - [[ -e configure ]] || eautoreconf + default + [[ ${PV} == "9999" ]] && eautoreconf if use pkg-config; then MULTILIB_CHOST_TOOLS+=( /usr/bin/pkg-config @@ -49,8 +53,10 @@ multilib_src_configure() { multilib_src_install() { default - use pkg-config \ - && dosym pkgconf /usr/bin/pkg-config \ - || rm "${ED}"/usr/share/aclocal/pkg.m4 \ - || die + + if use pkg-config; then + dosym pkgconf /usr/bin/pkg-config + else + rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die + fi }
