summaryrefslogtreecommitdiff
path: root/dev-util/pkgconf
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/pkgconf')
-rw-r--r--dev-util/pkgconf/Manifest11
-rw-r--r--dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch24
-rw-r--r--dev-util/pkgconf/metadata.xml3
-rw-r--r--dev-util/pkgconf/pkgconf-1.6.3.ebuild82
-rw-r--r--dev-util/pkgconf/pkgconf-1.7.4.ebuild4
-rw-r--r--dev-util/pkgconf/pkgconf-1.8.0.ebuild2
-rw-r--r--dev-util/pkgconf/pkgconf-9999.ebuild6
7 files changed, 11 insertions, 121 deletions
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 14a6aefef453..9e49947eae0a 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,6 @@
-AUX pkgconf-1.7.3-darwin9.patch 517 BLAKE2B f6f2374bb32aa2e9513df0c91e51ee41e0c8d1c847c3d00ac3a420a6299d3abca74d211b0e3b52a41d1a64d737d18d4348e5ea72ae5537425d14e8bac1fd1a67 SHA512 f55e795a503d5a0349968a6b69f3aae6335d90daa38c6f829f7ce54ab63beedde48e37a59397263aa8dffefbabc1bd9d22aeeff8d0111f7e317b580272aa3d41
-DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-EBUILD pkgconf-1.6.3.ebuild 1668 BLAKE2B 2343a05fc855973ed0868d066c1ff5067905b0378676efefa47211e06201f36bb3171b04754fa82f6c5044baf6465f958f7880c0285224f9431838ff86e6142b SHA512 6033f6726fd819119b2e6506e68b0bd22b50f754fa4f12c2f689b4d7a0a03c20d310203ce92eba07b90313028904f6d30c116933b305d7442438d1c8b6d9612a
-EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ed29dd0df41ffce8527085cc96af044e11ab33ecaaa91897cc3e174a4c1a7559b60c4608bf4192e917a2c645482af7cec704e7aac28adec1df53d910c2724d60 SHA512 7964d22b28ab00ee8d8ba63e24c54ef66366ce8e961a9f28142d6e00731f4870d598b08f7354f4ceff97e40da3caad60bb9066397019b061fd09c758af2a0b68
-EBUILD pkgconf-1.8.0.ebuild 1880 BLAKE2B 52f19a7111de7ba6de8906d59dba37be6c27cb75daa17758dc8f65c98b7fa9b63592b35b665d28db897e3e5dbe9590adfc601555b5dbc4dbd27891e9859209bc SHA512 abec978faca72c4286ed74fe9bd6479a78b8ae87fca9ce29d8552cee1ca7de0f53eb92fe13918700fb0dc1c09e0e6075e24777ed8fd9c2febe999e9b1889f09a
-EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
-MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
+EBUILD pkgconf-1.7.4.ebuild 1792 BLAKE2B 11d4e56fc11e64e3c3fbc3fefff0c4e63b48f7a7276b814601b6cf1afa90d43d8b79e07864ad91a48da1ef9d5bd92fe229780e5f442b0d87c589c7e5756cbff2 SHA512 8d818589365b14b13991546b26c00dc10ead19246c8d464d6c6ae30a4ee22df1f5f0035bbe68757857182be094ffc20547894034353976873868e5eba0fd7962
+EBUILD pkgconf-1.8.0.ebuild 1800 BLAKE2B a9a820deedff587a5c6229dd52d4902a3183eed39dbcb5277e757203a22756ee67584ad87327a54289b7ec0fb3f6ca5a0d8f430d478b504088e08b8c43ce377c SHA512 a4e406b66bd33c71de03f8b71c0f68177cf9693db8e4d74ed30078fe30d6887c94dea861eb8c18d06589e61af2f087bd1a5db59040743cdb0f1cb3e59651a5f2
+EBUILD pkgconf-9999.ebuild 1804 BLAKE2B 3404606c1a539968083011ff32730df918e97e8666bfbe934fb571c9dc558637a784ada2f2db1ddeeb7e56eef1b43a34813d65952e917e7891d0ed0c048794a6 SHA512 fb056ad2cbee82dfd2679b4e2adcb73ebf799b9ead815357363d6dfd50d49bd4d261c1d3fca248e1631bc7884247e2a1909ccd6a239757467f6c98ad31fda540
+MISC metadata.xml 689 BLAKE2B ba307c593f7ff5b271b4795f114e3dbaf3ae03a72719ee6bbece732bf4669f9633a25fb8fcdd295907a77dfbcbf4914ce68ac4afc3e2fc4a014609312af7001b SHA512 e7364d608bba7294d4e24f7f2c7d9fbbe2fb90f2ca855ed55ffe2b7abb21fba19520c771c8b990ce3427b92900a0cdecc62582fd69892744fed4efad4186e82c
diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
deleted file mode 100644
index f41de43b97c5..000000000000
--- a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-darwin9 does not malloc on NULL resolved_path
-
-https://github.com/pkgconf/pkgconf/pull/208
-
---- a/libpkgconf/path.c
-+++ b/libpkgconf/path.c
-@@ -92,15 +92,11 @@
- return;
- if (S_ISLNK(st.st_mode))
- {
-- char *linkdest = realpath(path, NULL);
-+ char pathbuf[PATH_MAX];
-+ char *linkdest = realpath(path, pathbuf);
-
- if (linkdest != NULL && stat(linkdest, &st) == -1)
-- {
-- free(linkdest);
- return;
-- }
--
-- free(linkdest);
- }
- if (path_list_contains_entry(path, dirlist, &st))
- return;
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 8447141053d6..894f008349f2 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -9,6 +9,9 @@
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ </maintainer>
<slots>
<subslots>SONAME version of libpkgconf</subslots>
</slots>
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
deleted file mode 100644
index 1593586bcec8..000000000000
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
-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"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-libs/atf
- dev-util/kyua
- )
-"
-RDEPEND="
- pkg-config? (
- !dev-util/pkgconfig
- !dev-util/pkg-config-lite
- !dev-util/pkgconfig-openbsd[pkg-config]
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/pkgconf$(get_exeext)
-)
-
-src_prepare() {
- default
-
- [[ ${PV} == "9999" ]] && eautoreconf
- if use pkg-config; then
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/pkg-config$(get_exeext)
- )
- fi
-}
-
-multilib_src_configure() {
- local ECONF_SOURCE="${S}"
- econf --disable-static
-}
-
-multilib_src_test() {
- unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
- default
-}
-
-multilib_src_install() {
- default
-
- if use pkg-config; then
- dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
- dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
- else
- rm "${ED}"/usr/share/aclocal/pkg.m4 || die
- rmdir "${ED}"/usr/share/aclocal || die
- rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
- rmdir "${ED}"/usr/share/man/man7 || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 2b50f55d8aa2..edfc4c30bd49 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
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"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
- [[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
[[ ${PV} == "9999" ]] && eautoreconf
if use pkg-config; then
MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
index 5be8ccdbf798..257e865e259d 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
- [[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
[[ ${PV} == "9999" ]] && eautoreconf
if use pkg-config; then
MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index a29e166995b7..463b0b7e2311 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,10 +7,10 @@ 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://github.com/pkgconf/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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"