summaryrefslogtreecommitdiff
path: root/dev-util/pkgconf
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-20 14:27:17 +0000
commit5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-util/pkgconf
parent7218e1b46bceac05841e90472501742d905fb3fc (diff)
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-util/pkgconf')
-rw-r--r--dev-util/pkgconf/Manifest4
-rw-r--r--dev-util/pkgconf/pkgconf-1.7.4.ebuild (renamed from dev-util/pkgconf/pkgconf-1.7.2.ebuild)19
2 files changed, 13 insertions, 10 deletions
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 89b3a0f725a8..8e35b276d428 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,9 @@
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.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
+DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5
-EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
EBUILD pkgconf-1.7.3-r1.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
+EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 40e4e28319d4..3923dd6417ea 100644
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.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
@@ -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"
+ 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"
@@ -30,11 +30,7 @@ BDEPEND="
)
"
RDEPEND="
- pkg-config? (
- !dev-util/pkgconfig
- !dev-util/pkg-config-lite
- !dev-util/pkgconfig-openbsd[pkg-config]
- )
+ pkg-config? ( !dev-util/pkgconfig )
"
MULTILIB_CHOST_TOOLS=(
@@ -44,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
+ [[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
[[ ${PV} == "9999" ]] && eautoreconf
if use pkg-config; then
MULTILIB_CHOST_TOOLS+=(
@@ -54,7 +52,12 @@ src_prepare() {
multilib_src_configure() {
local ECONF_SOURCE="${S}"
- econf --disable-static
+ local args=(
+ --disable-static
+ --with-system-includedir="${EPREFIX}/usr/include"
+ --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+ )
+ econf "${args[@]}"
}
multilib_src_test() {