diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest index af60a22e7d..866cfc71e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest @@ -1,2 +1,2 @@ -DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28 +DIST pkgconf-1.9.3.tar.xz 308612 BLAKE2B 90d48171e24235906c41e97f7a2fa53825724c7500e90e502e5e2e4d668d3be863119e39b83a8e02adcef83a7def42e1c5e3641e77f6194bd81f653776bc95b4 SHA512 f65583f78571e4da161201d6387091562b38893adc31df421b0e6d560a060deb306a0b7ad8b28266253244c935d0a8169f35e04825a7857f21a09527d36f921e diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml index 492c5279d5..53180d5fbb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml @@ -5,10 +5,6 @@ floppym@gentoo.org Mike Gilbert - - polynomial-c@gentoo.org - Lars Wendler - base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild index 2e564e60bf..bb47d458c3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2021 Gentoo Authors +# Copyright 2012-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,14 +7,14 @@ inherit multilib multilib-minimal if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf" + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" else - SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + 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://git.sr.ht/~kaniini/pkgconf" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" SLOT="0/3" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild index b174cb7572..e962927aff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild @@ -1,26 +1,26 @@ -# Copyright 2012-2021 Gentoo Authors +# Copyright 2012-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib multilib-minimal -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf" + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" else - SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos" + SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + # Per release notes, 1.9.x 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://git.sr.ht/~kaniini/pkgconf" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" -SLOT="0/3" +SLOT="0/4" IUSE="test" -# tests require 'kyua' RESTRICT="!test? ( test )" BDEPEND=" @@ -29,31 +29,26 @@ BDEPEND=" dev-util/kyua ) " -RDEPEND=" - !dev-util/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf$(get_exeext) -) +RDEPEND="!dev-util/pkgconfig" src_prepare() { default - [[ ${PV} == "9999" ]] && eautoreconf - MULTILIB_CHOST_TOOLS+=( + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf /usr/bin/pkg-config$(get_exeext) ) } multilib_src_configure() { - local ECONF_SOURCE="${S}" - local args=( - --disable-static + local myeconfargs=( --with-system-includedir="${EPREFIX}/usr/include" --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" ) - econf "${args[@]}" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_test() { @@ -70,5 +65,6 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild index 8ac703ecfd..e962927aff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild @@ -1,26 +1,26 @@ -# Copyright 2012-2021 Gentoo Authors +# Copyright 2012-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib multilib-minimal -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/pkgconf/pkgconf.git" + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" else - SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos" + SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + # Per release notes, 1.9.x 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://git.sr.ht/~kaniini/pkgconf" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" -SLOT="0/3" +SLOT="0/4" IUSE="test" -# tests require 'kyua' RESTRICT="!test? ( test )" BDEPEND=" @@ -29,31 +29,26 @@ BDEPEND=" dev-util/kyua ) " -RDEPEND=" - !dev-util/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf$(get_exeext) -) +RDEPEND="!dev-util/pkgconfig" src_prepare() { default - [[ ${PV} == "9999" ]] && eautoreconf - MULTILIB_CHOST_TOOLS+=( + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf /usr/bin/pkg-config$(get_exeext) ) } multilib_src_configure() { - local ECONF_SOURCE="${S}" - local args=( - --disable-static + local myeconfargs=( --with-system-includedir="${EPREFIX}/usr/include" --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" ) - econf "${args[@]}" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_test() { @@ -70,5 +65,6 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs + find "${ED}" -type f -name '*.la' -delete || die }