From a004655fbad62394aea65603608af5b1d17d9313 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 7 Aug 2022 07:22:36 +0100 Subject: dev-util/pkgconf: fix cleanup error Signed-off-by: Sam James --- dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild | 70 ++++++++++++++++++++++++++++++++ dev-util/pkgconf/pkgconf-1.9.0.ebuild | 69 ------------------------------- dev-util/pkgconf/pkgconf-9999.ebuild | 4 +- 3 files changed, 73 insertions(+), 70 deletions(-) create mode 100644 dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild delete mode 100644 dev-util/pkgconf/pkgconf-1.9.0.ebuild (limited to 'dev-util/pkgconf') diff --git a/dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild new file mode 100644 index 000000000000..743bdb4a60b0 --- /dev/null +++ b/dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 2012-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib multilib-minimal + +if [[ ${PV} == 9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" +else + SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + # Per release notes, 1.9.0 is a testing/development release. + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" + +LICENSE="ISC" +SLOT="0/4" +IUSE="test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND="!dev-util/pkgconfig" + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local myeconfargs=( + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-util/pkgconf/pkgconf-1.9.0.ebuild b/dev-util/pkgconf/pkgconf-1.9.0.ebuild deleted file mode 100644 index c63109267d0a..000000000000 --- a/dev-util/pkgconf/pkgconf-1.9.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - # Per release notes, 1.9.0 is a testing/development release. - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index a889721e17d0..f2e53e490eb3 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -10,6 +10,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" else SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + # Per release notes, 1.9.0 is a testing/development release. KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -35,7 +36,8 @@ src_prepare() { [[ ${PV} == 9999 ]] && eautoreconf - MULTILIB_CHOST_TOOLS+=( + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf /usr/bin/pkg-config$(get_exeext) ) } -- cgit v1.2.3-65-gdbad