Sync with portage [Mon Oct 5 16:10:41 MSK 2020].

akrasnyh 1779
Calculate Linux 4 years ago
parent 3f43f9dd9d
commit 432bb28dfd

Binary file not shown.

Binary file not shown.

@ -8,7 +8,7 @@ QTMIN=5.14.2
inherit ecm kde.org
DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
HOMEPAGE="https://invent.kde.org/accessibility/kontrast"
HOMEPAGE="https://kde.org/applications/en/kontrast"
if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"

Binary file not shown.

@ -1 +1,2 @@
DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c

@ -0,0 +1,34 @@
--- rear-2.6/Makefile.orig 2020-09-09 20:04:39.357666685 +0200
+++ rear-2.6/Makefile 2020-09-09 20:06:12.537313922 +0200
@@ -84,7 +84,7 @@
clean:
rm -Rf dist build
rm -f build-stamp
- make -C doc clean
+ $(MAKE) -C doc clean
### You can call 'make validate' directly from your .git/hooks/pre-commit script
validate:
@@ -107,11 +107,11 @@
man:
@echo -e "\033[1m== Prepare manual ==\033[0;0m"
- make -C doc man
+ $(MAKE) -C doc man
doc:
@echo -e "\033[1m== Prepare documentation ==\033[0;0m"
- make -C doc docs
+ $(MAKE) -C doc docs
install-config:
@echo -e "\033[1m== Installing configuration ==\033[0;0m"
@@ -144,7 +144,7 @@
install-doc:
@echo -e "\033[1m== Installing documentation ==\033[0;0m"
- make -C doc install
+ $(MAKE) -C doc install
sed -i -e 's,/etc,$(sysconfdir),' \
-e 's,/usr/sbin,$(sbindir),' \
-e 's,/usr/share,$(datadir),' \

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>martin.dummer@gmx.net</email>
<name>Martin Dummer</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
</longdescription>
@ -10,5 +17,6 @@
</use>
<upstream>
<remote-id type="sourceforge">rear</remote-id>
<remote-id type="github">rear/rear</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,60 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit optfeature udev
DESCRIPTION="Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution"
HOMEPAGE="http://relax-and-recover.org/ https://github.com/rear/rear/"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="udev"
RDEPEND="
app-shells/bash
net-dialup/mingetty
net-fs/nfs-utils
sys-apps/gawk
sys-apps/iproute2
sys-apps/lsb-release
sys-apps/sed
sys-apps/util-linux
sys-block/parted
sys-boot/syslinux
virtual/cdrtools
udev? ( virtual/udev )
"
PATCHES=(
"${FILESDIR}/${P}-Makefile.patch"
)
src_compile() { :; }
src_install() {
emake DESTDIR="${D}" install
if use udev ; then
einfo "Deploy udev USB rule and udev will autostart ReaR workflows in case a USB"
einfo "drive with the label 'REAR_000' is connected, which in turn is the"
einfo "default label when running the \`rear format\` command."
udev_dorules etc/udev/rules.d/62-${PN}-usb.rules
fi
keepdir /etc/rear
keepdir /var/lib/rear
keepdir /var/log/rear
}
pkg_postinst() {
if use udev ; then
udev_reload
fi
optfeature "if you want to save backups on smb/cifs servers" net-fs/cifs-utils
optfeature "if you want to encrypt your backups" dev-libs/openssl dev-libs/libressl
}

Binary file not shown.

@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python{3_6,3_7,3_8} )
PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
inherit python-single-r1
DESCRIPTION="Manage repos.conf via eselect"

Binary file not shown.

@ -20,7 +20,7 @@ RDEPEND="app-i18n/skk-jisyo
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
systemd? ( virtual/udev[systemd] )"
systemd? ( sys-apps/systemd )"
DEPEND="${RDEPEND}
dev-lang/perl"

Binary file not shown.

@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit eutils python-single-r1 toolchain-funcs

Binary file not shown.

@ -1,3 +1,3 @@
DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
DIST portage-utils-0.88.tar.xz 1776100 BLAKE2B 5165c99f163a39e2d8e9d503a43982999e70ff647af16acaae84279d17c327e78c2722fa9f332c570e8bfed7647ebb7f96281c3ed2c42948234fb23192e73ca5 SHA512 f5bddd170b66753bf3abd870add6f893e31ae971cc15f3b34366fbbd6d69848aa8aa301bbf3e4185f152ce110e890178828f867e64d8ede74c17e819c2961562
DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d SHA512 c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682

@ -69,17 +69,3 @@ src_configure() {
$(use_enable openmp) \
$(use_enable static)
}
pkg_postinst() {
local pvr
local doshow=
for pvr in ${REPLACING_VERSIONS} ; do
[[ ${pvr} != "0.8"[012]* ]] && doshow=true
done
if [[ ${doshow} == true ]] ; then
elog "This version of Portage utils has undergone significant changes."
elog "Please read the elog manpages for applets like qlop(1) and"
elog "qfile(1) where argument options have changed."
fi
}

Binary file not shown.

