Merge updates from master

This commit is contained in:
Repository mirror & CI
2026-01-14 14:00:50 +00:00
9 changed files with 103 additions and 8 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/perl/Build.PL.in b/perl/Build.PL.in
index abec96591..7da7606df 100755
--- a/perl/Build.PL.in
+++ b/perl/Build.PL.in
@@ -66,7 +66,7 @@ my $build = Module::Build->new (
],
extra_linker_flags => [
'-DGUESTFS_PRIVATE=1',
- split (' ', '@CFLAGS@'),
+ split (' ', '@LDFLAGS@'),
'-L@top_builddir@/lib/.libs',
'-lguestfs',
],

View File

@@ -105,6 +105,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.52.1-disable-obsolete-lvmetad-in-tests.patch"
"${FILESDIR}/${PN}-1.56.2-respect-LDFLAGS-in-perl-module.patch"
)
src_prepare() {

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="|| ( LGPL-3 Apache-2.0 )"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~amd64 ~hppa ~loong ppc ~ppc64 ~sparc ~x86"
IUSE="debug test"
RESTRICT="!test? ( test )"

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -46,7 +46,7 @@ multilib_src_configure() {
multilib_src_install() {
emake DESTDIR="${D}" install
# always strip due to libbsd-ctor.a
strip-lto-bytecode #"${ED}"
strip-lto-bytecode "${ED}"
find "${ED}" -type f -name "*.la" -delete || die

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -44,7 +44,7 @@ multilib_src_configure() {
multilib_src_install() {
emake DESTDIR="${D}" install
# always strip due to libbsd-ctor.a
strip-lto-bytecode #"${ED}"
strip-lto-bytecode "${ED}"
find "${ED}" -type f -name "*.la" -delete || die

View File

@@ -1 +1,2 @@
DIST MaxMind-DB-Reader-php-1.11.1.tar.gz 23346 BLAKE2B ad783bbca018befa0f4c6f282bb440baf70ad2c91da0af8fb799ae727a5fc7f9acc1f004972ccc8f358272be2d9fbe4233b0d3526347db175ccc5eb140d139d3 SHA512 86b5cf523d0036a55e79f0721b7df923236146e0d29a9dc37affd61a4ba4bc0587a724aef0654239d009bb85eae4be6e42c2d63a5d2edf682fa90abdfbd234f0
DIST MaxMind-DB-Reader-php-1.13.1.tar.gz 23771 BLAKE2B 3e1902597c07511c3a7494a5dfc9168814c7e4895ebeec34cad60ef4ef862c05b8639bbfd3c647d615cc3266a47da3bffebb1ac2a46910ee17ec46a8c3a158fa SHA512 ec4f023c648f5e6c60627bf53cd2a1ca873d207506e47037507e2f4d4969a96fe1b700563f07177788a893b5aa6d3ab88322c14728b5a13d1d7a9dd3ea94e1f9

View File

@@ -0,0 +1,80 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
MY_PN="MaxMind-DB-Reader-php"
MY_P="${MY_PN}-${PV}"
PHP_EXT_S="${WORKDIR}/${MY_P}/ext"
PHP_EXT_NAME="maxminddb"
PHP_EXT_OPTIONAL_USE="extension"
USE_PHP="php8-2 php8-3 php8-4 php8-5"
inherit php-ext-source-r3
DESCRIPTION="PHP reader for the MaxMind database format"
HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~riscv ~x86"
IUSE="extension test"
RESTRICT="!test? ( test )"
DEPEND="extension? ( dev-libs/libmaxminddb )"
RDEPEND="${DEPEND}"
src_prepare() {
# We need to call eapply_user ourselves, because it may be skipped
# if either the "extension" USE flag is not set, or if the user's
# PHP_TARGETS is essentially empty. In the latter case, the eclass
# src_prepare does nothing. We only call the eclass phase conditionally
# because the correct version of e.g. "phpize" may not be there
# unless USE=extension is set.
if use extension ; then
php-ext-source-r3_src_prepare
else
default
fi
}
src_configure() {
# The eclass phase will try to run the ./configure script even if it
# doesn't exist (in contrast to the default src_configure), so we
# need to skip it if the eclass src_prepare (that creates said
# script) is not run.
use extension && php-ext-source-r3_src_configure
}
src_compile() {
# Avoids the same problem as in src_configure.
use extension && php-ext-source-r3_src_compile
}
src_install() {
dodoc CHANGELOG.md README.md
insinto /usr/share/php
doins -r src/MaxMind
insinto /usr/share/php/MaxMind/Db
doins autoload.php
use extension && php-ext-source-r3_src_install
}
src_test() {
# The PHP API has its own set of tests that isn't shipped with the
# release tarballs at the moment (github issues 55).
use extension && php-ext-source-r3_src_test
}
pkg_postinst() {
elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
elog "and then most of the examples in the documentation should"
elog "work without further modification."
}

View File

@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~loong ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
IUSE="examples"
DEPEND="

View File

@@ -26,7 +26,7 @@ RUBY_S="rmagick-${MY_PV}"
LICENSE="Artistic"
SLOT="$(ver_cut 1)"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE="doc"
RDEPEND=">=media-gfx/imagemagick-6.9.0:="