@ -0,0 +1,41 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} ) # apps work with 3_9 but test depend is not fulfilled
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
HOMEPAGE="https://github.com/espressif/esptool"
SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
$(python_gen_cond_dep '
dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
dev-python/pyaes[${PYTHON_MULTI_USEDEP}]
>=dev-python/pyserial-3.0[${PYTHON_MULTI_USEDEP}]
')
"
BDEPEND="
test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
"
src_prepare() {
rm -rf pyaes/ ecdsa/ || die "unable to remove bundled modules"
default
}
python_test() {
${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
}

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<maintainer type="person">
<email>martin.dummer@gmx.net</email>
<name>Martin Dummer</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="github">espressif/esptool</remote-id>
</upstream>

Binary file not shown.

@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"

@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"

@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"

Binary file not shown.

@ -0,0 +1,52 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools multilib-minimal
DESCRIPTION="C implementation of Bitcoin's base58 encoding"
HOMEPAGE="https://github.com/luke-jr/libbase58"
LICENSE="MIT"
SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE="test tools"
RESTRICT="!test? ( test )"
# NOTE: If not testing, we don't need non-native libgcrypt
RDEPEND="tools? ( dev-libs/libgcrypt )"
DEPEND="${RDEPEND}
test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
"
src_prepare() {
eapply_user
eautoreconf
# NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for
# multilib support.
multilib_copy_sources
}
multilib_src_configure() {
local myeconf=(
--disable-static
LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
)
if multilib_is_native_abi && use tools; then
myeconf+=( --enable-tool )
elif use test; then
myeconf+=( --enable-tool --bindir='/TRASH' )
else
myeconf+=( --disable-tool )
fi
econf "${myeconf[@]}"
}
multilib_src_install_all() {
if use test; then
rm -r "${ED}/TRASH" || die
fi
}

@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/23"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"

Binary file not shown.

@ -0,0 +1,47 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DIST_AUTHOR=GFUJI
DIST_VERSION=v2.4.10
DIST_EXAMPLES=("example/*" "benchmarks")
inherit perl-module
DESCRIPTION="Moose minus the antlers"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=virtual/perl-Scalar-List-Utils-1.140.0
>=virtual/perl-XSLoader-0.20.0
"
DEPEND="dev-perl/Module-Build"
BDEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-ParseXS-3.220.0
>=virtual/perl-Devel-PPPort-3.220.0
>=dev-perl/Module-Build-0.400.500
dev-perl/Module-Build-XSUtil
test? (
dev-perl/Test-Exception
dev-perl/Test-Fatal
dev-perl/Test-LeakTrace
>=virtual/perl-Test-Simple-0.880.0
dev-perl/Test-Output
dev-perl/Test-Requires
dev-perl/Try-Tiny
)
"
src_configure() {
unset LD
[[ -n "${CCLD}" ]] && export LD="${CCLD}"
# we have to do this outside src_compile
# as the stupid thing recompiles in src_install
myconf=(
--config "optimize=${CFLAGS}"
)
perl-module_src_configure
}

@ -1 +1,2 @@
DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc
DIST X11-XCB-0.18.tar.gz 90478 BLAKE2B f5f3c74c1afdcee75bfab29733180b7d76aeb1be7a5fcdffc9acc1a15f9b842b12e88d826f5ce182b4e3ad5d36e9b44a0169341fae5ac265270462efbad0e60a SHA512 eeecd8fbf080a6ca2f28b8fe4b64c97339f27b27c9c70d1a8e7c0f56af193243295aa1fc65039d24c81396126befc27ca114ca4cd1641139a788c46fe600f3ba

@ -0,0 +1,56 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DIST_AUTHOR=MSTPLBG
DIST_VERSION=0.18
inherit perl-module virtualx
DESCRIPTION="Perl bindings for libxcb"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-perl/Data-Dump
dev-perl/Mouse
dev-perl/MouseX-NativeTraits
dev-perl/Try-Tiny
dev-perl/XML-Descent
dev-perl/XML-Simple
>=virtual/perl-XSLoader-0.20.0
>=x11-libs/libxcb-1.2
x11-libs/xcb-util
x11-libs/xcb-util-wm
"
DEPEND="
>=x11-libs/libxcb-1.2
x11-libs/xcb-util
x11-libs/xcb-util-wm
x11-base/xcb-proto
"
BDEPEND="${RDEPEND}
x11-base/xcb-proto
>=virtual/perl-Devel-PPPort-3.190.0
dev-perl/ExtUtils-Depends
>=virtual/perl-ExtUtils-MakeMaker-6.590.0
>=virtual/perl-ExtUtils-ParseXS-3.180.0
dev-perl/ExtUtils-PkgConfig
dev-perl/XS-Object-Magic
test? (
dev-perl/Test-Deep
dev-perl/Test-Exception
virtual/perl-Test-Simple
)
"
src_compile() {
mymake=(
"OPTIMIZE=${CFLAGS}"
)
MAKEOPTS="-j1" perl-module_src_compile
}
src_test() {
virtx perl-module_src_test
}

Binary file not shown.

@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
BDEPEND="

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
S=${WORKDIR}/${MY_P}

@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="test"
RDEPEND="

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 sparc x86"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"

@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
PYTHON_COMPAT=( python3_{6..9} pypy3 )
inherit distutils-r1

@ -1,2 +1,3 @@
DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492

@ -0,0 +1,21 @@
# Copyright 2018-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
inherit distutils-r1
DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
HOMEPAGE="https://github.com/guyhughes/fqdn"
SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
distutils_enable_sphinx docs

@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="cli test"
RESTRICT="!test? ( test )"

@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="cli test"
RESTRICT="!test? ( test )"

@ -15,7 +15,7 @@ SRC_URI="
SLOT="0"
LICENSE="MIT"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE=""
RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"

@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
RDEPEND=">=app-misc/tmux-3.0a"

@ -1 +1,2 @@
DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
DIST lmdb-1.0.0.tar.gz 876673 BLAKE2B 33fdf7dd344e42412b756f7c6d42c291f94bb2410366802b22b8045c8ae5ff4f73f41cdc655e750f0ccb9f547f70b190bb9b584d7858edd07c1fb274bff684eb SHA512 3a4dba711ce5a3795a7f916cf04d5c7e9d4b5df30161dcbd02b53bcec73b96450865fb2bd8fe4a9ca2b5060531d03cefd9ea19aa09f139f93c3d03b2516f5632

@ -0,0 +1,32 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# TODO: add PyPy3 when it is supported
# https://github.com/jnwatson/py-lmdb/issues/260
PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
DESCRIPTION="Python bindings for the Lightning Database"
HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-db/lmdb:="
DEPEND="${RDEPEND}"
distutils_enable_sphinx docs
distutils_enable_tests pytest
python_compile() {
LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
}
python_test() {
pytest tests -vv || die "Tests fail with ${EPYTHON}"
}

@ -7,6 +7,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">lmdb</remote-id>
<remote-id type="github">dw/py-lmdb</remote-id>
<remote-id type="github">jnwatson/py-lmdb</remote-id>
<doc>https://lmdb.readthedocs.io/</doc>
</upstream>
</pkgmetadata>

@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/23"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}

@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit distutils-r1
DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"

@ -0,0 +1,64 @@
From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
From: Armin Rigo <arigo@tunes.org>
Date: Sat, 26 Sep 2020 09:26:24 +0200
Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
---
rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
rpython/jit/backend/ppc/regalloc.py | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
index b79b18e530..4bbfbba93a 100644
--- a/rpython/jit/backend/ppc/opassembler.py
+++ b/rpython/jit/backend/ppc/opassembler.py
@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
def _apply_offset(self, index_loc, ofs_loc):
# If offset != 0 then we have to add it here. Note that
# mc.addi() would not be valid with operand r0.
- assert ofs_loc.is_imm() # must be an immediate...
- assert _check_imm_arg(ofs_loc.getint()) # ...that fits 16 bits
assert index_loc.is_core_reg()
assert index_loc is not r.SCRATCH2
- # (simplified version of _apply_scale())
- if ofs_loc.value > 0:
- self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+ if ofs_loc.is_imm():
+ # if it is an immediate, it must fit into 16 bits
+ assert _check_imm_arg(ofs_loc.getint())
+ # (simplified version of _apply_scale())
+ if ofs_loc.value != 0:
+ self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+ index_loc = r.SCRATCH2
+ else:
+ # larger immediates are loaded into a register in regalloc.py
+ assert ofs_loc.is_core_reg()
+ self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
index_loc = r.SCRATCH2
return index_loc
diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
index f3ee1129e4..827953cf12 100644
--- a/rpython/jit/backend/ppc/regalloc.py
+++ b/rpython/jit/backend/ppc/regalloc.py
@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
value_loc = self.ensure_reg(op.getarg(2))
assert op.getarg(3).getint() == 1 # scale
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
- assert ofs_loc.is_imm() # the arg(4) should always be a small constant
+ # the arg(4) is often a small constant, but it may be too large
size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
index_loc = self.ensure_reg(op.getarg(1))
assert op.getarg(2).getint() == 1 # scale
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
- assert ofs_loc.is_imm() # the arg(3) should always be a small constant
+ # the arg(3) is often a small constant, but it may be too large
self.free_op_vars()
res_loc = self.force_allocate_reg(op)
size_box = op.getarg(4)
--
GitLab

@ -59,6 +59,10 @@ check_env() {
check-reqs_pkg_pretend
}
PATCHES=(
"${FILESDIR}"/pypy-7.3.2-ppc64-segfault.patch
)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && check_env
}

@ -1,6 +1,6 @@
DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2
DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e
DIST pypy3-exe-7.3.2-1.amd64.xpak 11747236 BLAKE2B 5421ad051d2af6f88875591c99e801eab3991aa4a6936c0661f7fe131b13ec5cf9a261774f4ce6cae6202a9b0087265a457e2bdefe50110ce12c71e56885992a SHA512 6cdf308a12d2dffc44335b06e8e6212e559f329f0045fdfb8e3b5fe127d62b8881eaf8231a3b7f9ad7f628ac059a1e68a9bb2b43d677e59cfc81ea202ebf0898
DIST pypy3-exe-7.3.2-1.x86.xpak 9043236 BLAKE2B 0c07e5bba6d44444c227e63dea02c390254b809a2c14a4b9faefa080e32a86849c354971eb4f1d13331e00e2af7e79d108a6f69fed1cdec0faf70ed8320b6c64 SHA512 8040abb95b2bd4144a456f429fad39492672b6f225951f93d138609a7265bdadff9d2ea0b4cf7b481cd9a16fa1017bdcce0f7a3afda27ab60c094cc2a0ba2a92
DIST pypy3-exe-7.3.2_p37-1.amd64.xpak 11873959 BLAKE2B e9fcb007b18d5880955bca5828285d8eb6b258f41ade7f53c2aa77c0bd65bb4884501dd093a6d19e694315cc20423ad05eaffcf78f62815b783a311220989805 SHA512 59fea7fe0670fed68c1748c9a763c754261b05f25f0ce251088908f79b73b9d468aa2777b0c5cda394474db04e0e754999b49677051ba00a94f4dfe6fca7e4a5
DIST pypy3-exe-7.3.2_p37-1.x86.xpak 9127420 BLAKE2B 23c7382980339ec4bb476acf99e587e7ff6128cc421bdd1758c6b922ec0cc1fb98c4895d28788d1184f3b6fb00e1954e517f58d33c3c10470c8d8c236fd43024 SHA512 f6680fca7a39b27117ea6aa680fc0fe78cec836413777860ff1adda21934ca6d0330364c7e3d97e9ab9f92fb3160e021cbfd016de89af6009526865164433f0e
DIST pypy3-exe-7.3.2-r1-1.amd64.xpak 11745754 BLAKE2B 16b6b078609b6c6fb9f87c8d6fe477ec29d9e3c51d68996b782cf2e908f46759a42b32dfd8e64a32bfe2488849ce57255cc9a299231f4f6f2dd52a5c11e30367 SHA512 6e4d73b11cd67ad50d01e0db1a800567f723752abaa20bae7e950f3c2cecafd6e2065bd47e69e2b8d96b9ecbb396ed46a21a315d685a0e712bee17aa549a15e9
DIST pypy3-exe-7.3.2-r1-1.x86.xpak 9030835 BLAKE2B 8fe13acd6bb93a60ed3f4268c1c53e7bb0101c7f68a58ddda4f7cec8fc5d4b3df463de2fbb585adbfb04349a96807a6c34246ceab76e001bfedabaddba90750b SHA512 ab463d5df575b1b8a01fa129f96b1317de37d2a0de83d124d411be63add0a241700a918885ed7128221cadfbb0d3b0d49d32d57ec25c59ec45e26e5bb1c4c0c0
DIST pypy3-exe-7.3.2_p37-r1-1.amd64.xpak 11864985 BLAKE2B 69fe7b080ec4fe6cf3d0e06c0d7c00c17627259d57ff02a1dc0629374f92f425889a3e40b075f48687af47e97b2504252369bd106011961337fe1708d6e35561 SHA512 673de3083be18d9f62e9586eb0daae3e1a041f245ffb17fabb0b88ee6262cdd3ffd7dc723e6b72eb42057d0bbffbcc82a5c2864e585c5a1b184983445269500e
DIST pypy3-exe-7.3.2_p37-r1-1.x86.xpak 9126391 BLAKE2B e8b68a1ce9ada6cf9a27dfcac78564d8a3020575ce9d1db7460c8aec8097abb6624bbce594d84556525253de8c620cb8acaf7e381af48d71b97bfdcfc5759a05 SHA512 29172e3d99775af10507167cd84f120677bfa752747b8d11f5434b16aea7eac9aa06bc820949cac132a2bd6e3c69df4da8a8a6bbba9cf4fe01db6cf1b0f725c6

@ -5,7 +5,7 @@ EAPI=7
inherit pax-utils
MY_P=pypy3-exe-${PV}-1
MY_P=pypy3-exe-${PV}-r1-1
DESCRIPTION="PyPy3 executable (pre-built version)"
HOMEPAGE="https://pypy.org/"
SRC_URI="

@ -5,7 +5,7 @@ EAPI=7
inherit pax-utils
MY_P=pypy3-exe-${PV}-1
MY_P=pypy3-exe-${PV}-r1-1
DESCRIPTION="PyPy3 executable (pre-built version)"
HOMEPAGE="https://pypy.org/"
SRC_URI="

@ -0,0 +1,64 @@
From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
From: Armin Rigo <arigo@tunes.org>
Date: Sat, 26 Sep 2020 09:26:24 +0200
Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
---
rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
rpython/jit/backend/ppc/regalloc.py | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
index b79b18e530..4bbfbba93a 100644
--- a/rpython/jit/backend/ppc/opassembler.py
+++ b/rpython/jit/backend/ppc/opassembler.py
@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
def _apply_offset(self, index_loc, ofs_loc):
# If offset != 0 then we have to add it here. Note that
# mc.addi() would not be valid with operand r0.
- assert ofs_loc.is_imm() # must be an immediate...
- assert _check_imm_arg(ofs_loc.getint()) # ...that fits 16 bits
assert index_loc.is_core_reg()
assert index_loc is not r.SCRATCH2
- # (simplified version of _apply_scale())
- if ofs_loc.value > 0:
- self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+ if ofs_loc.is_imm():
+ # if it is an immediate, it must fit into 16 bits
+ assert _check_imm_arg(ofs_loc.getint())
+ # (simplified version of _apply_scale())
+ if ofs_loc.value != 0:
+ self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
+ index_loc = r.SCRATCH2
+ else:
+ # larger immediates are loaded into a register in regalloc.py
+ assert ofs_loc.is_core_reg()
+ self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
index_loc = r.SCRATCH2
return index_loc
diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
index f3ee1129e4..827953cf12 100644
--- a/rpython/jit/backend/ppc/regalloc.py
+++ b/rpython/jit/backend/ppc/regalloc.py
@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
value_loc = self.ensure_reg(op.getarg(2))
assert op.getarg(3).getint() == 1 # scale
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
- assert ofs_loc.is_imm() # the arg(4) should always be a small constant
+ # the arg(4) is often a small constant, but it may be too large
size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
index_loc = self.ensure_reg(op.getarg(1))
assert op.getarg(2).getint() == 1 # scale
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
- assert ofs_loc.is_imm() # the arg(3) should always be a small constant
+ # the arg(3) is often a small constant, but it may be too large
self.free_op_vars()
res_loc = self.force_allocate_reg(op)
size_box = op.getarg(4)
--
GitLab

@ -0,0 +1,61 @@
From 5ee2925459372a8af805e952f433acd75e426325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 4 Oct 2020 15:46:23 +0200
Subject: [PATCH] Fix sethostname() failure when passed bytes
My implementation of sethostname() was broken and failed when passed
bytes on Python 3. Update the implementation to match CPython -- that
is, use bytes if provided, or fsencode() when str is provided.
--HG--
branch : py3.6
---
pypy/module/_socket/interp_func.py | 8 +++++++-
pypy/module/_socket/test/test_sock_app.py | 12 ++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py
index bdc4f1293f..1727e51d51 100644
--- a/pypy/module/_socket/interp_func.py
+++ b/pypy/module/_socket/interp_func.py
@@ -392,7 +392,13 @@ if hasattr(rsocket, 'sethostname'):
Set the host name.
"""
- hostname = space.text_w(w_hostname)
+ if space.isinstance_w(w_hostname, space.w_bytes):
+ hostname = space.bytes_w(w_hostname)
+ elif space.isinstance_w(w_hostname, space.w_unicode):
+ hostname = space.fsencode_w(w_hostname)
+ else:
+ raise oefmt(space.w_TypeError,
+ "sethostname() argument 1 must be str or bytes")
try:
res = rsocket.sethostname(hostname)
except SocketError as e:
diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
index fe3efec8e3..355fb8a2a9 100644
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -210,6 +210,18 @@ def test_getaddrinfo(space, w_socket):
assert space.unwrap(w_l) == True
+def test_sethostname(space, w_socket):
+ space.raises_w(space.w_OSError, space.appexec,
+ [w_socket],
+ "(_socket): _socket.sethostname(_socket.gethostname())")
+
+
+def test_sethostname_bytes(space, w_socket):
+ space.raises_w(space.w_OSError, space.appexec,
+ [w_socket],
+ "(_socket): _socket.sethostname(_socket.gethostname().encode())")
+
+
def test_unknown_addr_as_object(space, ):
from pypy.module._socket.interp_socket import addr_as_object
c_addr = lltype.malloc(rsocket._c.sockaddr, flavor='raw', track_allocation=False)
--
GitLab

@ -35,6 +35,11 @@ BDEPEND="
)
)"
PATCHES=(
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
)
check_env() {
if use low-memory; then
CHECKREQS_MEMORY="1750M"

@ -36,6 +36,11 @@ BDEPEND="
)
)"
PATCHES=(
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
)
check_env() {
if use low-memory; then
CHECKREQS_MEMORY="1750M"

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE=""
RDEPEND="

@ -1 +1,2 @@
DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65

@ -0,0 +1,40 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
HOMEPAGE="https://pypi.org/project/reno/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
IUSE=""
RDEPEND="
dev-python/pbr[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
"
BDEPEND="
dev-python/pbr[${PYTHON_USEDEP}]
test? (
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
)
"
# The doc needs to be built from a git repository
distutils_enable_tests unittest
python_prepare_all() {
# Some tests need to be run from a git repository
rm reno/tests/test_{cache,semver}.py || die
distutils-r1_python_prepare_all
}

@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]

@ -1,2 +1,3 @@
DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
DIST sphinxcontrib-spelling-5.4.0.tar.gz 46823 BLAKE2B 8303a97b87d953a37db4548d895559baf93969c11f8417aafeb67804ec537f9ea028bcbf6a56eb3290f13871a782dcde142b1927865a6f9eefd5a20dc53061b1 SHA512 7e0fe6289f9482982825a1204c926490a1e31dc85e25e6418ba47f5575430875e3df5f77202ad458044b810bc2a29f989e6bc6f0c9b4934af938716a4ab887f0

@ -8,5 +8,6 @@
<upstream>
<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
<remote-id type="github">sphinx-contrib/spelling</remote-id>
<doc>https://sphinxcontrib-spelling.readthedocs.io/</doc>
</upstream>
</pkgmetadata>

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
$(python_gen_cond_dep '
@ -33,7 +33,7 @@ BDEPEND="
)
"
distutils_enable_sphinx docs/source --no-autodoc
# The doc can only be built from a git repository
distutils_enable_tests pytest
RDEPEND+="

@ -0,0 +1,52 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
DESCRIPTION="Sphinx spelling extension"
HOMEPAGE="https://github.com/sphinx-contrib/spelling"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
$(python_gen_cond_dep '
>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
' python3_{6,7})
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
"
BDEPEND="
dev-python/pbr[${PYTHON_USEDEP}]
test? (
app-dicts/myspell-en
)
"
# The doc can only be built from a git repository
distutils_enable_tests pytest
# We don't want distutils_enable_tests to add the namespace
# package to BDEPEND under "test?". Therefore we add it to RDEPEND
# after running distutils_enable_tests.
RDEPEND+="
dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
"
python_prepare_all() {
# Needs to be run from a git repository
sed -i 's/test_contributors/_&/' \
sphinxcontrib/spelling/tests/test_filter.py || die
distutils-r1_python_prepare_all
}
python_install_all() {
distutils-r1_python_install_all
find "${ED}" -name '*.pth' -delete || die
}

Binary file not shown.

@ -1 +1,2 @@
DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538

@ -0,0 +1,90 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools systemd
DESCRIPTION="Operating system and container binary deployment and upgrades"
HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
LICENSE="LGPL-2+"
SLOT="0"
IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf"
RESTRICT="test"
REQUIRED_USE="httpd? ( || ( curl soup ) )"
COMMON_DEPEND="
archive? ( app-arch/libarchive )
app-crypt/gpgme
app-arch/xz-utils
curl? ( net-misc/curl )
soup? ( net-libs/libsoup )
dev-libs/libassuan
dev-libs/libgpg-error
dev-libs/glib:2
dracut? ( sys-kernel/dracut )
grub? ( sys-boot/grub:2= )
introspection? ( dev-libs/gobject-introspection )
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? ( dev-libs/openssl:0= ) )
>=sys-fs/fuse-2.9.2:0
sys-libs/zlib
libmount? ( sys-apps/util-linux )
selinux? ( sys-libs/libselinux )
systemd? ( sys-apps/systemd:0= )
zeroconf? ( net-dns/avahi[dbus] )"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
doc? ( dev-util/gtk-doc )"
RDEPEND="${COMMON_DEPEND}"
BDEPEND="
dev-util/glib-utils
sys-devel/flex
sys-devel/bison
virtual/pkgconfig"
S="${WORKDIR}/lib${P}"
src_prepare() {
sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-i Makefile.in Makefile-man.am || die
eautoreconf
default
}
src_configure() {
local econfargs=(
--enable-man
--enable-shared
$(use_with archive libarchive)
$(use_with curl)
$(use_with dracut)
$(use_enable doc gtk-doc)
$(use_enable introspection)
$(use_enable http2)
$(use_enable httpd trivial-httpd-cmdline)
$(use_with selinux )
$(use_with soup)
$(use_with libmount)
$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
$(use_with systemd libsystemd)
$(use_with zeroconf avahi)
)
unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
econf ${econfargs[*]}
}
src_install() {
default
find "${D}" -name '*.la' -delete || die
}

Binary file not shown.

@ -0,0 +1,510 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: lua-single.eclass
# @MAINTAINER:
# William Hubbs <williamh@gentoo.org>
# Marek Szuba <marecki@gentoo.org>
# @AUTHOR:
# Marek Szuba <marecki@gentoo.org>
# Based on python-single-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
# @SUPPORTED_EAPIS: 7
# @BLURB: An eclass for Lua packages not installed for multiple implementations.
# @DESCRIPTION:
# An extension of lua.eclass suite for packages which don't support being
# installed for multiple Lua implementations. This mostly includes software
# embedding Lua.
#
# This eclass sets correct IUSE. It also provides LUA_DEPS
# and LUA_REQUIRED_USE that need to be added to appropriate ebuild
# metadata variables.
#
# The eclass exports LUA_SINGLE_USEDEP that is suitable for depending
# on other packages using the eclass. Dependencies on packages using
# lua.eclass should be created via lua_gen_cond_dep() function, using
# LUA_USEDEP placeholder.
#
# Please note that packages support multiple Lua implementations
# (using lua.eclass) cannot depend on packages not supporting
# them (using this eclass).
#
# Note that since this eclass always inherits lua-utils as well, in ebuilds
# using the former there is no need to explicitly inherit the latter in order
# to use helper functions such as lua_get_CFLAGS.
case ${EAPI:-0} in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
;;
7)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
;;
esac
if [[ ! ${_LUA_SINGLE_R0} ]]; then
if [[ ${_LUA_R0} ]]; then
die 'lua-single.eclass cannot be used with lua.eclass.'
fi
inherit lua-utils
fi
EXPORT_FUNCTIONS pkg_setup
# @ECLASS-VARIABLE: LUA_COMPAT
# @REQUIRED
# @PRE_INHERIT
# @DESCRIPTION:
# This variable contains a list of Lua implementations the package
# supports. It must be set before the `inherit' call. It has to be
# an array.
#
# Example:
# @CODE
# LUA_COMPAT=( lua5-1 lua5-2 lua5-3 )
# @CODE
#
# Please note that you can also use bash brace expansion if you like:
# @CODE
# LUA_COMPAT=( lua5-{1..3} )
# @CODE
# @ECLASS-VARIABLE: LUA_COMPAT_OVERRIDE
# @USER_VARIABLE
# @DEFAULT_UNSET
# @DESCRIPTION:
# This variable can be used when working with ebuilds to override
# the in-ebuild LUA_COMPAT. It is a string listing all
# the implementations which package will be built for. It need be
# specified in the calling environment, and not in ebuilds.
#
# It should be noted that in order to preserve metadata immutability,
# LUA_COMPAT_OVERRIDE does not affect IUSE nor dependencies.
# The state of LUA_TARGETS is ignored, and all the implementations
# in LUA_COMPAT_OVERRIDE are built. Dependencies need to be satisfied
# manually.
#
# Example:
# @CODE
# LUA_COMPAT_OVERRIDE='lua5-2' emerge -1v dev-lua/foo
# @CODE
# @ECLASS-VARIABLE: LUA_REQ_USE
# @DEFAULT_UNSET
# @PRE_INHERIT
# @DESCRIPTION:
# The list of USE flags required to be enabled on the chosen Lua
# implementations, formed as a USE-dependency string. It should be valid
# for all implementations in LUA_COMPAT, so it may be necessary to
# use USE defaults.
# This must be set before calling `inherit'.
#
# Example:
# @CODE
# LUA_REQ_USE="deprecated"
# @CODE
#
# It will cause the Lua dependencies to look like:
# @CODE
# lua_targets_luaX-Y? ( dev-lang/lua:X.Y[deprecated] )
# @CODE
# @ECLASS-VARIABLE: LUA_DEPS
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated Lua dependency string for all
# implementations listed in LUA_COMPAT.
#
# Example use:
# @CODE
# RDEPEND="${LUA_DEPS}
# dev-foo/mydep"
# DEPEND="${RDEPEND}"
# @CODE
#
# Example value:
# @CODE
# lua_targets_lua5-1? ( dev-lang/lua:5.1 )
# lua_targets_lua5-2? ( dev-lang/lua:5.2 )
# @CODE
# @ECLASS-VARIABLE: LUA_REQUIRED_USE
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated required-use expression which ensures at
# least one Lua implementation has been enabled.
#
# This expression should be utilized in an ebuild by including it in
# REQUIRED_USE, optionally behind a use flag.
#
# Example use:
# @CODE
# REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
# @CODE
#
# Example value:
# @CODE
# || ( lua_targets_lua5-1 lua_targets_lua5-2 )
# @CODE
# @ECLASS-VARIABLE: LUA_SINGLE_USEDEP
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated USE-dependency string which can be used
# to depend on another lua-single package being built for the same
# Lua implementations.
#
# If you need to depend on a multi-impl (lua.eclass) package, use
# lua_gen_cond_dep with LUA_USEDEP placeholder instead.
#
# Example use:
# @CODE
# RDEPEND="dev-lua/foo[${LUA_SINGLE_USEDEP}]"
# @CODE
#
# Example value:
# @CODE
# lua_single_target_lua5-1(-)?
# @CODE
# @ECLASS-VARIABLE: LUA_USEDEP
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated USE-dependency string which can be used to
# depend on another Lua package being built for the same Lua
# implementations.
#
# Example use:
# @CODE
# RDEPEND="dev-lua/foo[${LUA_USEDEP}]"
# @CODE
#
# Example value:
# @CODE
# lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?
# @CODE
# @FUNCTION: _lua_single_set_globals
# @INTERNAL
# @DESCRIPTION:
# Sets all the global output variables provided by this eclass.
# This function must be called once, in global scope.
_lua_single_set_globals() {
_lua_set_impls
local flags=( "${_LUA_SUPPORTED_IMPLS[@]/#/lua_single_target_}" )
if [[ ${#_LUA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
# if only one implementation is supported, use IUSE defaults
# to avoid requesting the user to enable it
IUSE="+${flags[0]}"
else
IUSE="${flags[*]}"
fi
local requse="^^ ( ${flags[*]} )"
local single_flags="${flags[@]/%/(-)?}"
local single_usedep=${single_flags// /,}
local deps= i PYTHON_PKG_DEP
for i in "${_LUA_SUPPORTED_IMPLS[@]}"; do
_lua_export "${i}" LUA_PKG_DEP
deps+="lua_single_target_${i}? ( ${LUA_PKG_DEP} ) "
done
if [[ ${LUA_DEPS+1} ]]; then
if [[ ${LUA_DEPS} != "${deps}" ]]; then
eerror "LUA_DEPS have changed between inherits (LUA_REQ_USE?)!"
eerror "Before: ${LUA_DEPS}"
eerror "Now : ${deps}"
die "LUA_DEPS integrity check failed"
fi
# these two are formality -- they depend on LUA_COMPAT only
if [[ ${LUA_REQUIRED_USE} != ${requse} ]]; then
eerror "LUA_REQUIRED_USE have changed between inherits!"
eerror "Before: ${LUA_REQUIRED_USE}"
eerror "Now : ${requse}"
die "LUA_REQUIRED_USE integrity check failed"
fi
if [[ ${LUA_SINGLE_USEDEP} != "${single_usedep}" ]]; then
eerror "LUA_SINGLE_USEDEP have changed between inherits!"
eerror "Before: ${LUA_SINGLE_USEDEP}"
eerror "Now : ${single_usedep}"
die "LUA_SINGLE_USEDEP integrity check failed"
fi
else
LUA_DEPS=${deps}
LUA_REQUIRED_USE=${requse}
LUA_SINGLE_USEDEP=${single_usedep}
LUA_USEDEP='%LUA_USEDEP-NEEDS-TO-BE-USED-IN-LUA_GEN_COND_DEP%'
readonly LUA_DEPS LUA_REQUIRED_USE LUA_SINGLE_USEDEP LUA_USEDEP
fi
}
_lua_single_set_globals
unset -f _lua_single_set_globals
if [[ ! ${_LUA_SINGLE_R0} ]]; then
# @FUNCTION: _lua_gen_usedep
# @USAGE: [<pattern>...]
# @INTERNAL
# @DESCRIPTION:
# Output a USE dependency string for Lua implementations which
# are both in LUA_COMPAT and match any of the patterns passed
# as parameters to the function.
#
# The patterns can be fnmatch-style patterns (matched via bash == operator
# against LUA_COMPAT values). Remember to escape or quote the fnmatch
# patterns to prevent accidental shell filename expansion.
#
# This is an internal function used to implement lua_gen_cond_dep.
_lua_gen_usedep() {
debug-print-function ${FUNCNAME} "${@}"
local impl matches=()
_lua_verify_patterns "${@}"
for impl in "${_LUA_SUPPORTED_IMPLS[@]}"; do
if _lua_impl_matches "${impl}" "${@}"; then
matches+=(
"lua_single_target_${impl}(-)?"
)
fi
done
[[ ${matches[@]} ]] || die "No supported implementations match lua_gen_usedep patterns: ${@}"
local out=${matches[@]}
echo "${out// /,}"
}
# @FUNCTION: _lua_impl_matches
# @USAGE: <impl> [<pattern>...]
# @INTERNAL
# @DESCRIPTION:
# Check whether the specified <impl> matches at least one
# of the patterns following it. Return 0 if it does, 1 otherwise.
# Matches if no patterns are provided.
#
# <impl> can be in LUA_COMPAT or ELUA form. The patterns can be
# fnmatch-style patterns, e.g. 'lua5*', '..
_lua_impl_matches() {
[[ ${#} -ge 1 ]] || die "${FUNCNAME}: takes at least 1 parameter"
[[ ${#} -eq 1 ]] && return 0
local impl=${1} pattern
shift
for pattern; do
# unify value style to allow lax matching
if [[ ${impl/./-} == ${pattern/./-} ]]; then
return 0
fi
done
return 1
}
# @FUNCTION: _lua_verify_patterns
# @USAGE: <pattern>...
# @INTERNAL
# @DESCRIPTION:
# Verify whether the patterns passed to the eclass function are correct
# (i.e. can match any valid implementation). Dies on wrong pattern.
_lua_verify_patterns() {
debug-print-function ${FUNCNAME} "${@}"
local impl pattern
for pattern; do
for impl in "${_LUA_ALL_IMPLS[@]}"; do
[[ ${impl} == ${pattern/./-} ]] && continue 2
done
die "Invalid implementation pattern: ${pattern}"
done
}
# @FUNCTION: lua_gen_cond_dep
# @USAGE: <dependency> [<pattern>...]
# @DESCRIPTION:
# Output a list of <dependency>-ies made conditional to USE flags
# of Lua implementations which are both in LUA_COMPAT and match
# any of the patterns passed as the remaining parameters.
#
# The patterns can be fnmatch-style patterns (matched via bash == operator
# against LUA_COMPAT values). Remember to escape or quote the fnmatch
# patterns to prevent accidental shell filename expansion.
#
# In order to enforce USE constraints on the packages, verbatim
# '${LUA_SINGLE_USEDEP}' and '${LUA_USEDEP}' (quoted!) may
# be placed in the dependency specification. It will get expanded within
# the function into a proper USE dependency string.
#
# Example:
# @CODE
# LUA_COMPAT=( lua5-{1..3} )
# RDEPEND="$(lua_gen_cond_dep \
# 'dev-lua/backported_core_module[${LUA_USEDEP}]' lua5-1 lua5-2 )"
# @CODE
#
# It will cause the variable to look like:
# @CODE
# RDEPEND="lua_single_target_lua5-1? (
# dev-lua/backported_core_module[lua_targets_lua5-1(-)?,...] )
# lua_single_target_lua5-2? (
# dev-lua/backported_core_module[lua_targets_lua5-2(-)?,...] )"
# @CODE
lua_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
local impl matches=()
local dep=${1}
shift
_lua_verify_patterns "${@}"
for impl in "${_LUA_SUPPORTED_IMPLS[@]}"; do
if _lua_impl_matches "${impl}" "${@}"; then
# substitute ${LUA_SINGLE_USEDEP} if used
# (since lua_gen_usedep() will not return
# ${LUA_SINGLE_USEDEP}, the code is run at most once)
if [[ ${dep} == *'${LUA_SINGLE_USEDEP}'* ]]; then
local usedep=$(_lua_gen_usedep "${@}")
dep=${dep//\$\{LUA_SINGLE_USEDEP\}/${usedep}}
fi
local multi_usedep="lua_targets_${impl}(-)"
local subdep=${dep//\$\{LUA_MULTI_USEDEP\}/${multi_usedep}}
matches+=( "lua_single_target_${impl}? (
${subdep//\$\{LUA_USEDEP\}/${multi_usedep}} )" )
fi
done
echo "${matches[@]}"
}
# @FUNCTION: lua_gen_impl_dep
# @USAGE: [<requested-use-flags> [<impl-pattern>...]]
# @DESCRIPTION:
# Output a dependency on Lua implementations with the specified USE
# dependency string appended, or no USE dependency string if called
# without the argument (or with empty argument). If any implementation
# patterns are passed, the output dependencies will be generated only
# for the implementations matching them.
#
# The patterns can be fnmatch-style patterns (matched via bash == operator
# against LUA_COMPAT values). Remember to escape or quote the fnmatch
# patterns to prevent accidental shell filename expansion.
#
# Use this function when you need to request different USE flags
# on the Lua interpreter depending on package's USE flags. If you
# only need a single set of interpreter USE flags, just set
# LUA_REQ_USE and use ${LUA_DEPS} globally.
#
# Example:
# @CODE
# LUA_COMPAT=( lua5-{1..3} )
# RDEPEND="foo? ( $(lua_gen_impl_dep 'deprecated(+)' lua5-3 ) )"
# @CODE
#
# It will cause the variable to look like:
# @CODE
# RDEPEND="foo? (
# lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] )
# )"
# @CODE
lua_gen_impl_dep() {
debug-print-function ${FUNCNAME} "${@}"
local impl
local matches=()
local LUA_REQ_USE=${1}
shift
_lua_verify_patterns "${@}"
for impl in "${_LUA_SUPPORTED_IMPLS[@]}"; do
if _lua_impl_matches "${impl}" "${@}"; then
local LUA_PKG_DEP
_lua_export "${impl}" LUA_PKG_DEP
matches+=( "lua_single_target_${impl}? ( ${LUA_PKG_DEP} )" )
fi
done
echo "${matches[@]}"
}
# @FUNCTION: lua_setup
# @DESCRIPTION:
# Determine what the selected Lua implementation is and set
# the Lua build environment up for it.
lua_setup() {
debug-print-function ${FUNCNAME} "${@}"
unset ELUA
# support developer override
if [[ ${LUA_COMPAT_OVERRIDE} ]]; then
local impls=( ${LUA_COMPAT_OVERRIDE} )
[[ ${#impls[@]} -eq 1 ]] || die "LUA_COMPAT_OVERRIDE must name exactly one implementation for lua-single"
ewarn "WARNING: LUA_COMPAT_OVERRIDE in effect. The following Lua"
ewarn "implementation will be used:"
ewarn
ewarn " ${LUA_COMPAT_OVERRIDE}"
ewarn
ewarn "Dependencies won't be satisfied, and LUA_SINGLE_TARGET flags will be ignored."
_lua_export "${impls[0]}" ELUA LUA
_lua_wrapper_setup
einfo "Using ${ELUA} to build"
return
fi
local impl
for impl in "${_LUA_SUPPORTED_IMPLS[@]}"; do
if use "lua_single_target_${impl}"; then
if [[ ${ELUA} ]]; then
eerror "Your LUA_SINGLE_TARGET setting lists more than a single Lua"
eerror "implementation. Please set it to just one value. If you need"
eerror "to override the value for a single package, please use package.env"
eerror "or an equivalent solution (man 5 portage)."
echo
die "More than one implementation in LUA_SINGLE_TARGET."
fi
_lua_export "${impl}" ELUA LUA
_lua_wrapper_setup
einfo "Using ${ELUA} to build"
fi
done
if [[ ! ${ELUA} ]]; then
eerror "No Lua implementation selected for the build. Please set"
eerror "the LUA_SINGLE_TARGET variable in your make.conf to one"
eerror "of the following values:"
eerror
eerror "${_LUA_SUPPORTED_IMPLS[@]}"
echo
die "No supported Lua implementation in LUA_SINGLE_TARGET."
fi
}
# @FUNCTION: lua-single_pkg_setup
# @DESCRIPTION:
# Runs lua_setup.
lua-single_pkg_setup() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${MERGE_TYPE} != binary ]] && lua_setup
}
_LUA_SINGLE_R0=1
fi

@ -0,0 +1,373 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: lua-utils.eclass
# @MAINTAINER:
# William Hubbs <williamh@gentoo.org>
# Marek Szuba <marecki@gentoo.org>
# @AUTHOR:
# Marek Szuba <marecki@gentoo.org>
# Based on python-utils-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
# @SUPPORTED_EAPIS: 7
# @BLURB: Utility functions for packages with Lua parts
# @DESCRIPTION:
# A utility eclass providing functions to query Lua implementations,
# install Lua modules and scripts.
#
# Please note that for the time being this eclass does NOT support luajit.
#
# This eclass neither sets any metadata variables nor exports any phase
# functions. It can be inherited safely.
case ${EAPI:-0} in
0|1|2|3|4|5|6)
die "Unsupported EAPI=${EAPI} (too old) for ${ECLASS}"
;;
7)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
;;
esac
if [[ ! ${_LUA_UTILS_R0} ]]; then
inherit toolchain-funcs
# @ECLASS-VARIABLE: _LUA_ALL_IMPLS
# @INTERNAL
# @DESCRIPTION:
# All supported Lua implementations, most preferred last
_LUA_ALL_IMPLS=(
lua5-1
lua5-2
lua5-3
lua5-4
)
readonly _LUA_ALL_IMPLS
# @FUNCTION: _lua_set_impls
# @INTERNAL
# @DESCRIPTION:
# Check LUA_COMPAT for well-formedness and validity, then set
# two global variables:
#
# - _LUA_SUPPORTED_IMPLS containing valid implementations supported
# by the ebuild (LUA_COMPAT minus dead implementations),
#
# - and _LUA_UNSUPPORTED_IMPLS containing valid implementations that
# are not supported by the ebuild.
#
# Implementations in both variables are ordered using the pre-defined
# eclass implementation ordering.
#
# This function must only be called once.
_lua_set_impls() {
local i
if ! declare -p LUA_COMPAT &>/dev/null; then
die 'LUA_COMPAT not declared.'
fi
if [[ $(declare -p LUA_COMPAT) != "declare -a"* ]]; then
die 'LUA_COMPAT must be an array.'
fi
local supp=() unsupp=()
for i in "${_LUA_ALL_IMPLS[@]}"; do
if has "${i}" "${LUA_COMPAT[@]}"; then
supp+=( "${i}" )
else
unsupp+=( "${i}" )
fi
done
if [[ ! ${supp[@]} ]]; then
die "No supported implementation in LUA_COMPAT."
fi
if [[ ${_LUA_SUPPORTED_IMPLS[@]} ]]; then
# set once already, verify integrity
if [[ ${_LUA_SUPPORTED_IMPLS[@]} != ${supp[@]} ]]; then
eerror "Supported impls (LUA_COMPAT) changed between inherits!"
eerror "Before: ${_LUA_SUPPORTED_IMPLS[*]}"
eerror "Now : ${supp[*]}"
die "_LUA_SUPPORTED_IMPLS integrity check failed"
fi
if [[ ${_LUA_UNSUPPORTED_IMPLS[@]} != ${unsupp[@]} ]]; then
eerror "Unsupported impls changed between inherits!"
eerror "Before: ${_LUA_UNSUPPORTED_IMPLS[*]}"
eerror "Now : ${unsupp[*]}"
die "_LUA_UNSUPPORTED_IMPLS integrity check failed"
fi
else
_LUA_SUPPORTED_IMPLS=( "${supp[@]}" )
_LUA_UNSUPPORTED_IMPLS=( "${unsupp[@]}" )
readonly _LUA_SUPPORTED_IMPLS _LUA_UNSUPPORTED_IMPLS
fi
}
# @FUNCTION: _lua_wrapper_setup
# @USAGE: [<path> [<impl>]]
# @INTERNAL
# @DESCRIPTION:
# Create proper Lua executables and pkg-config wrappers
# (if available) in the directory named by <path>. Set up PATH
# and PKG_CONFIG_PATH appropriately. <path> defaults to ${T}/${ELUA}.
#
# The wrappers will be created for implementation named by <impl>,
# or for one named by ${ELUA} if no <impl> passed.
#
# If the named directory contains a lua symlink already, it will
# be assumed to contain proper wrappers already and only environment
# setup will be done. If wrapper update is requested, the directory
# shall be removed first.
_lua_wrapper_setup() {
debug-print-function ${FUNCNAME} "${@}"
local workdir=${1:-${T}/${ELUA}}
local impl=${2:-${ELUA}}
[[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified."
[[ ${impl} ]] || die "${FUNCNAME}: no impl nor ELUA specified."
if [[ ! -x ${workdir}/bin/lua ]]; then
mkdir -p "${workdir}"/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update
rm -f "${workdir}"/bin/lua{,c} || die
rm -f "${workdir}"/pkgconfig/lua.pc || die
local ELUA LUA
_lua_export "${impl}" ELUA LUA
# Lua interpreter and compiler
ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die
ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
# pkg-config
ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
"${workdir}"/pkgconfig/lua.pc || die
fi
# Now, set the environment.
# But note that ${workdir} may be shared with something else,
# and thus already on top of PATH.
if [[ ${PATH##:*} != ${workdir}/bin ]]; then
PATH=${workdir}/bin${PATH:+:${PATH}}
fi
if [[ ${PKG_CONFIG_PATH##:*} != ${workdir}/pkgconfig ]]; then
PKG_CONFIG_PATH=${workdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
fi
export PATH PKG_CONFIG_PATH
}
# @ECLASS-VARIABLE: ELUA
# @DEFAULT_UNSET
# @DESCRIPTION:
# The executable name of the current Lua interpreter. This variable is set
# automatically in functions called by lua_foreach_impl().
#
# Example value:
# @CODE
# lua5.1
# @CODE
# @ECLASS-VARIABLE: LUA
# @DEFAULT_UNSET
# @DESCRIPTION:
# The absolute path to the current Lua interpreter. This variable is set
# automatically in functions called by lua_foreach_impl().
#
# Example value:
# @CODE
# /usr/bin/lua5.1
# @CODE
# @FUNCTION: _lua_export
# @USAGE: [<impl>] <variables>...
# @INTERNAL
# @DESCRIPTION:
# Set and export the Lua implementation-relevant variables passed
# as parameters.
#
# The optional first parameter may specify the requested Lua
# implementation (either as LUA_TARGETS value, e.g. lua5-2,
# or an ELUA one, e.g. lua5.2). If no implementation passed,
# the current one will be obtained from ${ELUA}.
_lua_export() {
debug-print-function ${FUNCNAME} "${@}"
local impl var
case "${1}" in
lua*)
impl=${1/-/.}
shift
;;
*)
impl=${ELUA}
if [[ -z ${impl} ]]; then
die "_lua_export called without a Lua implementation and ELUA is unset"
fi
;;
esac
debug-print "${FUNCNAME}: implementation: ${impl}"
for var; do
case "${var}" in
ELUA)
export ELUA=${impl}
debug-print "${FUNCNAME}: ELUA = ${ELUA}"
;;
LUA)
export LUA="${EPREFIX}"/usr/bin/${impl}
debug-print "${FUNCNAME}: LUA = ${LUA}"
;;
LUA_CFLAGS)
local val
val=$($(tc-getPKG_CONFIG) --cflags ${impl}) || die
export LUA_CFLAGS=${val}
debug-print "${FUNCNAME}: LUA_CFLAGS = ${LUA_CFLAGS}"
;;
LUA_CMOD_DIR)
local val
val=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${impl}) || die
export LUA_CMOD_DIR=${val}
debug-print "${FUNCNAME}: LUA_CMOD_DIR = ${LUA_CMOD_DIR}"
;;
LUA_LIBS)
local val
val=$($(tc-getPKG_CONFIG) --libs ${impl}) || die
export LUA_LIBS=${val}
debug-print "${FUNCNAME}: LUA_LIBS = ${LUA_LIBS}"
;;
LUA_LMOD_DIR)
local val
val=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${impl}) || die
export LUA_LMOD_DIR=${val}
debug-print "${FUNCNAME}: LUA_LMOD_DIR = ${LUA_LMOD_DIR}"
;;
LUA_PKG_DEP)
local d
case ${impl} in
lua*)
LUA_PKG_DEP="dev-lang/lua:${impl#lua}"
;;
*)
die "Invalid implementation: ${impl}"
;;
esac
# use-dep
if [[ ${LUA_REQ_USE} ]]; then
LUA_PKG_DEP+=[${LUA_REQ_USE}]
fi
export LUA_PKG_DEP
debug-print "${FUNCNAME}: LUA_PKG_DEP = ${LUA_PKG_DEP}"
;;
LUA_VERSION)
local val
val=$($(tc-getPKG_CONFIG) --modversion ${impl}) || die
export LUA_VERSION=${val}
debug-print "${FUNCNAME}: LUA_VERSION = ${LUA_VERSION}"
;;
*)
die "_lua_export: unknown variable ${var}"
;;
esac
done
}
# @FUNCTION: lua_get_CFLAGS
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the compiler flags for building against Lua,
# for the given implementation. If no implementation is provided,
# ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_CFLAGS() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_CFLAGS
echo "${LUA_CFLAGS}"
}
# @FUNCTION: lua_get_cmod_dir
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the name of the directory into which compiled Lua
# modules are installed, for the given implementation. If no implementation
# is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_cmod_dir() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_CMOD_DIR
echo "${LUA_CMOD_DIR}"
}
# @FUNCTION: lua_get_LIBS
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the compiler flags for linking against Lua,
# for the given implementation. If no implementation is provided,
# ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_LIBS() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_LIBS
echo "${LUA_LIBS}"
}
# @FUNCTION: lua_get_lmod_dir
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the name of the directory into which native-Lua
# modules are installed, for the given implementation. If no implementation
# is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_lmod_dir() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_LMOD_DIR
echo "${LUA_LMOD_DIR}"
}
# @FUNCTION: lua_get_version
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the full version number of the given Lua implementation.
# If no implementation is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_version() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_VERSION
echo "${LUA_VERSION}"
}
_LUA_UTILS_R0=1
fi

@ -7,7 +7,7 @@
# Marek Szuba <marecki@gentoo.org>
# @AUTHOR:
# Marek Szuba <marecki@gentoo.org>
# Based on python{,-utils}-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
# Based on python-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
# @SUPPORTED_EAPIS: 7
# @BLURB: A common eclass for Lua packages
# @DESCRIPTION:
@ -21,7 +21,9 @@
# package easily. It also provides methods to easily run a command for
# each enabled Lua implementation and duplicate the sources for them.
#
# Please note that for the time being this eclass does NOT support luajit.
# Note that since this eclass always inherits lua-utils as well, in ebuilds
# using the former there is no need to explicitly inherit the latter in order
# to use helper functions such as lua_get_CFLAGS.
#
# @EXAMPLE:
# @CODE
@ -61,7 +63,11 @@ esac
if [[ ! ${_LUA_R0} ]]; then
inherit multibuild toolchain-funcs
if [[ ${_LUA_SINGLE_R0} ]]; then
die 'lua.eclass cannot be used with lua-single.eclass.'
fi
inherit multibuild lua-utils
fi
@ -140,28 +146,6 @@ fi
# ${WORKDIR}/foo-1.3-lua5-1
# @CODE
# @ECLASS-VARIABLE: ELUA
# @DEFAULT_UNSET
# @DESCRIPTION:
# The executable name of the current Lua interpreter. This variable is set
# automatically in functions called by lua_foreach_impl().
#
# Example value:
# @CODE
# lua5.1
# @CODE
# @ECLASS-VARIABLE: LUA
# @DEFAULT_UNSET
# @DESCRIPTION:
# The absolute path to the current Lua interpreter. This variable is set
# automatically in functions called by lua_foreach_impl().
#
# Example value:
# @CODE
# /usr/bin/lua5.1
# @CODE
# @ECLASS-VARIABLE: LUA_DEPS
# @OUTPUT_VARIABLE
# @DESCRIPTION:
@ -219,112 +203,6 @@ fi
if [[ ! ${_LUA_R0} ]]; then
# @FUNCTION: _lua_export
# @USAGE: [<impl>] <variables>...
# @INTERNAL
# @DESCRIPTION:
# Set and export the Lua implementation-relevant variables passed
# as parameters.
#
# The optional first parameter may specify the requested Lua
# implementation (either as LUA_TARGETS value, e.g. lua5-2,
# or an ELUA one, e.g. lua5.2). If no implementation passed,
# the current one will be obtained from ${ELUA}.
_lua_export() {
debug-print-function ${FUNCNAME} "${@}"
local impl var
case "${1}" in
lua*)
impl=${1/-/.}
shift
;;
*)
impl=${ELUA}
if [[ -z ${impl} ]]; then
die "_lua_export called without a Lua implementation and ELUA is unset"
fi
;;
esac
debug-print "${FUNCNAME}: implementation: ${impl}"
for var; do
case "${var}" in
ELUA)
export ELUA=${impl}
debug-print "${FUNCNAME}: ELUA = ${ELUA}"
;;
LUA)
export LUA="${EPREFIX}"/usr/bin/${impl}
debug-print "${FUNCNAME}: LUA = ${LUA}"
;;
LUA_CFLAGS)
local val
val=$($(tc-getPKG_CONFIG) --cflags ${impl}) || die
export LUA_CFLAGS=${val}
debug-print "${FUNCNAME}: LUA_CFLAGS = ${LUA_CFLAGS}"
;;
LUA_CMOD_DIR)
local val
val=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${impl}) || die
export LUA_CMOD_DIR=${val}
debug-print "${FUNCNAME}: LUA_CMOD_DIR = ${LUA_CMOD_DIR}"
;;
LUA_LIBS)
local val
val=$($(tc-getPKG_CONFIG) --libs ${impl}) || die
export LUA_LIBS=${val}
debug-print "${FUNCNAME}: LUA_LIBS = ${LUA_LIBS}"
;;
LUA_LMOD_DIR)
local val
val=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${impl}) || die
export LUA_LMOD_DIR=${val}
debug-print "${FUNCNAME}: LUA_LMOD_DIR = ${LUA_LMOD_DIR}"
;;
LUA_PKG_DEP)
local d
case ${impl} in
lua*)
LUA_PKG_DEP="dev-lang/lua:${impl#lua}"
;;
*)
die "Invalid implementation: ${impl}"
;;
esac
# use-dep
if [[ ${LUA_REQ_USE} ]]; then
LUA_PKG_DEP+=[${LUA_REQ_USE}]
fi
export LUA_PKG_DEP
debug-print "${FUNCNAME}: LUA_PKG_DEP = ${LUA_PKG_DEP}"
;;
LUA_VERSION)
local val
val=$($(tc-getPKG_CONFIG) --modversion ${impl}) || die
export LUA_VERSION=${val}
debug-print "${FUNCNAME}: LUA_VERSION = ${LUA_VERSION}"
;;
*)
die "_lua_export: unknown variable ${var}"
;;
esac
done
}
# @FUNCTION: _lua_validate_useflags
# @INTERNAL
# @DESCRIPTION:
@ -401,61 +279,6 @@ _lua_multibuild_wrapper() {
"${@}"
}
# @FUNCTION: _lua_wrapper_setup
# @USAGE: [<path> [<impl>]]
# @INTERNAL
# @DESCRIPTION:
# Create proper Lua executables and pkg-config wrappers
# (if available) in the directory named by <path>. Set up PATH
# and PKG_CONFIG_PATH appropriately. <path> defaults to ${T}/${ELUA}.
#
# The wrappers will be created for implementation named by <impl>,
# or for one named by ${ELUA} if no <impl> passed.
#
# If the named directory contains a lua symlink already, it will
# be assumed to contain proper wrappers already and only environment
# setup will be done. If wrapper update is requested, the directory
# shall be removed first.
_lua_wrapper_setup() {
debug-print-function ${FUNCNAME} "${@}"
local workdir=${1:-${T}/${ELUA}}
local impl=${2:-${ELUA}}
[[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified."
[[ ${impl} ]] || die "${FUNCNAME}: no impl nor ELUA specified."
if [[ ! -x ${workdir}/bin/lua ]]; then
mkdir -p "${workdir}"/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update
rm -f "${workdir}"/bin/lua{,c} || die
rm -f "${workdir}"/pkgconfig/lua.pc || die
local ELUA LUA
_lua_export "${impl}" ELUA LUA
# Lua interpreter and compiler
ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die
ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
# pkg-config
ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
"${workdir}"/pkgconfig/lua.pc || die
fi
# Now, set the environment.
# But note that ${workdir} may be shared with something else,
# and thus already on top of PATH.
if [[ ${PATH##:*} != ${workdir}/bin ]]; then
PATH=${workdir}/bin${PATH:+:${PATH}}
fi
if [[ ${PKG_CONFIG_PATH##:*} != ${workdir}/pkgconfig ]]; then
PKG_CONFIG_PATH=${workdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
fi
export PATH PKG_CONFIG_PATH
}
# @FUNCTION: lua_copy_sources
# @DESCRIPTION:
# Create a single copy of the package sources for each enabled Lua
@ -495,161 +318,9 @@ lua_foreach_impl() {
multibuild_foreach_variant _lua_multibuild_wrapper "${@}"
}
# @FUNCTION: lua_get_CFLAGS
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the compiler flags for building against Lua,
# for the given implementation. If no implementation is provided,
# ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_CFLAGS() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_CFLAGS
echo "${LUA_CFLAGS}"
}
# @FUNCTION: lua_get_cmod_dir
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the name of the directory into which compiled Lua
# modules are installed, for the given implementation. If no implementation
# is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_cmod_dir() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_CMOD_DIR
echo "${LUA_CMOD_DIR}"
}
# @FUNCTION: lua_get_LIBS
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the compiler flags for linking against Lua,
# for the given implementation. If no implementation is provided,
# ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_LIBS() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_LIBS
echo "${LUA_LIBS}"
}
# @FUNCTION: lua_get_lmod_dir
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the name of the directory into which native-Lua
# modules are installed, for the given implementation. If no implementation
# is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_lmod_dir() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_LMOD_DIR
echo "${LUA_LMOD_DIR}"
}
# @FUNCTION: lua_get_version
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the full version number of the given Lua implementation.
# If no implementation is provided, ${ELUA} will be used.
#
# Please note that this function requires Lua and pkg-config installed,
# and therefore proper build-time dependencies need be added to the ebuild.
lua_get_version() {
debug-print-function ${FUNCNAME} "${@}"
_lua_export "${@}" LUA_VERSION
echo "${LUA_VERSION}"
}
_LUA_R0=1
fi
# @ECLASS-VARIABLE: _LUA_ALL_IMPLS
# @INTERNAL
# @DESCRIPTION:
# All supported Lua implementations, most preferred last
_LUA_ALL_IMPLS=(
lua5-1
lua5-2
lua5-3
lua5-4
)
readonly _LUA_ALL_IMPLS
# @FUNCTION: _lua_set_impls
# @INTERNAL
# @DESCRIPTION:
# Check LUA_COMPAT for well-formedness and validity, then set
# two global variables:
#
# - _LUA_SUPPORTED_IMPLS containing valid implementations supported
# by the ebuild (LUA_COMPAT minus dead implementations),
#
# - and _LUA_UNSUPPORTED_IMPLS containing valid implementations that
# are not supported by the ebuild.
#
# Implementations in both variables are ordered using the pre-defined
# eclass implementation ordering.
#
# This function must only be called once.
_lua_set_impls() {
local i
if ! declare -p LUA_COMPAT &>/dev/null; then
die 'LUA_COMPAT not declared.'
fi
if [[ $(declare -p LUA_COMPAT) != "declare -a"* ]]; then
die 'LUA_COMPAT must be an array.'
fi
local supp=() unsupp=()
for i in "${_LUA_ALL_IMPLS[@]}"; do
if has "${i}" "${LUA_COMPAT[@]}"; then
supp+=( "${i}" )
else
unsupp+=( "${i}" )
fi
done
if [[ ! ${supp[@]} ]]; then
die "No supported implementation in LUA_COMPAT."
fi
if [[ ${_LUA_SUPPORTED_IMPLS[@]} ]]; then
# set once already, verify integrity
if [[ ${_LUA_SUPPORTED_IMPLS[@]} != ${supp[@]} ]]; then
eerror "Supported impls (LUA_COMPAT) changed between inherits!"
eerror "Before: ${_LUA_SUPPORTED_IMPLS[*]}"
eerror "Now : ${supp[*]}"
die "_LUA_SUPPORTED_IMPLS integrity check failed"
fi
if [[ ${_LUA_UNSUPPORTED_IMPLS[@]} != ${unsupp[@]} ]]; then
eerror "Unsupported impls changed between inherits!"
eerror "Before: ${_LUA_UNSUPPORTED_IMPLS[*]}"
eerror "Now : ${unsupp[*]}"
die "_LUA_UNSUPPORTED_IMPLS integrity check failed"
fi
else
_LUA_SUPPORTED_IMPLS=( "${supp[@]}" )
_LUA_UNSUPPORTED_IMPLS=( "${unsupp[@]}" )
readonly _LUA_SUPPORTED_IMPLS _LUA_UNSUPPORTED_IMPLS
fi
}
# @FUNCTION: _lua_set_globals
# @INTERNAL
# @DESCRIPTION:
@ -707,4 +378,4 @@ _lua_set_globals() {
}
_lua_set_globals
unset -f _lua_set_globals _lua_set_impls
unset -f _lua_set_globals

Binary file not shown.

@ -1,4 +1,2 @@
DIST ImageMagick-6.9.11-28.tar.xz 9315628 BLAKE2B 8ece7dae4d8c7de695e85b832e5c15c1474e00c9027aeb251a279dc9b51a02f5fd1e96f48987377cd6d937a126e5750e9aef9a11caf64603267b81e6a874f205 SHA512 e2954d1a55a37fa339dd0cbc0ca753e4f783cd77858277e287c033a53ac5f2e96bc5329d069016fc3841d07dc9e8f5b1bb08ecf9ed0224bbc675843132749fdd
DIST ImageMagick-6.9.11-31.tar.xz 9225744 BLAKE2B 0a540862ac6cf3504e0ad081748c5e6a99b8858ed52e145b8be142a3294a5e354ee8453987c9783deb924a69fe2dbf340d88e9bc7bcdb14b98f33a6bf18e3039 SHA512 11a33d75c2e9ff35ff5e8d0c40a470874dcbe39350f84f7816c536798af0be5da78cd28416ce74e6f045a4cfdb0f70e1f7fb58dd7bf88465a744fb587c098ee4
DIST ImageMagick-7.0.10-28.tar.xz 9705324 BLAKE2B 0fe890a23b9fc97ceb5253e24ab8236135f4a4f48c1480ad5577c6a2535bf350fcea062b8897fc5e7993ab86716b1e280fabcf664442e3fe9d209e8c2806ea2d SHA512 fcfdacec893bb0a39c4a3caae1ade5ea7d3f6b8909cc73f218260f9f9b354ebe77aecedb2be2e2a64011eceb895c1ecb2fa0f349361387d56fb0f3cde657e158
DIST ImageMagick-7.0.10-31.tar.xz 9653808 BLAKE2B 14c02ed0be35d817ebc2ccb0fcd436e34a7350dbe459ec3acd1a6ed94e46b181b5f713c9e8b5260e08287d5feb34c7a23b4e57bda0752a8206352c10b5379825 SHA512 0f6a2e098706186e43be3b91f10ac243aef4d96ce8943e88709243f9673205ec2261502c623f10af4f8fa126d8b4d5e3f636c9820790e5d730e54c5e634a61b3

@ -1,255 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
RESTRICT="perl? ( userpriv )
!test? ( test )"
RDEPEND="
dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
corefonts? ( media-fonts/corefonts )
djvu? ( app-text/djvu )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
heif? ( media-libs/libheif:= )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
perl? ( >=dev-lang/perl-5.8.8:0= )
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-libs/libraw:= )
svg? (
gnome-base/librsvg
media-gfx/potrace
)
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
)
webp? ( media-libs/libwebp:0= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
)
xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
virtual/pkgconfig
X? ( x11-base/xorg-proto )"
S="${WORKDIR}/${MY_P}"
#S="${WORKDIR}/ImageMagick6-${MY_PV}"
src_prepare() {
default
# Apply hardening #664236
cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
sed -i -e '/^<policymap>$/ {
r policy-hardening.snippet
d
}' \
config/policy.xml || \
die "Failed to apply hardening of policy.xml"
einfo "policy.xml hardened"
elibtoolize # for Darwin modules
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
local mesa_cards ati_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
if test -n "${ati_cards}"; then
addpredict "${ati_cards}"
fi
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${mesa_cards}"; then
addpredict "${mesa_cards}"
fi
nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
if test -n "${nvidia_cards}"; then
addpredict "${nvidia_cards}"
fi
render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
if test -n "${render_cards}"; then
addpredict "${render_cards}"
fi
shopt -u nullglob
addpredict /dev/nvidiactl
}
src_configure() {
local depth=16
use q8 && depth=8
use q32 && depth=32
local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
--with-threads
--with-modules
--with-quantum-depth=${depth}
$(use_with cxx magick-plus-plus)
$(use_with perl)
--with-perl-options='INSTALLDIRS=vendor'
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
$(use_with zlib)
--without-autotrace
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
$(use_with fftw)
$(use_with fpx)
$(use_with fontconfig)
$(use_with truetype freetype)
$(use_with postscript gslib)
$(use_with graphviz gvc)
$(use_with heif heic)
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
$(use_with openexr)
$(use_with pango)
$(use_with png)
$(use_with raw)
$(use_with svg rsvg)
$(use_with tiff)
$(use_with webp)
$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
--${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
src_test() {
# Install default (unrestricted) policy in $HOME for test suite #664238
local _im_local_config_home="${HOME}/.config/ImageMagick"
mkdir -p "${_im_local_config_home}" || \
die "Failed to create IM config dir in '${_im_local_config_home}'"
cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
local im_command= IM_COMMANDS=()
IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
IM_COMMANDS+=( "emake check" ) # Run tests
for im_command in "${IM_COMMANDS[@]}"; do
eval "${S}"/magick.sh \
${im_command} || \
die "Failed to run \"${im_command}\""
done
}
src_install() {
# Ensure documentation installation files and paths with each release!
emake \
DESTDIR="${D}" \
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
dodoc {AUTHORS,README}.txt ChangeLog
if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
fi
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
# .la files in parent are not needed, keep plugin .la files
rm "${ED}"/usr/$(get_libdir)/*.la || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
EOF
insinto /etc/sandbox.d
doins "${T}"/99${PN} #472766
fi
insinto /usr/share/${PN}
doins config/*icm
}
pkg_postinst() {
local _show_policy_xml_notice=
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
_show_policy_xml_notice=yes
else
local v
for v in ${REPLACING_VERSIONS}; do
if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
# This is an upgrade
_show_policy_xml_notice=yes
# Show this elog only once
break
fi
done
fi
if [[ -n "${_show_policy_xml_notice}" ]]; then
elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
elog "which will prevent the usage of the following coders by default:"
elog ""
elog " - PS"
elog " - PS2"
elog " - PS3"
elog " - EPS"
elog " - PDF"
elog " - XPS"
fi
}

@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )

@ -1,268 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
inherit git-r3
MY_P="imagemagick-9999"
else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
LICENSE="imagemagick"
SLOT="0/7.0.10"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="corefonts? ( truetype )
svg? ( xml )
test? ( corefonts )"
RESTRICT="!test? ( test )"
BDEPEND="virtual/pkgconfig"
RDEPEND="
dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
corefonts? ( media-fonts/corefonts )
djvu? ( app-text/djvu )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
heif? ( media-libs/libheif:= )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
perl? ( >=dev-lang/perl-5.8.8:0= )
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-libs/libraw:= )
svg? (
gnome-base/librsvg
media-gfx/potrace
)
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
)
webp? ( media-libs/libwebp:0= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
)
xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
X? ( x11-base/xorg-proto )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
# Apply hardening #664236
cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
sed -i -e '/^<policymap>$/ {
r policy-hardening.snippet
d
}' \
config/policy.xml || \
die "Failed to apply hardening of policy.xml"
einfo "policy.xml hardened"
elibtoolize # for Darwin modules
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
local ati_cards mesa_cards nvidia_cards render_cards
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
if test -n "${ati_cards}"; then
addpredict "${ati_cards}"
fi
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${mesa_cards}"; then
addpredict "${mesa_cards}"
fi
nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
if test -n "${nvidia_cards}"; then
addpredict "${nvidia_cards}"
fi
render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
if test -n "${render_cards}"; then
addpredict "${render_cards}"
fi
shopt -u nullglob
addpredict /dev/nvidiactl
}
src_configure() {
local depth=16
use q8 && depth=8
use q32 && depth=32
local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
--with-threads
--with-modules
--with-quantum-depth=${depth}
$(use_with cxx magick-plus-plus)
$(use_with perl)
--with-perl-options='INSTALLDIRS=vendor'
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
$(use_with zlib)
--without-autotrace
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
$(use_with fftw)
$(use_with fpx)
$(use_with fontconfig)
$(use_with truetype freetype)
$(use_with postscript gslib)
$(use_with graphviz gvc)
$(use_with heif heic)
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
--without-jxl
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
$(use_with openexr)
$(use_with pango)
$(use_with png)
$(use_with raw)
$(use_with svg rsvg)
$(use_with tiff)
$(use_with webp)
$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
--${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
src_test() {
# Install default (unrestricted) policy in $HOME for test suite #664238
local _im_local_config_home="${HOME}/.config/ImageMagick"
mkdir -p "${_im_local_config_home}" || \
die "Failed to create IM config dir in '${_im_local_config_home}'"
cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
local im_command= IM_COMMANDS=()
if [[ ${PV} == "9999" ]] ; then
IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
else
IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
fi
IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
IM_COMMANDS+=( "emake check" ) # Run tests
for im_command in "${IM_COMMANDS[@]}"; do
eval "${S}"/magick.sh \
${im_command} || \
die "Failed to run \"${im_command}\""
done
}
src_install() {
# Ensure documentation installation files and paths with each release!
emake \
DESTDIR="${D}" \
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
dodoc {AUTHORS,README}.txt ChangeLog
if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
fi
find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
# .la files in parent are not needed, keep plugin .la files
rm "${ED}"/usr/$(get_libdir)/*.la || die
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
EOF
insinto /etc/sandbox.d
doins "${T}"/99${PN} #472766
fi
insinto /usr/share/${PN}
doins config/*icm
}
pkg_postinst() {
local _show_policy_xml_notice=
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
_show_policy_xml_notice=yes
else
local v
for v in ${REPLACING_VERSIONS}; do
if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
# This is an upgrade
_show_policy_xml_notice=yes
# Show this elog only once
break
fi
done
fi
if [[ -n "${_show_policy_xml_notice}" ]]; then
elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
elog "which will prevent the usage of the following coders by default:"
elog ""
elog " - PS"
elog " - PS2"
elog " - PS3"
elog " - EPS"
elog " - PDF"
elog " - XPS"
fi
}

@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"

@ -1,6 +1,5 @@
diff -NrU5 zgv-5.9.original/src/Makefile zgv-5.9/src/Makefile
--- zgv-5.9.original/src/Makefile 2009-09-28 15:31:29.000000000 -0600
+++ zgv-5.9/src/Makefile 2009-09-28 15:56:26.000000000 -0600
--- a/src/Makefile 2009-09-28 15:31:29.000000000 -0600
+++ b/src/Makefile 2009-09-28 15:56:26.000000000 -0600
@@ -45,11 +45,11 @@
readbmp.o readtga.o readpng.o readpcx.o \
readxvpic.o readmrf.o readxbm.o readxpm.o \

@ -1,5 +1,5 @@
--- zgv-5.9/src/readjpeg.c Sun Oct 31 14:54:26 2004
+++ zgv/src/readjpeg.c Wed Sep 21 21:03:22 2005
--- a/src/readjpeg.c Sun Oct 31 14:54:26 2004
+++ b/src/readjpeg.c Wed Sep 21 21:03:22 2005
@@ -92,11 +92,13 @@
int *real_width,int *real_height)
{

@ -1,7 +1,7 @@
http://bugs.gentoo.org/389591
--- src/readpng.c
+++ src/readpng.c
--- a/src/readpng.c
+++ b/src/readpng.c
@@ -63,7 +63,7 @@
use_errmsg=1;

@ -1,8 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
inherit eutils toolchain-funcs
EAPI=7
inherit toolchain-funcs
DESCRIPTION="A svgalib console image viewer"
HOMEPAGE="http://www.svgalib.org/rus/zgv/"
@ -11,24 +12,27 @@ SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86"
IUSE=""
RDEPEND=">=media-libs/svgalib-1.4.2
virtual/jpeg
RDEPEND="
media-libs/libpng
>=media-libs/svgalib-1.4.2
>=media-libs/tiff-3.5.5
sys-apps/gawk
>=sys-libs/zlib-1.1.4
sys-apps/gawk"
virtual/jpeg
"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-Makefile-QA.patch
"${FILESDIR}"/${P}-cmyk-yccl-fix.diff
"${FILESDIR}"/${P}-libpng15.patch
)
src_prepare() {
sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die
sed -i -e 's:$(RM):echo:' doc/Makefile || die
epatch \
"${FILESDIR}"/${P}-Makefile-QA.patch \
"${FILESDIR}"/${P}-cmyk-yccl-fix.diff \
"${FILESDIR}"/${P}-libpng15.patch
default
}
src_compile() {
@ -39,18 +43,18 @@ src_install() {
dodir /usr/bin /usr/share/info /usr/share/man/man1
emake \
PREFIX="${D}"/usr \
INFODIR="${D}"/usr/share/info \
MANDIR="${D}"/usr/share/man/man1 \
PREFIX="${ED}"/usr \
INFODIR="${ED}"/usr/share/info \
MANDIR="${ED}"/usr/share/man/man1 \
install
dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO
# Fix info files
cd "${D}"/usr/share/info
rm dir*
mv zgv zgv.info
rm dir* || die
mv zgv zgv.info || die
for i in 1 2 3 4 ; do
mv zgv-$i zgv.info-$i
mv zgv-$i zgv.info-$i || die
done
}

Binary file not shown.

@ -0,0 +1,23 @@
From 8b778aaee121c6b381bd570c2b6f526989866f8e Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Fri, 11 Sep 2020 21:24:24 -0700
Subject: [PATCH] fix regression in 2c354d6e with multiple affine filters
See #9 in https://forum.shotcut.org/t/v20-09-beta-is-now-available-to-
test/20766/31
---
src/modules/plus/transition_affine.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index 63bbaa1df..b1147c8c6 100644
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -564,6 +564,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
b_height = result.h;
// Set the rescale interpolation to match the frame
mlt_properties_set( b_props, "rescale.interp", mlt_properties_get( a_props, "rescale.interp" ) );
+ mlt_properties_set_int( b_props, "distort", 1 );
} else if (scale_width != 1.0 || scale_height != 1.0) {
// Scale request of b frame image to consumer scale maintaining its aspect ratio.
b_height = *height;

@ -84,6 +84,7 @@ DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
PATCHES=(
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
"${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.patch
)
pkg_setup() {

Binary file not shown.

@ -1 +1 @@
Sun, 04 Oct 2020 19:08:33 +0000
Mon, 05 Oct 2020 12:38:34 +0000

@ -1 +1 @@
Sun, 04 Oct 2020 19:08:33 +0000
Mon, 05 Oct 2020 12:38:34 +0000

Binary file not shown.

@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare
DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
DESCRIPTION=Tool to check contrast for colors to verify they are correctly accessible
EAPI=7
HOMEPAGE=https://invent.kde.org/accessibility/kontrast
HOMEPAGE=https://kde.org/applications/en/kontrast
IUSE=debug
KEYWORDS=~amd64
LICENSE=GPL-3+
@ -11,4 +11,4 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquick
SLOT=5
SRC_URI=mirror://kde/stable/kontrast/kontrast-1.0.2.tar.xz
_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 ecm f6ac7d31239fbaacf94ec10be0fb8066 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 kde.org 074252323c6185f751658b74c09b68ff l10n 8cdd85e169b835d518bc2fd59f780d8e multilib 98584e405e2b0264d37e8f728327fed1 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=55fa5fab52100f1a3d398a832cb96b75
_md5_=c173e096fd496aab5580b11a4adb6048

@ -0,0 +1,13 @@
BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install postinst
DESCRIPTION=Relax-and-Recover is a setup-and-forget bare metal disaster recovery solution
EAPI=7
HOMEPAGE=http://relax-and-recover.org/ https://github.com/rear/rear/
IUSE=udev
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
SLOT=0
SRC_URI=https://github.com/rear/rear/archive/2.6.tar.gz -> rear-2.6.tar.gz
_eclasses_=multilib 98584e405e2b0264d37e8f728327fed1 optfeature 6c9aa35fc16df43d7142ef2660e00e25 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
_md5_=382818ccd797c00ada873ebefdc6d87a

@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
DESCRIPTION=Manage repos.conf via eselect
EAPI=6
HOMEPAGE=https://github.com/mgorny/eselect-repository
IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=BSD-2
RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-admin/eselect python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) net-misc/wget
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-admin/eselect python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) net-misc/wget
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
SLOT=0
SRC_URI=https://github.com/mgorny/eselect-repository/archive/v8.tar.gz -> eselect-repository-8.tar.gz
_eclasses_=multilib 98584e405e2b0264d37e8f728327fed1 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=ff161788e7e655141527f93fbd1692b5
_md5_=43221dc9215ecfda1147b62751382ca0

@ -1,14 +1,14 @@
BDEPEND=virtual/pkgconfig
DEFINED_PHASES=config configure install postinst postrm
DEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( virtual/udev[systemd] ) dev-lang/perl
DEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) dev-lang/perl
DESCRIPTION=Yet Another SKK server
EAPI=7
HOMEPAGE=http://umiushi.org/~wac/yaskkserv/
IUSE=gnutls libressl systemd
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( virtual/udev[systemd] )
RDEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd )
SLOT=0
SRC_URI=http://umiushi.org/~wac/yaskkserv/yaskkserv-1.1.1.tar.xz
_eclasses_=multilib 98584e405e2b0264d37e8f728327fed1 systemd 69be00334d73f9f50261554b94be0879 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=1d815c3c34414aed2c345fc3f85900f5
_md5_=c26ae2a2232a9d7204088fbc6e713060

@ -1,15 +1,15 @@
BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
DEFINED_PHASES=compile configure install setup test
DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( >=sys-kernel/linux-headers-4.11 )
DESCRIPTION=ELF utils that can check files for security relevant properties
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
IUSE=caps debug kernel_linux python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
IUSE=caps debug kernel_linux python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
SLOT=0
SRC_URI=mirror://gentoo/pax-utils-1.2.6.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.6.tar.xz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib 98584e405e2b0264d37e8f728327fed1 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=7aab6a02eae7c4d58aa618180ac20cf1
_md5_=cc877c18c3aa8fc373c198398e0348ef

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save