diff --git a/Manifest.files.gz b/Manifest.files.gz
index 498645ec2f28..f02090617d80 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 781d55f94562..58d0551f4e9d 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/games-misc/games-envd/Manifest b/acct-group/mogile/Manifest
similarity index 100%
rename from games-misc/games-envd/Manifest
rename to acct-group/mogile/Manifest
diff --git a/games-misc/games-envd/metadata.xml b/acct-group/mogile/metadata.xml
similarity index 62%
rename from games-misc/games-envd/metadata.xml
rename to acct-group/mogile/metadata.xml
index 26079e608bed..5fb8aeb27d7a 100644
--- a/games-misc/games-envd/metadata.xml
+++ b/acct-group/mogile/metadata.xml
@@ -1,8 +1,10 @@
+
+ robbat2@gentoo.org
+
- games@gentoo.org
- Gentoo Games Project
+ perl@gentoo.org
diff --git a/acct-group/mogile/mogile-0.ebuild b/acct-group/mogile/mogile-0.ebuild
new file mode 100644
index 000000000000..7774948b6b0c
--- /dev/null
+++ b/acct-group/mogile/mogile-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="MogileFS group"
+ACCT_GROUP_ID=231
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b19db6fae833..94699892d52d 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/mogile/Manifest b/acct-user/mogile/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/mogile/metadata.xml b/acct-user/mogile/metadata.xml
new file mode 100644
index 000000000000..5fb8aeb27d7a
--- /dev/null
+++ b/acct-user/mogile/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ robbat2@gentoo.org
+
+
+ perl@gentoo.org
+
+
diff --git a/acct-user/mogile/mogile-0.ebuild b/acct-user/mogile/mogile-0.ebuild
new file mode 100644
index 000000000000..2441a86d5f14
--- /dev/null
+++ b/acct-user/mogile/mogile-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="MogileFS user"
+ACCT_USER_ID=460
+ACCT_USER_ENFORCE_ID=1
+ACCT_USER_GROUPS=( mogile )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 15deab21ee94..823c727fe747 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index d618947e53a6..359cc88438c6 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,3 +1,2 @@
DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
-DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
deleted file mode 100644
index 9e1067fa1dc1..000000000000
--- a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/siod/siod.cc
-+++ b/siod/siod.cc
-@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length)
- matches = walloc(char *,siod_llength(lmatches)+1);
- for (l=lmatches,i=0; l; l=cdr(l),i++)
- matches[i] = wstrdup(PNAME(car(l)));
-- matches[i] = '\0';
-+ *matches[i] = '\0';
-
- return matches;
- }
-@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length)
- matches = walloc(char *,siod_llength(lmatches)+1);
- for (l=lmatches,i=0; l; l=cdr(l),i++)
- matches[i] = wstrdup(PNAME(car(l)));
-- matches[i] = '\0';
-+ *matches[i] = '\0';
-
- return matches;
- }
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
deleted file mode 100644
index 2f487ae007ac..000000000000
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils epatch flag-o-matic multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-PATCHSET="r3"
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
- https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nas X"
-
-RDEPEND="
- nas? ( media-libs/nas )
- X? ( x11-libs/libX11
- x11-libs/libXt )
- >=media-libs/alsa-lib-1.0.20-r1
- !=sys-libs/ncurses-5.6-r2:0=
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/speech_tools"
-
-src_prepare() {
- EPATCH_SUFFIX="patch"
- epatch
-
- sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
- main/siod_main.cc || die
-
- #WRT bug #309983
- sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
- "${S}"/config/systems/sparc_SunOS5.mak || die
-
- # Fix underlinking, bug #493204
- epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
-
- # Fix gcc7 build failure, bug #634224
- epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch
-}
-
-src_configure() {
- local CONFIG=config/config.in
- sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
- if use nas; then
- sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
- ${CONFIG} || die
- fi
- if ! use X; then
- sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
- fi
- econf
-}
-
-src_compile() {
- emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dolib.so lib/libest*.so*
-
- dodoc "${S}"/README
- dodoc "${S}"/lib/cstrutt.dtd
-
- insinto /usr/share/doc/${PF}
- doins -r lib/example_data
-
- insinto /usr/share/speech-tools
- doins -r config base_class
-
- insinto /usr/share/speech-tools/lib
- doins -r lib/siod
-
- cd include || die
- insinto /usr/include/speech-tools
- doins -r *
- dosym ../../include/speech-tools /usr/share/speech-tools/include
-
- cd ../bin || die
- for file in *; do
- [ "${file}" = "Makefile" ] && continue
- dobin ${file}
- dstfile="${D}/usr/bin/${file}"
- sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
- ${dstfile} || die
- sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
- ${dstfile} || die
- sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
- ${dstfile} || die
-
- # This just changes LD_LIBRARY_PATH
- sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
- done
-
- cd "${S}" || die
- exeinto /usr/$(get_libdir)/speech-tools
- for file in `find main -perm /111 -type f`; do
- doexe ${file}
- done
-
- #Remove /usr/bin/resynth as it is broken. See bug #253556
- rm "${D}/usr/bin/resynth" || die
-
- # Remove bcat (only useful for testing on windows, see bug #418301).
- rm "${D}/usr/bin/bcat" || die
- rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
-}
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
index f14ff35bfac3..1c0615542e77 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools"
LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="nas openmp X"
RDEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b096ffd50a0f..417f16b98336 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
index b9ff00b24a57..d06fd2d8b609 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=x11-libs/gtk+-3.10.0:3
- >=dev-libs/libreport-2.0.20[python,${PYTHON_USEDEP}]
+ >=dev-libs/libreport-2.0.20:0=[python,${PYTHON_USEDEP}]
>=app-admin/abrt-2.10.10-r1
>=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
diff --git a/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch
new file mode 100644
index 000000000000..6aacbd9b80dd
--- /dev/null
+++ b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch
@@ -0,0 +1,18 @@
+--- a/print-ar.sh
++++ b/print-ar.sh
+@@ -1,7 +1,7 @@
+ cat warn-auto.sh
+ echo 'main="$1"; shift'
+ echo 'rm -f "$main"'
+-echo 'ar cr "$main" ${1+"$@"}'
++echo '${AR} cr "$main" ${1+"$@"}'
+ case "`cat systype`" in
+ sunos-5.*) ;;
+ unix_sv*) ;;
+@@ -10,5 +10,5 @@
+ dgux-*) ;;
+ hp-ux-*) ;;
+ sco*) ;;
+- *) echo 'ranlib "$main"' ;;
++ *) echo '${RANLIB} "$main"' ;;
+ esac
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index 1e48d5125737..367d62460e7e 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Small secure replacement for syslogd with automatic log rotation"
HOMEPAGE="http://smarden.org/socklog/"
SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
LICENSE="BSD"
SLOT="0"
@@ -16,15 +17,16 @@ IUSE="static"
RDEPEND=">=sys-process/runit-1.4.0"
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-headers.patch
+ "${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch
+)
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
- default
+src_configure() {
use static && append-ldflags -static
echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+ tc-export AR RANLIB
}
src_install() {
@@ -33,6 +35,8 @@ src_install() {
cd .. || die
dodoc package/CHANGES
- dohtml doc/*.html
+ docinto html
+ dodoc doc/*.html
+
doman man/*
}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index cc4949ab1dd7..b1b657d8a34f 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch b/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..f83c0e5b23c0
--- /dev/null
+++ b/app-backup/kfoldersync/files/kfoldersync-3.4.1-kwindowsystem-5.82.patch
@@ -0,0 +1,11 @@
+--- a/src/kfoldersync.cxx 2017-01-24 10:27:17.000000000 +0100
++++ b/src/kfoldersync.cxx 2021-05-08 23:52:28.891166974 +0200
+@@ -173,7 +173,7 @@
+ {
+ // Connect to dbus (keep it without parent to avoid potential SIGABRT)
+ static const KDBusService dbus_service(KDBusService::Unique);
+- connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this, KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
++ connect(&dbus_service, &KDBusService::activateRequested, this, [&]{KStartupInfo::setNewStartupId(this->window()->windowHandle(), KStartupInfo::startupId()); KWindowSystem::forceActiveWindow(winId());}, Qt::DirectConnection);
+
+ // Setup toolbar
+ QMenu * const app_menu = new QMenu(this);
diff --git a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
index 252fea2b53ce..5de0a6109900 100644
--- a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,3 +34,5 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # downstream patch
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 903a5cd7afd8..b03e6815c551 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/brasero/brasero-3.12.2-r3.ebuild b/app-cdr/brasero/brasero-3.12.2-r3.ebuild
index c23c398dfb90..63a074450330 100644
--- a/app-cdr/brasero/brasero-3.12.2-r3.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r3.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
-IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+IUSE="+css +introspection +libburn mp3 nautilus playlist test tracker"
RESTRICT="!test? ( test )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-COMMON_DEPEND="
+DEPEND="
>=dev-libs/glib-2.29.14:2
>=x11-libs/gtk+-3:3[introspection?]
media-libs/gstreamer:1.0
@@ -36,7 +36,7 @@ COMMON_DEPEND="
playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
tracker? ( app-misc/tracker:3= )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0[mp3?]
x11-themes/hicolor-icon-theme
@@ -46,9 +46,8 @@ RDEPEND="${COMMON_DEPEND}
app-cdr/cdrtools
app-cdr/dvd+rw-tools
)
- packagekit? ( app-admin/packagekit-base )
"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
>=dev-util/intltool-0.50
dev-util/itstool
>=dev-util/gtk-doc-am-1.12
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ec265adde92c..18be7decc509 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/acme-1.14.0.ebuild b/app-crypt/acme/acme-1.14.0.ebuild
index 45526ccaf417..ec89e0c80b43 100644
--- a/app-crypt/acme/acme-1.14.0.ebuild
+++ b/app-crypt/acme/acme-1.14.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S=${WORKDIR}/certbot-${PV}/acme
fi
diff --git a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
index bcdc453cba6d..d2e3aeb128a4 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
fi
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
index 52c50cecd71f..2ae43ed4bf96 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
fi
diff --git a/app-crypt/certbot/certbot-1.14.0.ebuild b/app-crypt/certbot/certbot-1.14.0.ebuild
index e2450c428f8d..e131af1788ec 100644
--- a/app-crypt/certbot/certbot-1.14.0.ebuild
+++ b/app-crypt/certbot/certbot-1.14.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
S=${WORKDIR}/${P}/${PN}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 15348728e2ee..d53fb33f6710 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index 5c000c763084..a69b95b1f467 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/metadata.xml
@@ -5,4 +5,7 @@
vim@gentoo.org
Gentoo Vim Project
+
+ https://invisible-island.net/vile/CHANGES.html
+
diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml
index f1abc6411341..a69b95b1f467 100644
--- a/app-editors/xvile/metadata.xml
+++ b/app-editors/xvile/metadata.xml
@@ -1,8 +1,11 @@
-
- vim@gentoo.org
- Gentoo Vim Project
-
+
+ vim@gentoo.org
+ Gentoo Vim Project
+
+
+ https://invisible-island.net/vile/CHANGES.html
+
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 46a8e0da286c..42d6e0638961 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
new file mode 100644
index 000000000000..6fba3c4154a4
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch
@@ -0,0 +1,93 @@
+From 91ad9b94bcd964adfbaa8d84d8f39304d39835d0 Mon Sep 17 00:00:00 2001
+From: Christian Brauner
+Date: Thu, 6 May 2021 18:16:45 +0200
+Subject: [PATCH] conf: handle kernels with CAP_SETFCAP
+
+LXC is being very clever and sometimes maps the caller's uid into the
+child userns. This means that the caller can technically write fscaps
+that are valid in the ancestor userns (which can be a security issue in
+some scenarios) so newer kernels require CAP_SETFCAP to do this. Until
+newuidmap/newgidmap are updated to account for this simply write the
+mapping directly in this case.
+
+Cc: stable-4.0
+Signed-off-by: Christian Brauner
+---
+ src/lxc/conf.c | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 72e21b5300..f388946970 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -2978,6 +2978,9 @@ static int lxc_map_ids_exec_wrapper(void *args)
+ return -1;
+ }
+
++static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap,
++ unsigned id, enum idtype idtype);
++
+ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+ {
+ int fill, left;
+@@ -2991,12 +2994,22 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+ char mapbuf[STRLITERALLEN("new@idmap") + STRLITERALLEN(" ") +
+ INTTYPE_TO_STRLEN(pid_t) + STRLITERALLEN(" ") +
+ LXC_IDMAPLEN] = {0};
+- bool had_entry = false, use_shadow = false;
++ bool had_entry = false, maps_host_root = false, use_shadow = false;
+ int hostuid, hostgid;
+
+ hostuid = geteuid();
+ hostgid = getegid();
+
++ /*
++ * Check whether caller wants to map host root.
++ * Due to a security fix newer kernels require CAP_SETFCAP when mapping
++ * host root into the child userns as you would be able to write fscaps
++ * that would be valid in the ancestor userns. Mapping host root should
++ * rarely be the case but LXC is being clever in a bunch of cases.
++ */
++ if (find_mapped_hostid_entry(idmap, 0, ID_TYPE_UID))
++ maps_host_root = true;
++
+ /* If new{g,u}idmap exists, that is, if shadow is handing out subuid
+ * ranges, then insist that root also reserve ranges in subuid. This
+ * will protected it by preventing another user from being handed the
+@@ -3014,7 +3027,9 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
+ else if (!gidmap)
+ WARN("newgidmap is lacking necessary privileges");
+
+- if (uidmap > 0 && gidmap > 0) {
++ if (maps_host_root) {
++ INFO("Caller maps host root. Writing mapping directly");
++ } else if (uidmap > 0 && gidmap > 0) {
+ DEBUG("Functional newuidmap and newgidmap binary found");
+ use_shadow = true;
+ } else {
+@@ -4229,14 +4244,14 @@ static struct id_map *mapped_nsid_add(const struct lxc_conf *conf, unsigned id,
+ return retmap;
+ }
+
+-static struct id_map *find_mapped_hostid_entry(const struct lxc_conf *conf,
++static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap,
+ unsigned id, enum idtype idtype)
+ {
+ struct id_map *map;
+ struct lxc_list *it;
+ struct id_map *retmap = NULL;
+
+- lxc_list_for_each (it, &conf->id_map) {
++ lxc_list_for_each (it, idmap) {
+ map = it->elem;
+ if (map->idtype != idtype)
+ continue;
+@@ -4265,7 +4280,7 @@ static struct id_map *mapped_hostid_add(const struct lxc_conf *conf, uid_t id,
+ return NULL;
+
+ /* Reuse existing mapping. */
+- tmp = find_mapped_hostid_entry(conf, id, type);
++ tmp = find_mapped_hostid_entry(&conf->id_map, id, type);
+ if (tmp) {
+ memcpy(entry, tmp, sizeof(*entry));
+ } else {
diff --git a/app-emulation/lxc/lxc-4.0.9.ebuild b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
similarity index 98%
rename from app-emulation/lxc/lxc-4.0.9.ebuild
rename to app-emulation/lxc/lxc-4.0.9-r1.ebuild
index 89a0b2e2b2df..8fbfeda5aca7 100644
--- a/app-emulation/lxc/lxc-4.0.9.ebuild
+++ b/app-emulation/lxc/lxc-4.0.9-r1.ebuild
@@ -72,6 +72,7 @@ pkg_setup() {
}
PATCHES=(
+ "${FILESDIR}"/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch # bug 789012
"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
)
diff --git a/app-emulation/xcpc/Manifest b/app-emulation/xcpc/Manifest
index 8a47bbf9ec44..23162f00274d 100644
--- a/app-emulation/xcpc/Manifest
+++ b/app-emulation/xcpc/Manifest
@@ -1,2 +1 @@
-DIST xcpc-0.35.0.tar.gz 1058202 BLAKE2B f5002fcc69a078cd05c05a981522edd15900295136419157f997effd81a89f7452cec335bbdba0be3b303bdc8f8537d4aac255ee7cf4e9ec53cc1143413ad1c1 SHA512 667db6db33f2cab85647960edb5b1c200037bfc464527a60eca85c31549360226893853a38d98e657bde111a28aca47d9741b16b13284759b66cb6213da27458
-DIST xcpc-0.36.0.tar.gz 1092363 BLAKE2B 4f799aefa417f6e2c04c0c3760c4d15b10b863f528e5051cfe90ea5a8ccb4c3f83fb592bbf510a351c02dc42a2a2a42f9fcb33b65a5e2dd997feeb5ea22f5342 SHA512 0cf6e718daf6b7db981aa607036e57eddb2ae18665393b0a691d8fd6978278ca077ae45a205eae93b6107b83d5d219702018f1afcda84ae7b83a7b6d68a68cba
+DIST xcpc-0.37.0.tar.gz 1094259 BLAKE2B 670de05f53d05d375c9cb252e672f8fa9027419302b521b88dc1904ec99571fa95b390bfdc5eea3eb2355730c02a955c10cbc2f29d7e4c52506173e8f5d6c540 SHA512 8579711595ac5234c1c8a6e9d0279950c97966a2a8919d4f0ba404c5bd5609f299ab0b5131d6973f5decfc12bff184facf3009522bef568a108b5cfb7e74be11
diff --git a/app-emulation/xcpc/xcpc-0.35.0-r1.ebuild b/app-emulation/xcpc/xcpc-0.35.0-r1.ebuild
deleted file mode 100644
index c70f06d7fd56..000000000000
--- a/app-emulation/xcpc/xcpc-0.35.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="XCPC is a portable Amstrad CPC 464/664/6128 emulator written in C."
-HOMEPAGE="http://www.xcpc-emulator.net/doku.php/index"
-SRC_URI="https://bitbucket.org/ponceto/xcpc/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- app-arch/bzip2
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/motif"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --disable-athena \
- --enable-motif2
-}
diff --git a/app-emulation/xcpc/xcpc-0.36.0.ebuild b/app-emulation/xcpc/xcpc-0.37.0.ebuild
similarity index 100%
rename from app-emulation/xcpc/xcpc-0.36.0.ebuild
rename to app-emulation/xcpc/xcpc-0.37.0.ebuild
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 33b19139ad48..4772d7798059 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 16ffef75303c..d69966cf9ded 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-m17n-1.4.3.tar.gz 489392 BLAKE2B bd37fb1f7160d4306be008e4f27fc5852db54318e6075f0887294f7ce30406ff697f41c5cc56734cffa4605b37f28cb89b3eb04a942e6acf352be50a273bd71f SHA512 8b42bcac8662b4924f54b6fe56427b32603746a3d1b0dfafb6dfec1296ec52847119f94fabb0a276f9de5918414fdf5f7b5aceaaabd8c01632cfd677344598ab
DIST ibus-m17n-1.4.4.tar.gz 490328 BLAKE2B e7b5c417d4cc16cea736dfadc504137218397ed1ce6318dc6edc48ec33b13051b43d2f7926a959aafe79025c2af1a35374a7dcb4cb4fee952df85b25b604d07a SHA512 df8be7ceaa2183ffb377e39f52b271f18825a8970f88972d0a43ed1fa2721d36bf564a20f89311541ffe19546441322fc568c4819e42e41bdff45ee137d6de80
+DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
index c8aebffadc30..79d7891abe84 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk gtk2 nls"
REQUIRED_USE="gtk2? ( gtk )"
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
similarity index 97%
rename from app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
rename to app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
index 79d7891abe84..c8aebffadc30 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk gtk2 nls"
REQUIRED_USE="gtk2? ( gtk )"
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
new file mode 100644
index 000000000000..5ed1447359d6
--- /dev/null
+++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
@@ -0,0 +1,24 @@
+https://github.com/rime/librime/issues/462
+https://github.com/rime/librime/pull/463
+https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
+
+--- /src/rime/gear/script_translator.cc
++++ /src/rime/gear/script_translator.cc
+@@ -8,6 +8,7 @@
+ //
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- /src/rime/gear/table_translator.cc
++++ /src/rime/gear/table_translator.cc
+@@ -6,6 +6,7 @@
+ //
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/app-i18n/librime/librime-1.6.0.ebuild b/app-i18n/librime/librime-1.6.0.ebuild
index eef1faa5bd5f..c3c438bc80de 100644
--- a/app-i18n/librime/librime-1.6.0.ebuild
+++ b/app-i18n/librime/librime-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
DOCS=(CHANGELOG.md README.md)
src_prepare() {
+ eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
eapply "${FILESDIR}/${PN}-1.6.0-plugins.patch"
# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
diff --git a/app-i18n/librime/librime-1.6.1.ebuild b/app-i18n/librime/librime-1.6.1.ebuild
index 91cdfdf161d4..e1a0804e63a9 100644
--- a/app-i18n/librime/librime-1.6.1.ebuild
+++ b/app-i18n/librime/librime-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
DOCS=(CHANGELOG.md README.md)
src_prepare() {
+ eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
eapply "${FILESDIR}/${PN}-1.6.1-plugins.patch"
# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3.ebuild
index 03e55e308b4c..44310ba275b7 100644
--- a/app-i18n/librime/librime-1.7.3.ebuild
+++ b/app-i18n/librime/librime-1.7.3.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
DOCS=(CHANGELOG.md README.md)
src_prepare() {
+ eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch"
+
# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die
rm -r thirdparty || die
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 08cb26b86c7d..2cb8071882f8 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/mc/mc-4.8.26-r1.ebuild b/app-misc/mc/mc-4.8.26-r1.ebuild
deleted file mode 100644
index 721b003c6c97..000000000000
--- a/app-misc/mc/mc-4.8.26-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- samba? ( net-fs/samba )
- sftp? ( net-libs/libssh2 )
- slang? ( >=sys-libs/slang-2 )
- !slang? ( sys-libs/ncurses:0=[unicode?] )
- spell? ( app-text/aspell )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-PATCHES=("${FILESDIR}"/${P}-shadow-crash.patch)
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if use slang && use unicode ; then
- ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
- fi
-}
-
-src_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --enable-charset
- --enable-vfs
- --with-homedir=$(usex xdg 'XDG' '.mc')
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
- $(use_enable kernel_linux vfs-undelfs)
- # Today mclib does not expose any headers and is linked to
- # single 'mc' binary. Thus there is no advantage of having
- # a library. Let's avoid shared library altogether
- # as it also conflicts with sci-libs/mc: bug #685938
- --disable-mclib
- $(use_enable nls)
- $(use_enable samba vfs-smb)
- $(use_enable sftp vfs-sftp)
- $(use_enable spell aspell)
- $(use_enable test tests)
- $(use_with gpm gpm-mouse)
- $(use_with X x)
- $(use_with edit internal-edit)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # CK_FORK=no to avoid using fork() in check library
- # as mc mocks fork() itself: bug #644462.
- #
- # VERBOSE=1 to make test failures contain detailed
- # information.
- CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS README NEWS
-
- # fix bug #334383
- if use kernel_linux && [[ ${EUID} == 0 ]] ; then
- fowners root:tty /usr/libexec/mc/cons.saver
- fperms g+s /usr/libexec/mc/cons.saver
- fi
-
- if ! use xdg ; then
- sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
- -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1b46b2f5bfdf..ac6bf69fa542 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 72ca8b2dac0d..eeaba8c3f207 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1,2 @@
-DIST nattka-0.2.11.1.tar.gz 94986 BLAKE2B fa80b514913e1752c2bb581b7d7f2dc1f9e2b7ffdf7672a61fdd2cf49ff5677cd1842949885beb9f9fd7228aa89e1e7b9091fcf77a4a7d3c71b372ba40c9edb3 SHA512 22fb3f3685fb454f768c754a2574efc4b40d1c3abaa4b8283e38a426d1f443f5328ca5c6eb2c06a7240166de36ee9e3af88623dc7ef3f14b99903177bde1cdc5
-DIST nattka-0.2.11.tar.gz 93992 BLAKE2B ad088de5f96ec5f7f8b0922420d22ef507e1e79ef3bc3161e6a88cd4714f1007a000ab06a7e21245b2792fd3056474459bf424da0560b8666c5cf46f04a2d763 SHA512 5d9de9f437a15e149ce58348f40f86101c10fe1f4c4ce869e7038ba25fc212c22e024a9999a6197179a0a1e1e82380356d304841c33333e04949caaadef96db7
DIST nattka-0.2.12.tar.gz 92954 BLAKE2B c4ffd44030da0224963d7fa367336d7ab9076b17f03292f5e65b7855823b34374b8d7626c4b97c155d10797f2d550f3c20cac39f68cfbfc4b8038406f37b21b0 SHA512 f1e775895d66505b09a3098525f998f87bb1561538f0e75b993b264f87f61937d7d5c71999018fe93c683366ef81dff5b7fef1e1d44af63153003f70d7933273
DIST nattka-0.2.13.tar.gz 93917 BLAKE2B 48e5245234d0ef0fd47353bac0d971d6187f59d94c0fb58f4cce160ee28f847a8fb32f8399af3148daaac299b32b590899de716dee1ee9cf107b1efe2451189f SHA512 0d3428cb3b5dee3fcdc29b9d22b5c05d626d26060fcd5518f789493fc68e51762edf9162a9b5b19c6c08fb9cb9c0e350faa41d96c53bd924b50475176140ccdb
diff --git a/app-portage/nattka/nattka-0.2.11.1.ebuild b/app-portage/nattka/nattka-0.2.11.1.ebuild
deleted file mode 100644
index 1e24d6847989..000000000000
--- a/app-portage/nattka/nattka-0.2.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="depgraph-order"
-RESTRICT="test"
-
-RDEPEND="
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-util/pkgcheck[${PYTHON_USEDEP}]
- dev-vcs/git
- sys-apps/pkgcore[${PYTHON_USEDEP}]
- depgraph-order? (
- dev-python/networkx[${PYTHON_USEDEP}]
- )"
-BDEPEND="
- test? (
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8b380894c5ca..cf516cb1e6b1 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 5d02f0bcaefc..e57289002e64 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,20 +1,32 @@
DIST fzf-0.25.0.tar.gz 176905 BLAKE2B fd0fa18643947428d8a7257f9aebf579e3d57fbc0216d4629ed77616d1729d2cc68514125b5de5b2e85b65b26d6c95e69942f076aa99aa27e57d4f9b778f8923 SHA512 73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3
DIST fzf-0.25.1.tar.gz 177955 BLAKE2B e5bb5e40ccdb36ba015196ba6e5abfff6b7c6f4b6ebc4c824d5e2c4e8107a08d49f03210732358bcbb56d1765448f8eecfe4a2e61405ebdd36984c3c54b7d818 SHA512 755046b4a8604fd3d1f2b66b967ad79cf5d4581dba1e40abed338c767d4421620df0f1f6a81a6c22c20da54dfdb1ff6847bad8f58ed83fc5e1928038c9d042f2
+DIST fzf-0.27.0.tar.gz 182950 BLAKE2B 07aecedddded92af879d0ffc3e15721834cc0b2942b19cb9471b25e60c802b43bcbbbb0cfebbd6e7ea647c0654228974097a04ef7ac2428c2b1307d586249f83 SHA512 7a14a85d962a409e5008a135acb3f18d489dbd615696e925d2854e6304e289f59f573bcb267d8447ca2112087099b7115143b85f11decaa893ac2196328109ed
DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod 250 BLAKE2B 46093e9211011e814962ba2eafec4392948f185d27a202a8b626e16299e3a3fa4554a604933ceab584b27cca2b7a6b1f51d4e5fe10d673e875e38eca08de64ec SHA512 412dee57c525bd5a3c0ce9c482e7933814758e36ebb226a16392e648f57e280485f86e30f17be2339eed427b52e4b0b601401503d0bd324c7fa874e2fcba2b60
DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip 226363 BLAKE2B e690c6673285d12ffbf0d3ee6ff39f0bb1d072c872767c709150ef34b8ea40f0c8adc8196388a704126596051c3e1b722aae96fa54ee2baccdbca4f7683316ba SHA512 5fdd7b7b3b2826de6142d2dc0e6b19372636c4442c8878925f8c2af8bdfd2eef3c0cdbe331d0889345eb1e5a1d8c04ac80b3e46be7203d2475df86e04819af80
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip 958042 BLAKE2B 62ba67a66c0b5e159d7b12c8e32aec36f6f442411951024fe0b95fddce22c0e00d1f855f987aa39eddcb59165da582d0ee17fbf410630b6bad8424c17b85c431 SHA512 89b52255dd45791100b58a693036c772d27b26011754caa15df2badc4a93038b70060c7358aa12e01494e2f24e94533cd4ea7f7cb78686e61540383d1680ba2f
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20977 BLAKE2B e9a9da9c1383fd4011c9d934467ce94b00b04cdfb58faa0a531fa4b71d956b45cc1e6b9afc9011a2dad60fadd3a0c1fce7eda5de1e6eeabd53cc9f541ed48029 SHA512 05a554dc62146f8251376ec07e521594941e6f7c0173fb0c0ca48e6d9e512a92a29e059acdce83a5a0af503c0391fee4bbab57d2e256efb44b1ac137bfae59c2
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.zip 7653 BLAKE2B 634fa4a231f31f291e49731e9a5e5d57aa289c86ec8c8fe879e6d03a28291dac034547b6bcc239539cf67f36d6e6e6990bd4e03a92621ecdf01ec899e1c03325 SHA512 075011dfc750263fdc03e80c69feaea71db12c9af8c99b49ebb35c494f5e3ac5a4faab3bdc1530322ea38ff3eb2671f0a3871097dea918f736f757e50cb05b4f
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip 8916 BLAKE2B 2d3735c7229348b12148a77ab7057473bb37db5667024f481d7ba309b90e92046416e17cc4ca8db0b903eac6311716c01052c9959ca2f884ce4f9bead6a21575 SHA512 54ac2b14cc0b8cd161d6514f9ee877aaa0035edf09c883680595e49e4b572f5cf5db1f88ef5a192a32c6f14cd8e049ebd73097e7866e199a289ce4ffe2934f54
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.1.mod 104 BLAKE2B dd83516b0472a51d68d638c72db945b5640bae9fb4a81687b7c406f7bb67eb086161b99fd7f69ff13476b352c90ced4906b7a30db52a6adfbb3c862a1185a37d SHA512 21f6fea86dafb4b32ef61014700a7563e6c273fa8c23c6ce0a8776408511a8b4ab2d3391e21628054be2a94062f72aa7e9cc2f133b7ba1b2b10a758dce783d43
DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.1.zip 16956 BLAKE2B e948f2d90376ac6a14e890d4e39b035e0cfa00eec384977126adcad7e8064e6d1da57b709ac1943b67a7d94b9aca71b276effdcce1866dfa026fb5c984a6d806 SHA512 05597cd8812d21477152a021a982405d18e65884ca5658bca43bc4c933eccdc9450ec9d57a3dc6a39da72a7a7a821f5c953cbd2b35c6e04f1d757df1cb0be453
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.mod 104 BLAKE2B dd83516b0472a51d68d638c72db945b5640bae9fb4a81687b7c406f7bb67eb086161b99fd7f69ff13476b352c90ced4906b7a30db52a6adfbb3c862a1185a37d SHA512 21f6fea86dafb4b32ef61014700a7563e6c273fa8c23c6ce0a8776408511a8b4ab2d3391e21628054be2a94062f72aa7e9cc2f133b7ba1b2b10a758dce783d43
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.zip 17973 BLAKE2B 841f2a011bcda5fe793802c7caf80b8811cc871060259b126707647220ad12b13fb2548e2a094255fac635b4ac42dd67141fd5606a59c957e716a7c41d25c975 SHA512 805094a1745b2c20d9c6265e84f92ee9fa05a46fd93408d10e62c855985a7f2838ff9fffed61e705875eb0c49530fe9b21c7586ccba01a4b53c8f4dffba3b228
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -23,6 +35,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip 28627 BLAKE2B 616de462c5c7d1ad7d5b792caf2e3c9d45c5095d723dace2038e012672055b6c052a043414db7b87b26f43c1688d8c353fc63b666ebd9569f832fc08f7ac99ca SHA512 eda82aa21a23db9ccdf960f6fb0583223839623643525410764e5684d8551e725c3bf76fcf68a4b4ef1d1fb48505d248b9600c736e0e9497d9efd4bfe5bd059e
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -30,8 +44,15 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.zip 1496749 BLAKE2B 6f665574261f31847b1fafb76bf05483808610124bdf9bb22b976b93ef0d722a8cfd4892f48320ee0e7404b0876f65c37d945ce4466547d692d6fc00f4802c63 SHA512 604c6790250b7d05360cbd341cde88fc5c2a499bae119d51de5b073df0704089abd3b1536c5ef7008db7a5ef6dd8512824e77553ee8216134a2daa6cacb357c2
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.zip 1668376 BLAKE2B 1011c91fa59172406554b0d169e83b2d82121f5902f7d29f444a7df4cf1d5545595fcb9e150fed96478dc9328608af540fae5baf5bde49d3f3e09b258d3a3745 SHA512 77c0219da635612968016f4f7e95c0e5394384f736eeb457e359ddebb95a0079c07be7c106a2364b89bfe8064583024eba675fda5c9b3d0da9f67973ce9036c1
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip 23415 BLAKE2B 7b67ba682ce566564d78910a6854418708f329ee424c922ad8c8082df64a4ac3f643647fe235e64340f91364005d361c398c19c546faba0db070ab4da7b52a05 SHA512 390acf2a26428b88b213f16d28860c00f2255ee49a1d516e044c5ce51cbcb01545d10dd5868dba88c7aee5381ec07c68fb62a9e391eacf1a26ea4c318356175d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
diff --git a/app-shells/fzf/fzf-0.27.0.ebuild b/app-shells/fzf/fzf-0.27.0.ebuild
new file mode 100644
index 000000000000..98fa87fdb665
--- /dev/null
+++ b/app-shells/fzf/fzf-0.27.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+# For fancy versioning only. Bump on the next release!
+MY_GIT_REV=6654239
+
+EGO_SUM=(
+ "github.com/gdamore/encoding v1.0.0"
+ "github.com/gdamore/encoding v1.0.0/go.mod"
+ "github.com/gdamore/tcell v1.4.0"
+ "github.com/gdamore/tcell v1.4.0/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.2.0"
+ "github.com/lucasb-eyer/go-colorful v1.2.0/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-runewidth v0.0.7/go.mod"
+ "github.com/mattn/go-runewidth v0.0.12"
+ "github.com/mattn/go-runewidth v0.0.12/go.mod"
+ "github.com/mattn/go-shellwords v1.0.11"
+ "github.com/mattn/go-shellwords v1.0.11/go.mod"
+ "github.com/rivo/uniseg v0.1.0/go.mod"
+ "github.com/rivo/uniseg v0.2.0"
+ "github.com/rivo/uniseg v0.2.0/go.mod"
+ "github.com/saracen/walker v0.1.2"
+ "github.com/saracen/walker v0.1.2/go.mod"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+ "golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+ "golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+ "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+ "golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57"
+ "golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+ "golang.org/x/term v0.0.0-20210317153231-de623e64d2a6"
+ "golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.6"
+ "golang.org/x/text v0.3.6/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+)
+
+go-module_set_globals
+
+SRC_URI="
+ https://github.com/junegunn/fzf/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}
+"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+ emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+
+src_install() {
+ dobin bin/${PN}
+ doman man/man1/${PN}.1
+
+ dobin bin/${PN}-tmux
+ doman man/man1/${PN}-tmux.1
+
+ insinto /usr/share/vim/vimfiles/plugin
+ doins plugin/${PN}.vim
+
+ insinto /usr/share/nvim/runtime/plugin
+ doins plugin/${PN}.vim
+
+ newbashcomp shell/completion.bash ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ newins shell/completion.zsh _${PN}
+
+ insinto /usr/share/fzf
+ doins shell/key-bindings.bash
+ doins shell/key-bindings.fish
+ doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "To add fzf support to your shell, make sure to use the right file"
+ elog "from /usr/share/fzf."
+ elog
+ elog "For bash, add the following line to ~/.bashrc:"
+ elog
+ elog " # source /usr/share/bash-completion/completions/fzf"
+ elog " # source /usr/share/fzf/key-bindings.bash"
+ elog
+ elog "Plugins for Vim and Neovim are installed to respective directories"
+ elog "and will work out of the box."
+ elog
+ elog "For fzf support in tmux see fzf-tmux(1)."
+ fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 06272394e194..08158a98ce07 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ce0d529a8ccb..3d37cc7279db 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,2 @@
DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
-DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa
-DIST poppler-21.04.0.tar.xz 1694132 BLAKE2B 759a22b175ca8b64fa666d61e394cb7b6baa34a3dbc9c6cceb24c7ad4b0892ee34faea90278d9889d72d7b9558fc9abf52ab74fd739dc12e7314c3a755661350 SHA512 c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc
DIST poppler-21.05.0.tar.xz 1700632 BLAKE2B 5e277f3d9d6fafbd39b395d7730182ec028c0ccdbb59e0b9d6ea93e079eb6dc8ff6e46a2b378ec4502055e8748973d353e1f947d734cdee4c5abb9f1bb6dba2c SHA512 428f63a85fc8a227efebcd64ca7e89fec487fea07c93f9dd990fae343532547bcfec29a3288dd9ffce698cf994ccc2ce5055e4fa677ebceb216c1caaa3e0cdae
diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
deleted file mode 100644
index a412059ff2a5..000000000000
--- a/app-text/poppler/poppler-21.03.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/108" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- -DENABLE_QT6=OFF
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-21.04.0.ebuild b/app-text/poppler/poppler-21.04.0.ebuild
deleted file mode 100644
index e3bf1e313d86..000000000000
--- a/app-text/poppler/poppler-21.04.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/109" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- -DENABLE_QT6=OFF
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
index 8144742131d2..9b22c77ad53e 100644
--- a/app-text/qpdf/qpdf-10.3.1.ebuild
+++ b/app-text/qpdf/qpdf-10.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 Artistic-2 )"
# subslot = libqpdf soname version
SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="doc examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7f759b80eca6..68da59f47455 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index a412a3a8629e..57ca74816038 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,4 +1,2 @@
DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
-DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-DIST eigen-3.3.8.tar.gz 2141903 BLAKE2B c33e699ba08338e7b9b215c9466e161229164ed3c466ce3d760c6917749af33c0414c3bc4bbdd216e3466e69ece8a38ca8beb78b7e0f1609894df6bb4a7fcca3 SHA512 5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355
DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
deleted file mode 100644
index 1f3bb7907f70..000000000000
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-inherit cmake-utils cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
- cuda? ( dev-util/nvidia-cuda-toolkit )
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? (
- dev-libs/gmp:0
- dev-libs/mpfr:0
- media-libs/freeglut
- media-libs/glew
- sci-libs/adolc[sparse]
- sci-libs/cholmod
- sci-libs/fftw:3.0
- sci-libs/pastix
- sci-libs/umfpack
- sci-libs/scotch
- sci-libs/spqr
- sci-libs/superlu
- virtual/opengl
- virtual/pkgconfig
- )
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-src_unpack() {
- default
- mv ${PN}* ${P} || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e 's:-g2::g' \
- -i cmake/EigenConfigureTesting.cmake || die
-
- sed -e "/add_subdirectory(demos/d" \
- -i CMakeLists.txt || die
-
- if ! use test; then
- sed -e "/add_subdirectory(test/d" \
- -i CMakeLists.txt || die
-
- sed -e "/add_subdirectory(blas/d" \
- -e "/add_subdirectory(lapack/d" \
- -i CMakeLists.txt || die
- fi
- sed -e "/Unknown build type/d" \
- -i CMakeLists.txt || die
-
- use cuda && cuda_src_prepare
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
- local mycmakeargs=(
- -DEIGEN_TEST_NOQT=ON
- -DEIGEN_TEST_ALTIVEC="$(usex cpu_flags_ppc_altivec)"
- -DEIGEN_TEST_CXX11="$(usex c++11)"
- -DEIGEN_TEST_CUDA="$(usex cuda)"
- -DEIGEN_TEST_OPENMP="$(usex openmp)"
- -DEIGEN_TEST_NEON64="$(usex cpu_flags_arm_neon)"
- -DEIGEN_TEST_VSX="$(usex cpu_flags_ppc_vsx)"
- )
- cmake-utils_src_configure
- cmake-utils_src_compile blas
- cmake-utils_src_compile buildtests
- cmake-utils_src_test
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- cmake-utils_src_install
-
- # Debian installs it and some projects started using it.
- insinto /usr/share/cmake/Modules/
- doins "${S}/cmake/FindEigen3.cmake"
-}
diff --git a/dev-cpp/eigen/eigen-3.3.8-r1.ebuild b/dev-cpp/eigen/eigen-3.3.8-r1.ebuild
deleted file mode 100644
index bddd6bddf843..000000000000
--- a/dev-cpp/eigen/eigen-3.3.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( virtual/pkgconfig )
-"
-DEPEND="
- cuda? ( dev-util/nvidia-cuda-toolkit )
- test? (
- dev-libs/gmp:0
- dev-libs/mpfr:0
- media-libs/freeglut
- media-libs/glew
- sci-libs/adolc[sparse]
- sci-libs/cholmod
- sci-libs/fftw:3.0
- sci-libs/pastix
- sci-libs/scotch
- sci-libs/spqr
- sci-libs/superlu
- sci-libs/umfpack
- virtual/opengl
- )
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
- "${FILESDIR}"/${P}-no-error-counting-in-openmp-parallelize_gemm.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- cmake_comment_add_subdirectory demos
-
- if ! use test; then
- sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
- -i CMakeLists.txt || die
- fi
-
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
- )
- use test && mycmakeargs+=(
- -DEIGEN_TEST_CXX11=ON
- -DEIGEN_TEST_NOQT=ON
- -DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DEIGEN_TEST_CUDA=$(usex cuda)
- -DEIGEN_TEST_OPENMP=$(usex openmp)
- -DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
- -DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
- if use test; then
- cmake_src_compile blas
- cmake_src_compile buildtests
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- cmake_src_install
-}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index f955d9ffca0a..2a269f7122ee 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -17,7 +17,6 @@
providing optimal speed with GCC.
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4dfc6b6f1bc6..7bef35437c48 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ce8e183a0fd5..ec337117ac4f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,3 @@
-DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
DIST mariadb-10.2.32-patches-03.tar.xz 6048 BLAKE2B a6f8f25ec23d1d86d228d719927daa9131779239917b86eab9f82086744294c0a4f03b1a73a3baa599e367775457d6c345fa0820b89063b2e6379c0fb7076ad0 SHA512 324804f13f59593d26cc5fd8c1cdeac2f16cf55012ca65b0a7223512920e1ea94619991fdcb3d19184b6428e4a627fec75532c88ae8297f9b8398fcf730058a9
DIST mariadb-10.2.32.tar.gz 73646729 BLAKE2B 581906d67f0aada9e85aec7bfee03ed8927a4e836f0639fa5f31576f5df70ce2b6ed3da0b96ad616f5ed71d7717531a073cb911c6d92274f6724911e086104af SHA512 824aa94724b639337a5b4c2e86a1f5ceaeaa940eb234f852df1ba0aafd64e269335e2aca0b05d52164e090cfd6f7d14477df9e096473aa5d9286d47944a765b4
DIST mariadb-10.2.33-patches-01.tar.xz 6024 BLAKE2B cb4283a36b303b1422d53c454bc6390ce80f3a88c9f9cd459468cf9bff792a1af197a5e5b3f7e45376024ef78bc6049cecafd8654e1b767f741f35129624ab12 SHA512 ebe9c1295089c04e869516f3ef278673986c1227b92bb9cd96cc561b0392f22870200cf58db91fdfe7e113b04b5b6d66c904b2d1353011cbd89723a8ce83fec2
@@ -9,16 +8,14 @@ DIST mariadb-10.2.36-patches-01.tar.xz 6032 BLAKE2B d1ca7e8469e0f0b8a14d5f993894
DIST mariadb-10.2.36.tar.gz 73892597 BLAKE2B 610fea30b944e46483f4a9630f8af22afcbcc8b461ce2b13e28b3376271dce8436df9bd771f048fb8af5e0ef9e5e3986be02af742937504e71413710e4f6462d SHA512 0f1ced570a79036fafd318ceaae06de71cfc748b0c99d31487a00f7fcebed993ef7e05614e866f48b1811660a7a4ad7c36d6bb0133bdb0228cc017199f182406
DIST mariadb-10.2.37-patches-03.tar.xz 6404 BLAKE2B c814ae967beac459810d1ecf4b5b21da99241e571c9c42fadeef0a27a1928459bb7d2a79461693fb6dd8821302891e459c3848f65738cda61f27bc8e174657e9 SHA512 b2b002ca1b390b251a0b6bce3dd996cc6aa0da4a9787d747c4ae276237e5c67ada7fc79a1acef9e3469232d5903ac8d1dcc30540e29974899c4128239a1569ba
DIST mariadb-10.2.37.tar.gz 74041747 BLAKE2B 81ed5ada9f27c7dadf2daa88c52e1e40c834e8f243eb416a4a1e486d7e756d2bcb86f545b013fb1bb83987eef19239b2e8c3312a50be10eb13fee1a9c824095f SHA512 e4214d5f013917fff2606aa0b827373c228c06ba72ceaddee01459105ba08316f360ad930bd36e71bcc98d371162a0894560a7a36d2b242629cc970798660854
-DIST mariadb-10.3.23-patches-03.tar.xz 5520 BLAKE2B 30bc247ed6d97aefaa1ed48f379fc9aab3df3409aa9a108728313c7c69ab0641b69ccb0289eda9539df367f85b2db494473d3836807dfbf60df1e0c832e57369 SHA512 64bff196d1651348d303571fd551a5666d9514c1ee17cd9296b9d420c4b3d7d9b339644a1cad029bae3c35a666b405d471a37846138f2551f3b1b88d99b80844
-DIST mariadb-10.3.23.tar.gz 72582611 BLAKE2B 493605519f714cbe87b938f6ca3243d29189adbfcbb33c4e10a4a3f01b08d875f18b96b647dc92566b785c2cef9862ebacfd55954d13ab0a7a745606e40fb6e9 SHA512 535cd2ce80a95b6c0a1aa559cc3275dfcd559c3a4f958fab3382923190a16e6bc5b4ad79acaa518244512ff618568c239c0edef8a701d958362ede19a29c2986
-DIST mariadb-10.3.24-patches-01.tar.xz 5508 BLAKE2B c3b75205ecec0b73c85696a3382dd9271d495389f05d1bff66548f5f316f6d5f2ee7204020f265a6dd7ee7c28e1a010d74b056b9c9ab244651ba417e496fb1a9 SHA512 d9d408e6ba08a8a321b9a6e72a6347c4317652e91ade0056ff8621dafbbaf398e33d6b15247e89a2d60b731021d30cba9611356ced2cf848d1807cb3d376c378
-DIST mariadb-10.3.25.tar.gz 72710424 BLAKE2B 95029946e2ed04368beadf33b42121c612fa9d146e648fd584078e4df88e3c93f6373e1e996817644e06f3b2713a257e3079167434e9227db01dc1a2ad08aad0 SHA512 9504e401db3b65b2b2bd4d3c91a468d357e82fdafbf90d54539a291e46570c2bed66ae047b17b9da95e925f8970fa048d329ba06c2dd6de7d46d5a0f2aad1f4d
-DIST mariadb-10.3.26-patches-01.tar.xz 6720 BLAKE2B 5c7ae688e628bc5831bf4c1680bddbfda8aae33a033444a2a2cc27a920804570c669834779342db21fff1c1c4da3efc689bf5e7b1ee3b058dbac02a68695ab01 SHA512 e906fdb75c6b0baa495c10ffdc2ed4d28851193f123d70b2f8c1f4b0171f1c2cc75c54bad5f511892e542cbc75bad6b01a0e83577094aababcb69145cd9a537b
-DIST mariadb-10.3.26.tar.gz 72867143 BLAKE2B 5ab012e014e855bc5dab9bc5060bdf179fbe0fc67e564e25bb1059a0f19d5c90fa8fb6ccb9482eff6babe602eaf7b6c768eaa0ecb53bfed5ad6db9eb4e18e97c SHA512 28c593b26dcfd2208105ace87e85e86b37511821bc5f1fa65c7bfa5732d386e0b68af3b83a8259feb9af878e29d61f1da5c45b50c8e2f57a22e4001652c61140
+DIST mariadb-10.2.38-patches-01.tar.xz 5796 BLAKE2B 51a574eab28c16394e3e953654d31f9d6fe88f55292ccaea35b0463d122a749ed52cb8d5e19f14b0d630bf22381ee0bddcf1e1b80c1445a82b931dd9461339ac SHA512 48fcfdb685bac516ee3388fc05adce5b53bbb42bee7b3681a887c76c63cb71b671d4089721a9b16f281496be9e9a87a556d44e4a6834c96345c6ada900dc9fe8
+DIST mariadb-10.2.38.tar.gz 74250852 BLAKE2B 5d75a38d7d892d93c5971713a4ab47c2803c03934ba301ea239b0a7565692272339ca0c3360a7bd533adcfef1af392c906b8f0136c18a25f5a1dd6127c8a6902 SHA512 4918a04877e16a0d33baca61b7c207b21b646df3be5e9ac125cb65404c0c6d6706b054106f437acfeef402238b35018a3cd764ceb31144a98791137c44e273a9
DIST mariadb-10.3.27-patches-01.tar.xz 5516 BLAKE2B e78cc8514a3597b6ab38f00142a82c81e7482f1fd9afbcfd6f10ee92803a131f483f32361aebf288f9912e58140caeee1c536086e3f733c3a8dfe9c5afc5a590 SHA512 d1744bd83e099b67faa3c5385803c4eac58200c1a2ca30b5723e401c72e434d752be26c80da3b036431024c6a7d1ee889bde34a3143a43a9851984697d43e362
DIST mariadb-10.3.27.tar.gz 72870472 BLAKE2B 46d203ba018ba00ffee2e5e9bec7f0a9a4d27f0aa30b26651215c7b3fca803dae1080d075bb4938a403c1f78a46ec4fec4bd59736c0eb9a0b84763445efe097b SHA512 96507307cf95d319898e23cb46a5f46937907592e421eb4a4373f47ca54291623010d18414e58bdba88a78255b1996984b14b41fb8f32e3593a3b02ed852aac5
DIST mariadb-10.3.28-patches-03.tar.xz 5896 BLAKE2B bd9d7c3b32f17e0ce8c2149e5c2981dbb09647d56295eb9a2585a2c79f7e3aef46267e55a30a3440e57b1dbebe98a5a72d08aacb9a4b2fc3f30bb1f83d3b38c3 SHA512 0f8e8f9a50bbcb037bd22116ec826d01b15937f934d91fee11a37da0d4f91944762bfe3560c8edc4e5b9cdd9443fcce9b0e02373c4bfd97ed8570ff944d0b803
DIST mariadb-10.3.28.tar.gz 73040177 BLAKE2B 4fff746e7c04b239055c8528bcfd31e4911e6daae3427dc8a6e2e0e21c2888d2145b5383c6b0876b307949f122c2645d42fc7efaeec594bae1f02aff4037e676 SHA512 f6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20
+DIST mariadb-10.3.29-patches-01.tar.xz 5280 BLAKE2B 262c8f89508d915a13c3c309c885af68ff044ba28b4c3d631a5be90b709c882fa3cf521380c9d2a2f7695477d7bcd364ccb98d90750e524deb0aa0daddb94bde SHA512 95d04edf54b722ed7022bd2b915d722ae4153eb2c12a3d6c499469be0de4d03582226ef525be9e9af265674ef31ce2376442a09c583222c64ad9994ddc51c8b7
+DIST mariadb-10.3.29.tar.gz 73261682 BLAKE2B 81ac5c7d1ad343c7d1c6788dafe07c45ec096d975a3197c6a6940da60a4a73383dff18e15d1940f1248dc34f290603629e95fbeca31c0749c5b0ae2b3de92b8f SHA512 fe868cde5ac3536ff5bbf34f235253c79e897e61bb34f7fdaca8fa8fcdb83e4a19c615beab27d3fdb5daee64ac0c8f36ec7e8089a9422c8540f7e92b1999a769
DIST mariadb-10.4.13-patches-03.tar.xz 5520 BLAKE2B 949b7f6ee5a9a6077424264e53d2b7af8ceb56cb38b204800e1c3ec93fc929d57b201e075f8ed735364b5421a3b922ba45fc94ba006f1e6d94494efa17b521ef SHA512 042c3ca8a75ebbb1c2baa508603d4248a178f87b7126b439ef6894eaab979f01c47cd8fbea3c106cce2a951e9308c76e72b4e444dcbee09a991cb524f2b9fac8
DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566
DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B f32e1d383ffd99de431bc34c36101c71c5e631344527e96b80ca6bd0a68015b45a4c33d6f0518cb4aa2bcfd493b64b6607671450ca045243404c0d65ebbc66fd SHA512 201fe82cbcca705dba52b32405d463b5569d97a5ffd9fd2967ec7fc3c3ff305011b3d2c3c0e9f7c19aaac57b26661bd361f3b6da6f3812f25934ec18856c7051
@@ -29,12 +26,9 @@ DIST mariadb-10.4.17-patches-01.tar.xz 5524 BLAKE2B a9424a8cd68a5106087e24f08a3c
DIST mariadb-10.4.17.tar.gz 80986181 BLAKE2B 68dc7e0a7a809d1d26c75351e2f934f07a7c2e73651a8253db658d8d93375545a97f50650f0ea92387b4f5e13aabe6de8567d22fb0434d40058a392a58ad9ee4 SHA512 51bbdbae9ba48e3e7b0b614a5e19a0549979b727797e2742a130c6bed23d06eea6d18da63759a3f5f3ba751bcaaef4cdbf6a3456f4d23ff9149b3b0ea07e7079
DIST mariadb-10.4.18-patches-03.tar.xz 5896 BLAKE2B e7d16fb0177a468b190ed0a3fd1c9e1bac369e0ddff034a999351af1a1020271013dd6dec52013aa7055c4b4177436ca3f5ebcca06d14355be88f55f0bd875f3 SHA512 2b6acff0ad88d4bca3dfa4703c651de6f7c94cf209f5c00d03d5cc4bac220490e7ec7ccd257bdc19617847074d372f24b2804aa6d37fd24f1c4acf40315890f9
DIST mariadb-10.4.18.tar.gz 81733656 BLAKE2B 6eb0a9bff586dab3efc4edb4e9d1a7e2f5ceb1341de08ffc4d63787a83b8eece18b96fcfae48e68262350e71dd28e2e4d328746fadcb006cd9d5e1bfb63187a3 SHA512 085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12
-DIST mariadb-10.5.5-patches-02.tar.xz 6060 BLAKE2B 185a2016836721f76c19228ca39c1c7610c34210e23b42f254e4c4fde34c74d9c77bb0d1a441175c14938ecafea3e9575fa3b7349db826aef63e7d7e7a21901a SHA512 8a26bdbec19d45739ef7accd3cea999bde465714141532d999500df2ebd93bb98a00b8b86b1e855ea4f0cba6984b21ff09beee75372f840282a91f5dc95db432
-DIST mariadb-10.5.6.tar.gz 86884252 BLAKE2B b0230acf43d54e976c4e757139dbaa2bb6ed992b0d056728142fc7fa41bd62539be22eae5aac614ea49acf220646ee57ecc67ff1373c6aa142434e6743a4d174 SHA512 c62bd6278d389baf179962bc6f617693cf3ba748382e96963b1ef5bbee8d1c9f0964025cf00fb7ff5de088a79362b65657ed30a8adbb61fe524bfd0d8d753421
-DIST mariadb-10.5.7-patches-02.tar.xz 8992 BLAKE2B ec9acc1f09ac08319c5ad7e952e7521d722bf1c4deba15c3f2cfd72b89eea6c724b00c83be1b28e6261aadc94abcdffde8e978e4f13910367f4ccf56a3d02f45 SHA512 2adc499fbcf6fc895a5cf8643ca86866ab29d216cbdd62f55c1b0e66939e222fac310fb6a34f39cc76142b404febdb592e21be75aa3d16fab6c2bc7e725c44a1
-DIST mariadb-10.5.7.tar.gz 88214625 BLAKE2B 8ec53b4b98565d99a707899fd6adfdc5bffbf722528e0042ab16b5e186d32229a386881f2781a0ce435585f338b48dc66459bef9d8921fadc00a3d770b62bf5c SHA512 d964c61d6ba7cf21fea97b8e0b6a0bf1ee50fc7a7995753dafd710f4656001bd6e03c243896efb5802cce16dd6470849ed036d09b17415a538e008f64e974a9f
-DIST mariadb-10.5.8-patches-01.tar.xz 6212 BLAKE2B 7e4358d02d25edc51f5926a75646052ccf07fe2b5cab1901a133b27764793c94ca2a6c4d4b90b5d911b25a6d86f1cb7d2659edbcdab52c445fd6959ea080275d SHA512 f7a5d948c6d7d97896538b7df0de60c8e7969dd15b4ff406e8955a282e69fb7f19fe91424afc332029ac2a36c52781617bbf1c5f6d57dd3bfc21d3ea20ff4c5a
-DIST mariadb-10.5.8.tar.gz 88206163 BLAKE2B eaaddaf240102428a23602655920bdf543d25cf85e669b1b07bedba5119a5e0f4498e999db39031dcff168ac810ed0b28f5fa9ac995b3634b84b99b753b4636c SHA512 9801a68440a3502b49655e34dcbfd09734f4a4f1ba8621ed9b895e194cea461a8c69fb0ff66488d5defd3065b43f73e5083a60142e11cc7e4a442f86769b06e5
+DIST mariadb-10.4.19-patches-01.tar.xz 5288 BLAKE2B b97a8b2c55ad2b78b4f27dbab3893c777e15ef237fc66a9ef62d391772caaada3e23949a63ae170aa72e4b07f9bf34f32da72614756bdbe0712efe6c39f0da59 SHA512 e26b12230b965fe0facfd447a815a88fe8edaaeb8e209cc53df2d76c580dacdab59afb09c09ef471fb0b46c0cde8eeed84f3eff851751316eb12f06de235d52f
+DIST mariadb-10.4.19.tar.gz 82042449 BLAKE2B 6137c84852b6b770efa908b49f03ca52726a537bda410b324ed388a82667bf0e3ff37cbb62d6a541ca39ce4841efa861553c7cead11030dc9deacdeb7cdb0d5f SHA512 837bd4e46e2033d0e996c33125c50b98e141e4c31cf4753a4bd1a7bd1e6a25ebe2a0ea7c8061d29f3c635e24d8e4bf2bbca62ea3b0089bde6576c39ffc6f5e28
+DIST mariadb-10.5.10-patches-01.tar.xz 5944 BLAKE2B ce374e58b7730d45a8dbca4cccd459c1660182d6aed4ac54f06139e28ec254d4993b2135b2774e08eee740099803398a25b28ce9d227702bffab1867f1725fc2 SHA512 9d41b7796c5e43d037e75eb8d6c9b570a9b3d72166f832d3d0831646b2ec8c838fe94eb8eab8c6e427e96640287d58f7eca2c653a3c503bf01240c9f7c60a8c5
+DIST mariadb-10.5.10.tar.gz 99019617 BLAKE2B 85b5c43ae9eeb1dbf9ff7935d4cf4bddbd18cadeffb79a3bff172b4522e196c7ac8916c63a6750d0b3b910c6f0f933213b3b4f6c7bf0d43bbb07714ed9337750 SHA512 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd
DIST mariadb-10.5.9-patches-05.tar.xz 17120 BLAKE2B a6ea7c3ba3718e9667510db9fdfcedb3fa4a6a2da89f1c49f9a419c84191af9bf6148815afa836e31f47d752cafdaefdd98b530c29c849fa86af4ff0be9732ea SHA512 e39393505d5c5d45b3352d15b9e10a02a1057d5eb381335953c5dfca312791976be9e0e3b2adb6536a2f5cc6f00f01b9379a17806a029a9b73eb674a2a1fb583
DIST mariadb-10.5.9.tar.gz 88639930 BLAKE2B 512c3fb0541bbeb19878979104f7858ce18ce67187507c8395798cfc9ffe92bd83e39bd47251419363600348a85716406286bd27b3c28662ea63e8ec761a4e01 SHA512 d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e
-DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
deleted file mode 100644
index 9da7717b745d..000000000000
--- a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
+++ /dev/null
@@ -1,975 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190305-2052Z"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
- java-pkg-opt-2 user cmake-utils
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
- SRC_URI="${SRC_URI}
- mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.2/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
- innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
- numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
- sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
- test tokudb xml yassl"
-
-RESTRICT="!bindist? ( bindist ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
- server? ( tokudb? ( jemalloc !tcmalloc ) )
- ?? ( tcmalloc jemalloc )
- static? ( yassl !pam )"
-
-KEYWORDS="ppc ppc64"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
- EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
- EGIT_CLONE_TYPE=shallow
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-else
- MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.16-without-clientlibs-tools.patch
- "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
- "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
- "${MY_PATCH_DIR}"/20035_all_mariadb-10.2-atomic-detection.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
- kernel_linux? (
- sys-process/procps:0=
- dev-libs/libaio:0=
- )
- >=sys-apps/sed-4
- >=sys-apps/texinfo-4.7-r1
- jemalloc? ( dev-libs/jemalloc:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- systemtap? ( >=dev-util/systemtap-1.3:0= )
- >=sys-libs/zlib-1.2.3:0=
- kerberos? ( virtual/krb5 )
- yassl? ( net-libs/gnutls:0= )
- !yassl? (
- >=dev-libs/openssl-1.0.0:0=
- )
- sys-libs/ncurses:0=
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- backup? ( app-arch/libarchive:0= )
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
- numa? ( sys-process/numactl )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( sys-libs/pam:0= )
- systemd? ( sys-apps/systemd:= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.41-r1:3=
-"
-DEPEND="virtual/yacc
- static? ( sys-libs/ncurses[static-libs] )
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
- ${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
- !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
- !dev-db/mariadb:0
- !dev-db/mariadb:5.5
- !dev-db/mariadb:10.1
- !dev-db/mariadb:10.3
- !dev-db/mariadb:10.4
- !dev-db/mariadb:10.5
- server? ( !prefix? ( dev-db/mysql-init-scripts ) )
- !=virtual/jre-1.6 ) ) )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
- server? ( ~virtual/mysql-5.6[static=]
- galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- local GCC_MAJOR_SET=$(gcc-major-version)
- local GCC_MINOR_SET=$(gcc-minor-version)
- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
- # non x86{,_64} arches
- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
- fi
- java-pkg-opt-2_pkg_setup
- if has test ${FEATURES} && \
- use server && ! has userpriv ${FEATURES} ; then
- eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
-
- # This should come after all of the die statements
- enewgroup mysql 60 || die "problem adding 'mysql' group"
- enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-
- # Here we need to see if the implementation switched client libraries
- # We check if this is a new instance of the package and a client library already exists
- local SHOW_ABI_MESSAGE libpath
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
- libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
- elog "Due to ABI changes when switching between different client libraries,"
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
- elog "Please run: revdep-rebuild --library ${libpath}"
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
- fi
-}
-
-pkg_postinst() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Create log directory securely if it does not exist
- [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
- if use server ; then
- if use pam; then
- einfo
- elog "This install includes the PAM authentication plugin."
- elog "To activate and configure the PAM plugin, please read:"
- elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
- einfo
- fi
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo
- elog "You might want to run:"
- elog "\"emerge --config =${CATEGORY}/${PF}\""
- elog "if this is a new install."
- elog
- elog "If you are switching server implentations, you should run the"
- elog "mysql_upgrade tool."
- einfo
- else
- einfo
- elog "If you are upgrading major versions, you should run the"
- elog "mysql_upgrade tool."
- einfo
- fi
-
- if use galera ; then
- einfo
- elog "Be sure to edit the my.cnf file to activate your cluster settings."
- elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
- elog "The first time the cluster is activated, you should add"
- elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
- elog "This option should then be removed for subsequent starts."
- einfo
- if use sst-xtrabackup ; then
- ewarn "As per https://mariadb.com/kb/en/meta/xtrabackup_warning/, XtraBackup"
- ewarn "as an SST is broken by default beginning with 10.2.19 with the setting"
- ewarn "innodb_safe_truncate=ON. Please migrate to sst-mariabackup instead."
- ewarn "sst-xtrabackup is being removed in 10.3 and higher."
- fi
- fi
- fi
-
- # Note about configuration change
- einfo
- elog "This version of mariadb reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/${PN}.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
- einfo
-}
-
-src_unpack() {
- unpack ${A}
- # Grab the patches
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
-
- mv -f "${WORKDIR%/}/${P}" "${S}" || die
-}
-
-src_prepare() {
- _disable_plugin() {
- echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
- }
- _disable_engine() {
- echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
- }
-
- local malloc
- for malloc in jemalloc tcmalloc ; do
- if use ${malloc}; then
- echo "TARGET_LINK_LIBRARIES(mysqld ${malloc})" >> "${S}/sql/CMakeLists.txt"
- fi
- done
-
- # Don't build bundled xz-utils for tokudb
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
- local plugin
- local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
- locale_info qc_info server_audit sql_errlog )
- local test_plugins=( audit_null auth_examples daemon_example fulltext
- debug_key_management example_key_management )
- if ! use server; then # These plugins are for the server
- for plugin in "${server_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- fi
-
- if ! use test; then # These plugins are only used during testing
- for plugin in "${test_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- _disable_engine test_sql_discovery
- fi
-
- _disable_engine example
-
- if ! use oqgraph ; then # avoids extra library checks
- _disable_engine oqgraph
- fi
-
- if use mroonga ; then
- # Remove the bundled groonga
- # There is no CMake flag, it simply checks for existance
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
- else
- _disable_engine mroonga
- fi
-
- cmake-utils_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- # Bug #114895, bug #110149
- filter-flags "-O" "-O[01]"
-
- append-cxxflags -felide-constructors
-
- # bug #283926, with GCC4.4, this is required to get correct behavior.
- append-flags -fno-strict-aliasing
-
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX}/etc/mysql"
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${PF}
- -DINSTALL_DOCREADMEDIR=share/doc/${PF}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- -DWITH_COMMENT="Gentoo Linux ${PF}"
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
- -DWITH_LIBEDIT=0
- -DWITH_ZLIB=system
- -DWITHOUT_LIBWRAP=1
- -DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
- -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
- # The build forces this to be defined when cross-compiling. We pass it
- # all the time for simplicity and to make sure it is actually correct.
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
- -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DWITH_UNITTEST=OFF
- -DWITHOUT_CLIENTLIBS=YES
- -DCLIENT_PLUGIN_DIALOG=OFF
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
- -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
- -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
- )
- if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- else
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
- fi
-
- if ! use yassl ; then
- mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
- else
- mycmakeargs+=( -DWITH_SSL=bundled )
- fi
-
- # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
- mycmakeargs+=(
- -DWITH_READLINE=$(usex bindist 1 0)
- -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
- -DENABLE_DTRACE=$(usex systemtap)
- )
-
- if use server ; then
-
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- mycmakeargs+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- mycmakeargs+=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- # Build failure and autodep wrt bug 639144
- -DCONNECT_WITH_MONGO=OFF
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DWITH_MARIABACKUP=$(usex backup ON OFF)
- -DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=share/mariadb
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
- # systemd is only linked to for server notification
- -DWITH_SYSTEMD=$(usex systemd yes no)
- -DWITH_NUMA=$(usex numa ON OFF)
- )
-
- # Workaround for MDEV-14524
- use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
-
- if use test ; then
- # This is needed for the new client lib which tests a real, open server
- mycmakeargs+=( -DSKIP_TESTS=ON )
- fi
-
- if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
- ewarn "You MUST file bugs without these variables set."
-
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
-
- elif ! use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
- fi
- mycmakeargs+=(
- -DEXTRA_CHARSETS=all
- -DMYSQL_USER=mysql
- -DDISABLE_SHARED=$(usex static YES NO)
- -DWITH_DEBUG=$(usex debug)
- -DWITH_EMBEDDED_SERVER=OFF
- -DWITH_PROFILING=$(usex profiling)
- )
-
- if use static; then
- mycmakeargs+=( -DWITH_PIC=1 )
- fi
-
- if use jemalloc || use tcmalloc ; then
- mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
- fi
-
- # Storage engines
- mycmakeargs+=(
- -DWITH_ARCHIVE_STORAGE_ENGINE=1
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1
- -DWITH_CSV_STORAGE_ENGINE=1
- -DWITH_HEAP_STORAGE_ENGINE=1
- -DWITH_INNOBASE_STORAGE_ENGINE=1
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1
- -DWITH_MYISAM_STORAGE_ENGINE=1
- -DWITH_PARTITION_STORAGE_ENGINE=1
- )
-
- else
- mycmakeargs+=(
- -DWITHOUT_SERVER=1
- -DWITH_EMBEDDED_SERVER=OFF
- -DEXTRA_CHARSETS=none
- -DINSTALL_SQLBENCHDIR=
- -DWITH_SYSTEMD=no
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
- if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
- rm "${ED}/usr/include/mysql/server/private/config.h" || die
- fi
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
- einfo "Including support files and sample configurations"
- docinto "support-files"
- local script
- for script in \
- "${S}"/support-files/magic
- do
- [[ -f "$script" ]] && dodoc "${script}"
- done
-
- docinto "scripts"
- for script in "${S}"/scripts/mysql* ; do
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
- done
- # Manually install supporting files that conflict with other packages
- # but are needed for galera and initial installation
- exeinto /usr/libexec/mariadb
- doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
- fi
-
- #Remove mytop if perl is not selected
- [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
- _disable_test() {
- local rawtestname reason
- rawtestname="${1}" ; shift
- reason="${@}"
- ewarn "test '${rawtestname}' disabled: '${reason}'"
- echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
- }
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if ! use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log} || die
-
- # Run mysql tests
- pushd "${TESTDIR}" > /dev/null || die
-
- touch "${T}/disabled.def"
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
-
- local t
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do
- _disable_test "$t" "False positive due to varying policies"
- done
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
- _disable_test "$t" "False positives in Gentoo"
- done
-
- _disable_test main.plugin_auth "Needs client libraries built"
- _disable_test main.mysqldump "Test fails past 2018-12-31 due to event expiration"
-
- # Likely environment issues as only number of clients connected fails
- _disable_test rpl.rpl_semi_sync_uninstall_plugin \
- "Fails intermittently on parallel testing"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
- retstatus_tests=$?
-
- popd > /dev/null || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=""
- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
- MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1`
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//' \
- | tail -n1`
- fi
- fi
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR="${MY_LOCALSTATEDIR}"
- einfo "Using default MY_DATADIR"
- fi
- elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
- if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
- if [[ -e "${MY_DATADIR}" ]] ; then
- # If you get this and you're wondering about it, see bug #207636
- elog "MySQL datadir found in ${MY_DATADIR}"
- elog "A new one will not be created."
- PREVIOUS_DATADIR="yes"
- else
- PREVIOUS_DATADIR="no"
- fi
- export PREVIOUS_DATADIR
- fi
- else
- if [[ ${EBUILD_PHASE} == "config" ]]; then
- local new_MY_DATADIR
- new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1`
-
- if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
- ewarn "MySQL MY_DATADIR has changed"
- ewarn "from ${MY_DATADIR}"
- ewarn "to ${new_MY_DATADIR}"
- MY_DATADIR="${new_MY_DATADIR}"
- fi
- fi
- fi
-
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR
- export MY_LOCALSTATEDIR MY_LOGDIR
- export MY_DATADIR
-}
-
-pkg_config() {
- _getoptval() {
- local mypd="${EROOT}"/usr/bin/my_print_defaults
- local section="$1"
- local flag="--${2}="
- local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
- }
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
- # my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
-
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
- else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
- fi
- fi
-
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
-
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
- local tmp_mysqld_password_source=
-
- for tmp_mysqld_password_source in mysql client; do
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
- MYSQL_ROOT_PASSWORD=
- continue
- fi
-
- einfo "Found password in '${tmp_mysqld_password_source}' section!"
- break
- fi
- done
-
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
- fi
-
- unset tmp_mysqld_password_source
- fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
- einfo "Please provide a password for the mysql 'root' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- read -rsp " >" pwd1 ; echo
-
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
- MYSQL_ROOT_PASSWORD="${pwd1}"
- unset pwd1 pwd2
- fi
-
- local options
- local sqltmp="$(emktemp)"
-
- # Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
- # Figure out which options we need to disable to do the setup
- local helpfile="${TMPDIR}/mysqld-help"
- "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in grant-tables host-cache name-resolve networking slave-start \
- federated ssl log-bin relay-log slow-query-log external-locking \
- log-slave-updates \
- ; do
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
- done
-
- einfo "Creating the mysql database and setting proper permissions on it ..."
-
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
- fi
-
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
-
- pushd "${TMPDIR}" &>/dev/null || die
-
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [ $? -ne 0 ]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
- fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
- eend $rc
-
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
- fi
-
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- eend $?
-
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
- fi
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
-}
diff --git a/dev-db/mariadb/mariadb-10.2.35.ebuild b/dev-db/mariadb/mariadb-10.2.35.ebuild
index 81166142aa7e..31413b22c032 100644
--- a/dev-db/mariadb/mariadb-10.2.35.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.35.ebuild
@@ -25,7 +25,7 @@ IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
test tokudb xml yassl"
-RESTRICT="!bindist? ( bindist ) test? ( test )"
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
REQUIRED_USE="jdbc? ( extraengine server !static )
server? ( tokudb? ( jemalloc !tcmalloc ) )
diff --git a/dev-db/mariadb/mariadb-10.3.25.ebuild b/dev-db/mariadb/mariadb-10.2.38.ebuild
similarity index 63%
rename from dev-db/mariadb/mariadb-10.3.25.ebuild
rename to dev-db/mariadb/mariadb-10.2.38.ebuild
index 4b560041aa19..cdbebe3a49f8 100644
--- a/dev-db/mariadb/mariadb-10.3.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.38.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
multiprocessing java-pkg-opt-2 cmake
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.24-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.2.38-patches-01.tar.xz"
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
${PATCH_SET}"
@@ -18,11 +18,11 @@ SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.3/${SUBSLOT:-0}"
+SLOT="10.2/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
- sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+ sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
test tokudb xml yassl"
RESTRICT="!bindist? ( bindist ) !test? ( test )"
@@ -85,7 +85,7 @@ BDEPEND="virtual/yacc
"
DEPEND="static? ( sys-libs/ncurses[static-libs] )
server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
test? ( acct-group/mysql acct-user/mysql )
)
${COMMON_DEPEND}"
@@ -94,9 +94,10 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mariadb:0
!dev-db/mariadb:5.5
!dev-db/mariadb:10.1
- !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
!dev-db/mariadb:10.4
!dev-db/mariadb:10.5
+ !dev-db/mariadb:10.6
!=dev-perl/DBD-mysql-2.9004 )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+ server? (
+ galera? (
+ sst-xtrabackup? (
+ || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup )
+ )
+ )
+ )"
mysql_init_vars() {
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
@@ -245,7 +248,7 @@ src_prepare() {
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
locale_info qc_info server_audit sql_errlog auth_ed25519 )
local test_plugins=( audit_null auth_examples daemon_example fulltext
- debug_key_management example_key_management versioning )
+ debug_key_management example_key_management )
if ! use server; then # These plugins are for the server
for plugin in "${server_plugins[@]}" ; do
_disable_plugin "${plugin}"
@@ -309,7 +312,7 @@ src_configure() {
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SCRIPTDIR=bin
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
@@ -370,6 +373,7 @@ src_configure() {
fi
mycmakeargs+=(
+ -DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
@@ -394,7 +398,7 @@ src_configure() {
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-DWITH_MARIABACKUP=$(usex backup ON OFF)
-DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=""
+ -DINSTALL_SQLBENCHDIR=share/mariadb
-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
# systemd is only linked to for server notification
-DWITH_SYSTEMD=$(usex systemd yes no)
@@ -556,9 +560,12 @@ src_test() {
local -a disabled_tests
disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
disabled_tests+=( "main.grant;0;Sporadically failing test" )
+ disabled_tests+=( "main.join_cache;0;Sporadically failing test" )
disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
@@ -571,6 +578,7 @@ src_test() {
if ! use latin1 ; then
disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+ disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
fi
@@ -682,23 +690,21 @@ src_install() {
doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
fi
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
# Fix a dangling symlink when galera is not built
if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
fi
-
- # Remove broken SST scripts that are incompatible
- local scriptremove
- for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
- if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
- rm "${ED}/usr/bin/${scriptremove}" || die
- fi
- done
}
pkg_preinst() {
@@ -756,6 +762,12 @@ pkg_postinst() {
elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
elog "This option should then be removed for subsequent starts."
einfo
+ if use sst-xtrabackup ; then
+ ewarn "As per https://mariadb.com/kb/en/meta/xtrabackup_warning/, XtraBackup"
+ ewarn "as an SST is broken by default beginning with 10.2.19 with the setting"
+ ewarn "innodb_safe_truncate=ON. Please migrate to sst-mariabackup instead."
+ ewarn "sst-xtrabackup is being removed in 10.3 and higher."
+ fi
fi
fi
@@ -772,63 +784,312 @@ pkg_postinst() {
pkg_config() {
_getoptval() {
- local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
- local section="$1"
+ local section="${1}"
local flag="--${2}="
local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+ local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+ if [[ ${#results[@]} -gt 0 ]] ; then
+ # When option is set multiple times only return last value
+ echo "${results[-1]}"
+ fi
}
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
+ local -x HOME="${EROOT}/root"
# Make sure the vars are correctly initialized
mysql_init_vars
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
fi
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
fi
fi
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
+ if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
local tmp_mysqld_password_source=
- for tmp_mysqld_password_source in mysql client; do
+ for tmp_mysqld_password_source in mysql client ; do
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
MYSQL_ROOT_PASSWORD=
continue
@@ -840,167 +1101,188 @@ pkg_config() {
done
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
fi
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
- einfo "Please provide a password for the mysql 'root'@'localhost' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
read -rsp " >" pwd1 ; echo
einfo "Retype the password"
read -rsp " >" pwd2 ; echo
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
fi
MYSQL_ROOT_PASSWORD="${pwd1}"
unset pwd1 pwd2
+
+ echo
fi
- local options
- local sqltmp="$(emktemp)"
+ local -a mysqld_options
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
# Figure out which options we need to disable to do the setup
local helpfile="${TMPDIR}/mysqld-help"
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in grant-tables host-cache name-resolve networking slave-start \
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking \
log-slave-updates \
- ; do
+ ; do
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
done
- einfo "Creating the mysql database and setting proper permissions on it ..."
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
fi
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--user=${MYSQL_USER}"
+ )
- pushd "${TMPDIR}" &>/dev/null || die
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
maxtry=$((${maxtry}-1))
echo -n "."
sleep 1
done
- eend $rc
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
fi
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp files
- local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- eend $?
-
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
- fi
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
}
diff --git a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
deleted file mode 100644
index 523a0c907d14..000000000000
--- a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
+++ /dev/null
@@ -1,1007 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
- multiprocessing java-pkg-opt-2 cmake-utils
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.23-patches-03.tar.xz"
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
- ${PATCH_SET}"
-
-HOMEPAGE="https://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.3/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
- innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
- numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
- sst-rsync sst-mariabackup static systemd systemtap tcmalloc
- test tokudb xml yassl"
-
-RESTRICT="!bindist? ( bindist ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
- server? ( tokudb? ( jemalloc !tcmalloc ) )
- ?? ( tcmalloc jemalloc )
- static? ( yassl !pam )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
- kernel_linux? (
- sys-process/procps:0=
- dev-libs/libaio:0=
- )
- >=sys-apps/sed-4
- >=sys-apps/texinfo-4.7-r1
- jemalloc? ( dev-libs/jemalloc:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- systemtap? ( >=dev-util/systemtap-1.3:0= )
- >=sys-libs/zlib-1.2.3:0=
- kerberos? ( virtual/krb5 )
- yassl? ( net-libs/gnutls:0= )
- !yassl? (
- >=dev-libs/openssl-1.0.0:0=
- )
- sys-libs/ncurses:0=
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- server? (
- backup? ( app-arch/libarchive:0= )
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
- numa? ( sys-process/numactl )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( sys-libs/pam:0= )
- systemd? ( sys-apps/systemd:= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.41-r1:3=
-"
-DEPEND="virtual/yacc
- static? ( sys-libs/ncurses[static-libs] )
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
- test? ( acct-group/mysql acct-user/mysql )
- )
- ${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
- !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
- !dev-db/mariadb:0
- !dev-db/mariadb:5.5
- !dev-db/mariadb:10.1
- !dev-db/mariadb:10.2
- !dev-db/mariadb:10.4
- !dev-db/mariadb:10.5
- !=virtual/jre-1.6 ) )
- )
- perl? (
- !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes
- )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=""
- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
- MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1)
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//' \
- | tail -n1)
- fi
- fi
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR="${MY_LOCALSTATEDIR}"
- einfo "Using default MY_DATADIR"
- fi
- elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
- if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
- if [[ -e "${MY_DATADIR}" ]] ; then
- # If you get this and you're wondering about it, see bug #207636
- elog "MySQL datadir found in ${MY_DATADIR}"
- elog "A new one will not be created."
- PREVIOUS_DATADIR="yes"
- else
- PREVIOUS_DATADIR="no"
- fi
- export PREVIOUS_DATADIR
- fi
- else
- if [[ ${EBUILD_PHASE} == "config" ]]; then
- local new_MY_DATADIR
- new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1)
-
- if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
- ewarn "MySQL MY_DATADIR has changed"
- ewarn "from ${MY_DATADIR}"
- ewarn "to ${new_MY_DATADIR}"
- MY_DATADIR="${new_MY_DATADIR}"
- fi
- fi
- fi
-
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR
- export MY_LOCALSTATEDIR MY_LOGDIR
- export MY_DATADIR
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- local GCC_MAJOR_SET=$(gcc-major-version)
- local GCC_MINOR_SET=$(gcc-minor-version)
-
- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-
- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
- # non x86{,_64} arches
- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-
- if has test ${FEATURES} ; then
- # Bug #213475 - MySQL _will_ object strenuously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! has userpriv ${FEATURES} ; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- fi
- fi
-
- java-pkg-opt-2_pkg_setup
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-
- # Here we need to see if the implementation switched client libraries
- # We check if this is a new instance of the package and a client library already exists
- local SHOW_ABI_MESSAGE libpath
- if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
- libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
- elog "Due to ABI changes when switching between different client libraries,"
- elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
- elog "Please run: revdep-rebuild --library ${libpath}"
- ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
-}
-
-src_prepare() {
- eapply "${WORKDIR}"/mariadb-patches
- eapply "${FILESDIR}"/mariadb-10.3-CVE-2020-15180.patch
-
- eapply_user
-
- _disable_plugin() {
- echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
- }
- _disable_engine() {
- echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
- }
-
- if use jemalloc; then
- echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
- elif use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
- fi
-
- # Don't build bundled xz-utils for tokudb
- echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
- sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
- sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-
- local plugin
- local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
- locale_info qc_info server_audit sql_errlog auth_ed25519 )
- local test_plugins=( audit_null auth_examples daemon_example fulltext
- debug_key_management example_key_management versioning )
- if ! use server; then # These plugins are for the server
- for plugin in "${server_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- fi
-
- if ! use test; then # These plugins are only used during testing
- for plugin in "${test_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- _disable_engine test_sql_discovery
- fi
-
- _disable_engine example
-
- if ! use oqgraph ; then # avoids extra library checks
- _disable_engine oqgraph
- fi
-
- if use mroonga ; then
- # Remove the bundled groonga
- # There is no CMake flag, it simply checks for existance
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
- else
- _disable_engine mroonga
- fi
-
- # Fix galera_recovery.sh script
- sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
- scripts/galera_recovery.sh || die
-
- cmake-utils_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- # Bug #114895, bug #110149
- filter-flags "-O" "-O[01]"
-
- append-cxxflags -felide-constructors
-
- # bug #283926, with GCC4.4, this is required to get correct behavior.
- append-flags -fno-strict-aliasing
-
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX}/etc/mysql"
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${PF}
- -DINSTALL_DOCREADMEDIR=share/doc/${PF}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- -DWITH_COMMENT="Gentoo Linux ${PF}"
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
- -DWITH_LIBEDIT=0
- -DWITH_ZLIB=system
- -DWITHOUT_LIBWRAP=1
- -DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
- -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
- # The build forces this to be defined when cross-compiling. We pass it
- # all the time for simplicity and to make sure it is actually correct.
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
- -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DWITH_UNITTEST=OFF
- -DWITHOUT_CLIENTLIBS=YES
- -DCLIENT_PLUGIN_DIALOG=OFF
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
- -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
- -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
- -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
- )
- if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- else
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
- fi
-
- if ! use yassl ; then
- mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
- else
- mycmakeargs+=( -DWITH_SSL=bundled )
- fi
-
- # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
- mycmakeargs+=(
- -DWITH_READLINE=$(usex bindist 1 0)
- -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
- -DENABLE_DTRACE=$(usex systemtap)
- )
-
- if use server ; then
-
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- mycmakeargs+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- mycmakeargs+=(
- -DWITH_PCRE=system
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- # Build failure and autodep wrt bug 639144
- -DCONNECT_WITH_MONGO=OFF
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DWITH_MARIABACKUP=$(usex backup ON OFF)
- -DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=""
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
- # systemd is only linked to for server notification
- -DWITH_SYSTEMD=$(usex systemd yes no)
- -DWITH_NUMA=$(usex numa ON OFF)
- )
-
- # Workaround for MDEV-14524
- use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
-
- if use test ; then
- # This is needed for the new client lib which tests a real, open server
- mycmakeargs+=( -DSKIP_TESTS=ON )
- fi
-
- if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
- ewarn "You MUST file bugs without these variables set."
-
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
-
- elif ! use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
- fi
- mycmakeargs+=(
- -DEXTRA_CHARSETS=all
- -DMYSQL_USER=mysql
- -DDISABLE_SHARED=$(usex static YES NO)
- -DWITH_DEBUG=$(usex debug)
- -DWITH_EMBEDDED_SERVER=OFF
- -DWITH_PROFILING=$(usex profiling)
- )
-
- if use static; then
- mycmakeargs+=( -DWITH_PIC=1 )
- fi
-
- if use jemalloc || use tcmalloc ; then
- mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
- fi
-
- # Storage engines
- mycmakeargs+=(
- -DWITH_ARCHIVE_STORAGE_ENGINE=1
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1
- -DWITH_CSV_STORAGE_ENGINE=1
- -DWITH_HEAP_STORAGE_ENGINE=1
- -DWITH_INNOBASE_STORAGE_ENGINE=1
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1
- -DWITH_MYISAM_STORAGE_ENGINE=1
- -DWITH_PARTITION_STORAGE_ENGINE=1
- )
-
- else
- mycmakeargs+=(
- -DWITHOUT_SERVER=1
- -DWITH_EMBEDDED_SERVER=OFF
- -DEXTRA_CHARSETS=none
- -DINSTALL_SQLBENCHDIR=
- -DWITH_SYSTEMD=no
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- _disable_test() {
- local rawtestname bug reason
- rawtestname="${1}" ; shift
- bug="${1}" ; shift
- reason="${@}"
- ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
- echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
- }
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if ! use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- if [[ -z "${MTR_PARALLEL}" ]] ; then
- local -x MTR_PARALLEL=$(makeopts_jobs)
-
- if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
- # Running multiple tests in parallel usually require higher ulimit
- # and fs.aio-max-nr setting. In addition, tests like main.multi_update
- # are known to hit timeout when system is busy.
- # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
- # using "auto".
- local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
- info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
- einfo "${info_msg}"
- unset info_msg
- MTR_PARALLEL=4
- fi
- else
- einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
- fi
-
- # Try to increase file limits to increase test coverage
- if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
- # Upper limit comes from parts.partition_* tests
- ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
- if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
- # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
- ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
- if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
- ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
- else
- einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
- fi
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log} || die
-
- cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
-
- local -a disabled_tests
- disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
- disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
- disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
- disabled_tests+=( "main.grant;0;Sporadically failing test" )
- disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
- disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
- disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
- disabled_tests+=( "mariabackup.*;0;Broken test suite" )
- disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
- disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
- disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
- disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
-
- if ! use latin1 ; then
- disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
- disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
- disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
- fi
-
- local test_infos_str test_infos_arr
- for test_infos_str in "${disabled_tests[@]}" ; do
- IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
- if [[ ${#test_infos_arr[@]} != 3 ]] ; then
- die "Invalid test data set, not matching format: ${test_infos_str}"
- fi
-
- _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
- done
- unset test_infos_str test_infos_arr
-
- # run mysql-test tests
- pushd "${TESTDIR}" &>/dev/null || die
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
- retstatus_tests=$?
-
- popd &>/dev/null || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
- if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
- rm "${ED}/usr/include/mysql/server/private/config.h" || die
- fi
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
- einfo "Including support files and sample configurations"
- docinto "support-files"
- local script
- for script in \
- "${S}"/support-files/magic
- do
- [[ -f "$script" ]] && dodoc "${script}"
- done
-
- docinto "scripts"
- for script in "${S}"/scripts/mysql* ; do
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
- done
- # Manually install supporting files that conflict with other packages
- # but are needed for galera and initial installation
- exeinto /usr/libexec/mariadb
- doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
- fi
-
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
-
- # Fix a dangling symlink when galera is not built
- if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
- rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
- fi
-
- # Remove broken SST scripts that are incompatible
- local scriptremove
- for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
- if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
- rm "${ED}/usr/bin/${scriptremove}" || die
- fi
- done
-}
-
-pkg_postinst() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Create log directory securely if it does not exist
- [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
- if use server ; then
- if use pam; then
- einfo
- elog "This install includes the PAM authentication plugin."
- elog "To activate and configure the PAM plugin, please read:"
- elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
- einfo
- fi
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo
- elog "You might want to run:"
- elog "\"emerge --config =${CATEGORY}/${PF}\""
- elog "if this is a new install."
- elog
- elog "If you are switching server implentations, you should run the"
- elog "mysql_upgrade tool."
- einfo
- else
- einfo
- elog "If you are upgrading major versions, you should run the"
- elog "mysql_upgrade tool."
- einfo
- fi
-
- if use galera ; then
- einfo
- elog "Be sure to edit the my.cnf file to activate your cluster settings."
- elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
- elog "The first time the cluster is activated, you should add"
- elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
- elog "This option should then be removed for subsequent starts."
- einfo
- fi
- fi
-
- # Note about configuration change
- einfo
- elog "This version of mariadb reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/${PN}.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
- einfo
-}
-
-pkg_config() {
- _getoptval() {
- local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
- local section="$1"
- local flag="--${2}="
- local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
- }
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
- # my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
-
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
- else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
- fi
- fi
-
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
-
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
- local tmp_mysqld_password_source=
-
- for tmp_mysqld_password_source in mysql client; do
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
- MYSQL_ROOT_PASSWORD=
- continue
- fi
-
- einfo "Found password in '${tmp_mysqld_password_source}' section!"
- break
- fi
- done
-
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
- fi
-
- unset tmp_mysqld_password_source
- fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
- einfo "Please provide a password for the mysql 'root' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- read -rsp " >" pwd1 ; echo
-
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
- MYSQL_ROOT_PASSWORD="${pwd1}"
- unset pwd1 pwd2
- fi
-
- local options
- local sqltmp="$(emktemp)"
-
- # Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
- # Figure out which options we need to disable to do the setup
- local helpfile="${TMPDIR}/mysqld-help"
- "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in grant-tables host-cache name-resolve networking slave-start \
- federated ssl log-bin relay-log slow-query-log external-locking \
- log-slave-updates \
- ; do
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
- done
-
- einfo "Creating the mysql database and setting proper permissions on it ..."
-
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
- fi
-
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
-
- pushd "${TMPDIR}" &>/dev/null || die
-
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [ $? -ne 0 ]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
- fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
- eend $rc
-
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
- fi
-
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- eend $?
-
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
- fi
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
-}
diff --git a/dev-db/mariadb/mariadb-10.3.26.ebuild b/dev-db/mariadb/mariadb-10.3.29.ebuild
similarity index 65%
rename from dev-db/mariadb/mariadb-10.3.26.ebuild
rename to dev-db/mariadb/mariadb-10.3.29.ebuild
index c2089d951e6c..f4598844ffe2 100644
--- a/dev-db/mariadb/mariadb-10.3.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.29.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
multiprocessing java-pkg-opt-2 cmake
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.26-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.29-patches-01.tar.xz"
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
${PATCH_SET}"
@@ -85,7 +85,7 @@ BDEPEND="virtual/yacc
"
DEPEND="static? ( sys-libs/ncurses[static-libs] )
server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
test? ( acct-group/mysql acct-user/mysql )
)
${COMMON_DEPEND}"
@@ -97,6 +97,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mariadb:10.2
!dev-db/mariadb:10.4
!dev-db/mariadb:10.5
+ !dev-db/mariadb:10.6
!> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
elif use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
fi
# Don't build bundled xz-utils for tokudb
@@ -309,7 +303,7 @@ src_configure() {
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SCRIPTDIR=bin
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
@@ -556,6 +550,8 @@ src_test() {
local -a disabled_tests
disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
disabled_tests+=( "main.grant;0;Sporadically failing test" )
@@ -683,10 +679,16 @@ src_install() {
doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
fi
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
# Fix a dangling symlink when galera is not built
if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
@@ -773,63 +775,312 @@ pkg_postinst() {
pkg_config() {
_getoptval() {
- local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
- local section="$1"
+ local section="${1}"
local flag="--${2}="
local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+ local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+ if [[ ${#results[@]} -gt 0 ]] ; then
+ # When option is set multiple times only return last value
+ echo "${results[-1]}"
+ fi
}
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
+ local -x HOME="${EROOT}/root"
# Make sure the vars are correctly initialized
mysql_init_vars
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
fi
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
fi
fi
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
+ if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
local tmp_mysqld_password_source=
- for tmp_mysqld_password_source in mysql client; do
+ for tmp_mysqld_password_source in mysql client ; do
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
MYSQL_ROOT_PASSWORD=
continue
@@ -841,167 +1092,189 @@ pkg_config() {
done
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
fi
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-
- einfo "Please provide a password for the mysql 'root'@'localhost' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
read -rsp " >" pwd1 ; echo
einfo "Retype the password"
read -rsp " >" pwd2 ; echo
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
fi
MYSQL_ROOT_PASSWORD="${pwd1}"
unset pwd1 pwd2
+
+ echo
fi
- local options
- local sqltmp="$(emktemp)"
+ local -a mysqld_options
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
# Figure out which options we need to disable to do the setup
local helpfile="${TMPDIR}/mysqld-help"
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in grant-tables host-cache name-resolve networking slave-start \
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking \
log-slave-updates \
- ; do
+ ; do
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
done
- einfo "Creating the mysql database and setting proper permissions on it ..."
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
fi
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
- pushd "${TMPDIR}" &>/dev/null || die
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
maxtry=$((${maxtry}-1))
echo -n "."
sleep 1
done
- eend $rc
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
fi
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
ebegin "Setting root password"
# Do this from memory, as we don't want clear text passwords in temp files
- local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- eend $?
-
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
- fi
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
}
diff --git a/dev-db/mariadb/mariadb-10.5.8.ebuild b/dev-db/mariadb/mariadb-10.4.19.ebuild
similarity index 62%
rename from dev-db/mariadb/mariadb-10.5.8.ebuild
rename to dev-db/mariadb/mariadb-10.4.19.ebuild
index 550c14700ef6..e663805b40ff 100644
--- a/dev-db/mariadb/mariadb-10.5.8.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.19.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
multiprocessing java-pkg-opt-2 cmake
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.8-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.19-patches-01.tar.xz"
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
${PATCH_SET}"
@@ -18,16 +18,17 @@ SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/"
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.5/${SUBSLOT:-0}"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+SLOT="10.4/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
- sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
- test xml yassl"
+ sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+ test tokudb xml yassl"
RESTRICT="!bindist? ( bindist ) !test? ( test )"
REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
@@ -40,30 +41,28 @@ S="${WORKDIR}/mysql"
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
COMMON_DEPEND="
- >=dev-libs/libpcre-8.41-r1:3=
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
- sys-libs/ncurses:0=
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
>=sys-libs/zlib-1.2.3:0=
+ kerberos? ( virtual/krb5 )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ >=dev-libs/openssl-1.0.0:0=
+ )
+ sys-libs/ncurses:0=
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
)
- jemalloc? ( dev-libs/jemalloc:0= )
- kerberos? ( virtual/krb5 )
- kernel_linux? (
- sys-process/procps:0=
- dev-libs/libaio:0=
- )
server? (
- app-arch/bzip2
- app-arch/xz-utils
backup? ( app-arch/libarchive:0= )
- columnstore? (
- app-arch/snappy
- dev-libs/boost:0=
- dev-libs/libxml2:2=
- )
cracklib? ( sys-libs/cracklib:0= )
extraengine? (
odbc? ( dev-db/unixODBC:0= )
@@ -76,40 +75,33 @@ COMMON_DEPEND="
numa? ( sys-process/numactl )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( sys-libs/pam:0= )
- s3? ( net-misc/curl )
systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
)
- systemtap? ( >=dev-util/systemtap-1.3:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- yassl? ( net-libs/gnutls:0= )
- !yassl? (
- >=dev-libs/openssl-1.0.0:0=
- )
+ >=dev-libs/libpcre-8.41-r1:3=
"
BDEPEND="virtual/yacc
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
test? ( acct-group/mysql acct-user/mysql )
)
- static? ( sys-libs/ncurses[static-libs] )
-"
-RDEPEND="${COMMON_DEPEND}
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
!dev-db/mariadb:0
!dev-db/mariadb:5.5
!dev-db/mariadb:10.1
!dev-db/mariadb:10.2
!dev-db/mariadb:10.3
- !dev-db/mariadb:10.4
+ !dev-db/mariadb:10.5
+ !dev-db/mariadb:10.6
!=virtual/jre-1.6 ) )
galera? (
sys-apps/iproute2
=sys-cluster/galera-26*
@@ -117,13 +109,7 @@ RDEPEND="${COMMON_DEPEND}
sst-mariabackup? ( net-misc/socat[ssl] )
)
!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
- )
- perl? (
- !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes
+ extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
)
"
# For other stuff to bring us in
@@ -191,6 +177,13 @@ pkg_setup() {
local GCC_MAJOR_SET=$(gcc-major-version)
local GCC_MINOR_SET=$(gcc-minor-version)
+ if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
+
# Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
# non x86{,_64} arches
if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
@@ -233,11 +226,16 @@ src_prepare() {
}
if use jemalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
elif use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
fi
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
local plugin
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
locale_info qc_info server_audit sql_errlog auth_ed25519 )
@@ -319,7 +317,7 @@ src_configure() {
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SCRIPTDIR=bin
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
@@ -376,21 +374,19 @@ src_configure() {
if ! use extraengine ; then
mycmakeargs+=(
-DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO
- )
+ -DPLUGIN_FEDERATEDX=NO )
fi
mycmakeargs+=(
-DWITH_PCRE=system
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_CASSANDRA=NO
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_S3=$(usex s3 YES NO)
- -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
-DPLUGIN_CONNECT=$(usex extraengine YES NO)
-DCONNECT_WITH_MYSQL=1
-DCONNECT_WITH_LIBXML2=$(usex xml)
@@ -413,6 +409,9 @@ src_configure() {
-DWITH_NUMA=$(usex numa ON OFF)
)
+ # Workaround for MDEV-14524
+ use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
if use test ; then
# This is needed for the new client lib which tests a real, open server
mycmakeargs+=( -DSKIP_TESTS=ON )
@@ -565,17 +564,21 @@ src_test() {
local -a disabled_tests
disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
disabled_tests+=( "mariabackup.*;0;Broken test suite" )
disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+ disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
if ! use latin1 ; then
disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
@@ -599,7 +602,7 @@ src_test() {
# run mysql-test tests
pushd "${TESTDIR}" &>/dev/null || die
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
retstatus_tests=$?
popd &>/dev/null || die
@@ -697,10 +700,16 @@ src_install() {
fi
fi
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
# Fix a dangling symlink when galera is not built
if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
@@ -787,63 +796,312 @@ pkg_postinst() {
pkg_config() {
_getoptval() {
- local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
- local section="$1"
+ local section="${1}"
local flag="--${2}="
local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+ local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+ if [[ ${#results[@]} -gt 0 ]] ; then
+ # When option is set multiple times only return last value
+ echo "${results[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
}
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
+ local -x HOME="${EROOT}/root"
# Make sure the vars are correctly initialized
mysql_init_vars
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
fi
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
fi
fi
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
+ if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
local tmp_mysqld_password_source=
- for tmp_mysqld_password_source in mysql client; do
+ for tmp_mysqld_password_source in mysql client ; do
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
MYSQL_ROOT_PASSWORD=
continue
@@ -855,179 +1113,189 @@ pkg_config() {
done
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
fi
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-
- einfo "Please provide a password for the mysql 'root'@'localhost' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- einfo "Not entering a password defaults to UNIX authentication"
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
read -rsp " >" pwd1 ; echo
- if [[ -n "${pwd1}" ]] ; then
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
-
- MYSQL_ROOT_PASSWORD="${pwd1}"
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
unset pwd1 pwd2
+
+ echo
fi
- local options
- local sqltmp="$(emktemp)"
+ local -a mysqld_options
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
# Figure out which options we need to disable to do the setup
local helpfile="${TMPDIR}/mysqld-help"
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
for opt in host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking \
log-slave-updates \
- ; do
+ ; do
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
done
- einfo "Creating the mysql database and setting proper permissions on it ..."
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
fi
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
- pushd "${TMPDIR}" &>/dev/null || die
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
- if [[ -z ${sqltmp} && -z ${MYSQL_ROOT_PASSWORD} ]] ; then
- einfo "Done"
- exit 0
- fi
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
maxtry=$((${maxtry}-1))
echo -n "."
sleep 1
done
- eend $rc
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
fi
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}')"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- unset sql
- eend $?
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
fi
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
fi
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
}
diff --git a/dev-db/mariadb/mariadb-10.5.7.ebuild b/dev-db/mariadb/mariadb-10.5.10.ebuild
similarity index 64%
rename from dev-db/mariadb/mariadb-10.5.7.ebuild
rename to dev-db/mariadb/mariadb-10.5.10.ebuild
index a48f286d522c..d56ed81b9fee 100644
--- a/dev-db/mariadb/mariadb-10.5.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.10.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
multiprocessing java-pkg-opt-2 cmake
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.7-patches-02.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.10-patches-01.tar.xz"
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
${PATCH_SET}"
@@ -40,7 +40,7 @@ S="${WORKDIR}/mysql"
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
COMMON_DEPEND="
- >=dev-libs/libpcre-8.41-r1:3=
+ >=dev-libs/libpcre2-10.34:=
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
sys-libs/ncurses:0=
@@ -91,7 +91,7 @@ BDEPEND="virtual/yacc
"
DEPEND="${COMMON_DEPEND}
server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
test? ( acct-group/mysql acct-user/mysql )
)
static? ( sys-libs/ncurses[static-libs] )
@@ -104,12 +104,13 @@ RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb:10.2
!dev-db/mariadb:10.3
!dev-db/mariadb:10.4
+ !dev-db/mariadb:10.6
!=virtual/jre-1.6 ) )
+ extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
galera? (
sys-apps/iproute2
=sys-cluster/galera-26*
@@ -118,13 +119,6 @@ RDEPEND="${COMMON_DEPEND}
)
!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
)
- perl? (
- !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes
- )
"
# For other stuff to bring us in
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
@@ -233,9 +227,9 @@ src_prepare() {
}
if use jemalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
elif use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
fi
local plugin
@@ -319,7 +313,7 @@ src_configure() {
-DINSTALL_MANDIR=share/man
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+ -DINSTALL_SCRIPTDIR=bin
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
@@ -565,17 +559,21 @@ src_test() {
local -a disabled_tests
disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
disabled_tests+=( "mariabackup.*;0;Broken test suite" )
disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+ disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
if ! use latin1 ; then
disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
@@ -697,10 +695,16 @@ src_install() {
fi
fi
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
# Fix a dangling symlink when galera is not built
if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
@@ -787,63 +791,312 @@ pkg_postinst() {
pkg_config() {
_getoptval() {
- local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
- local section="$1"
+ local section="${1}"
local flag="--${2}="
local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+ local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+ if [[ ${#results[@]} -gt 0 ]] ; then
+ # When option is set multiple times only return last value
+ echo "${results[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
}
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
+ local -x HOME="${EROOT}/root"
# Make sure the vars are correctly initialized
mysql_init_vars
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
fi
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
fi
fi
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
+ if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
local tmp_mysqld_password_source=
- for tmp_mysqld_password_source in mysql client; do
+ for tmp_mysqld_password_source in mysql client ; do
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
MYSQL_ROOT_PASSWORD=
continue
@@ -855,179 +1108,189 @@ pkg_config() {
done
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
fi
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-
- einfo "Please provide a password for the mysql 'root'@'localhost' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- einfo "Not entering a password defaults to UNIX authentication"
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
read -rsp " >" pwd1 ; echo
- if [[ -n "${pwd1}" ]] ; then
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
- MYSQL_ROOT_PASSWORD="${pwd1}"
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
fi
+ MYSQL_ROOT_PASSWORD="${pwd1}"
unset pwd1 pwd2
+
+ echo
fi
- local options
- local sqltmp="$(emktemp)"
+ local -a mysqld_options
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
# Figure out which options we need to disable to do the setup
local helpfile="${TMPDIR}/mysqld-help"
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
for opt in host-cache name-resolve networking slave-start \
federated ssl log-bin relay-log slow-query-log external-locking \
log-slave-updates \
- ; do
+ ; do
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+ egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
done
- einfo "Creating the mysql database and setting proper permissions on it ..."
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
fi
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
- pushd "${TMPDIR}" &>/dev/null || die
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
- if [[ -z ${sqltmp} && -z ${MYSQL_ROOT_PASSWORD} ]] ; then
- einfo "Done"
- exit 0
- fi
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
maxtry=$((${maxtry}-1))
echo -n "."
sleep 1
done
- eend $rc
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
fi
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}')"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- unset sql
- eend $?
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
fi
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
fi
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
}
diff --git a/dev-db/mariadb/mariadb-10.5.6.ebuild b/dev-db/mariadb/mariadb-10.5.6.ebuild
deleted file mode 100644
index 5bcad73cf9f3..000000000000
--- a/dev-db/mariadb/mariadb-10.5.6.ebuild
+++ /dev/null
@@ -1,1031 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
- multiprocessing java-pkg-opt-2 cmake
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.5-patches-02.tar.xz"
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
- ${PATCH_SET}"
-
-HOMEPAGE="https://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="10.5/${SUBSLOT:-0}"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
- innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
- numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
- sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
- test xml yassl"
-
-RESTRICT="!bindist? ( bindist ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
- ?? ( tcmalloc jemalloc )
- static? ( yassl !pam )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
- >=dev-libs/libpcre-8.41-r1:3=
- >=sys-apps/sed-4
- >=sys-apps/texinfo-4.7-r1
- sys-libs/ncurses:0=
- >=sys-libs/zlib-1.2.3:0=
- !bindist? (
- sys-libs/binutils-libs:0=
- >=sys-libs/readline-4.1:0=
- )
- jemalloc? ( dev-libs/jemalloc:0= )
- kerberos? ( virtual/krb5 )
- kernel_linux? (
- sys-process/procps:0=
- dev-libs/libaio:0=
- )
- server? (
- app-arch/bzip2
- app-arch/xz-utils
- backup? ( app-arch/libarchive:0= )
- columnstore? (
- app-arch/snappy
- dev-libs/boost:0=
- dev-libs/libxml2:2=
- )
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
- numa? ( sys-process/numactl )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( sys-libs/pam:0= )
- s3? ( net-misc/curl )
- systemd? ( sys-apps/systemd:= )
- )
- systemtap? ( >=dev-util/systemtap-1.3:0= )
- tcmalloc? ( dev-util/google-perftools:0= )
- yassl? ( net-libs/gnutls:0= )
- !yassl? (
- >=dev-libs/openssl-1.0.0:0=
- )
-"
-BDEPEND="virtual/yacc
- || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-"
-DEPEND="${COMMON_DEPEND}
- server? (
- extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
- test? ( acct-group/mysql acct-user/mysql )
- )
- static? ( sys-libs/ncurses[static-libs] )
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
- !dev-db/mariadb:0
- !dev-db/mariadb:5.5
- !dev-db/mariadb:10.1
- !dev-db/mariadb:10.2
- !dev-db/mariadb:10.3
- !dev-db/mariadb:10.4
- !=virtual/jre-1.6 ) )
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-26*
- sst-rsync? ( sys-process/lsof )
- sst-mariabackup? ( net-misc/socat[ssl] )
- )
- !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
- )
- perl? (
- !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes
- )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=""
- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
- MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1)
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//' \
- | tail -n1)
- fi
- fi
- if [[ -z "${MY_DATADIR}" ]] ; then
- MY_DATADIR="${MY_LOCALSTATEDIR}"
- einfo "Using default MY_DATADIR"
- fi
- elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
- if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
- if [[ -e "${MY_DATADIR}" ]] ; then
- # If you get this and you're wondering about it, see bug #207636
- elog "MySQL datadir found in ${MY_DATADIR}"
- elog "A new one will not be created."
- PREVIOUS_DATADIR="yes"
- else
- PREVIOUS_DATADIR="no"
- fi
- export PREVIOUS_DATADIR
- fi
- else
- if [[ ${EBUILD_PHASE} == "config" ]]; then
- local new_MY_DATADIR
- new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
- | sed -ne '/datadir/s|^--datadir=||p' \
- | tail -n1)
-
- if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
- ewarn "MySQL MY_DATADIR has changed"
- ewarn "from ${MY_DATADIR}"
- ewarn "to ${new_MY_DATADIR}"
- MY_DATADIR="${new_MY_DATADIR}"
- fi
- fi
- fi
-
- export MY_SHAREDSTATEDIR MY_SYSCONFDIR
- export MY_LOCALSTATEDIR MY_LOGDIR
- export MY_DATADIR
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- local GCC_MAJOR_SET=$(gcc-major-version)
- local GCC_MINOR_SET=$(gcc-minor-version)
-
- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
- # non x86{,_64} arches
- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
- eerror "${PN} needs to be built with gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-
- if has test ${FEATURES} ; then
- # Bug #213475 - MySQL _will_ object strenuously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! has userpriv ${FEATURES} ; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- fi
- fi
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
-}
-
-src_prepare() {
- eapply "${WORKDIR}"/mariadb-patches
-
- eapply_user
-
- _disable_plugin() {
- echo > "${S}/plugin/${1}/CMakeLists.txt" || die
- }
- _disable_engine() {
- echo > "${S}/storage/${1}/CMakeLists.txt" || die
- }
-
- if use jemalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd jemalloc)" >> "${S}/sql/CMakeLists.txt"
- elif use tcmalloc; then
- echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> "${S}/sql/CMakeLists.txt"
- fi
-
- local plugin
- local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
- locale_info qc_info server_audit sql_errlog auth_ed25519 )
- local test_plugins=( audit_null auth_examples daemon_example fulltext
- debug_key_management example_key_management versioning )
- if ! use server; then # These plugins are for the server
- for plugin in "${server_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- fi
-
- if ! use test; then # These plugins are only used during testing
- for plugin in "${test_plugins[@]}" ; do
- _disable_plugin "${plugin}"
- done
- _disable_engine test_sql_discovery
- echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
- fi
-
- _disable_engine example
-
- if ! use oqgraph ; then # avoids extra library checks
- _disable_engine oqgraph
- fi
-
- if use mroonga ; then
- # Remove the bundled groonga
- # There is no CMake flag, it simply checks for existance
- rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
- else
- _disable_engine mroonga
- fi
-
- # Fix static bindings in galera replication
- sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
- "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
- sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
- "${S}"/wsrep-lib/src/CMakeLists.txt || die
-
- # Fix galera_recovery.sh script
- sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
- scripts/galera_recovery.sh || die
-
- sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
- "${S}"/scripts/mysql_install_db.sh || die
-
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- # Bug #114895, bug #110149
- filter-flags "-O" "-O[01]"
-
- # It fails on alpha without this
- use alpha && append-ldflags "-Wl,--no-relax"
-
- append-cxxflags -felide-constructors
-
- # bug #283926, with GCC4.4, this is required to get correct behavior.
- append-flags -fno-strict-aliasing
-
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- # debug hack wrt #497532
- mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX}/etc/mysql"
- -DINSTALL_BINDIR=bin
- -DINSTALL_DOCDIR=share/doc/${PF}
- -DINSTALL_DOCREADMEDIR=share/doc/${PF}
- -DINSTALL_INCLUDEDIR=include/mysql
- -DINSTALL_INFODIR=share/info
- -DINSTALL_LIBDIR=$(get_libdir)
- -DINSTALL_MANDIR=share/man
- -DINSTALL_MYSQLSHAREDIR=share/mariadb
- -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
- -DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
- -DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
- -DWITH_COMMENT="Gentoo Linux ${PF}"
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
- -DWITH_LIBEDIT=0
- -DWITH_ZLIB=system
- -DWITHOUT_LIBWRAP=1
- -DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DWITH_DEFAULT_COMPILER_OPTIONS=0
- -DWITH_DEFAULT_FEATURE_SET=0
- -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
- # The build forces this to be defined when cross-compiling. We pass it
- # all the time for simplicity and to make sure it is actually correct.
- -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
- -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
- -DCONC_WITH_EXTERNAL_ZLIB=YES
- -DWITH_EXTERNAL_ZLIB=YES
- -DSUFFIX_INSTALL_DIR=""
- -DWITH_UNITTEST=OFF
- -DWITHOUT_CLIENTLIBS=YES
- -DCLIENT_PLUGIN_DIALOG=OFF
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
- -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
- -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
- -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
- )
- if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
- else
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
- fi
-
- if ! use yassl ; then
- mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
- else
- mycmakeargs+=( -DWITH_SSL=bundled )
- fi
-
- # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
- mycmakeargs+=(
- -DWITH_READLINE=$(usex bindist 1 0)
- -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
- -DENABLE_DTRACE=$(usex systemtap)
- )
-
- if use server ; then
-
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- mycmakeargs+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO
- )
- fi
-
- mycmakeargs+=(
- -DWITH_PCRE=system
- -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_S3=$(usex s3 YES NO)
- -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- # Build failure and autodep wrt bug 639144
- -DCONNECT_WITH_MONGO=OFF
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
- -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
- -DWITH_MARIABACKUP=$(usex backup ON OFF)
- -DWITH_LIBARCHIVE=$(usex backup ON OFF)
- -DINSTALL_SQLBENCHDIR=""
- -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
- # systemd is only linked to for server notification
- -DWITH_SYSTEMD=$(usex systemd yes no)
- -DWITH_NUMA=$(usex numa ON OFF)
- )
-
- if use test ; then
- # This is needed for the new client lib which tests a real, open server
- mycmakeargs+=( -DSKIP_TESTS=ON )
- fi
-
- if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
- ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
- ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
- ewarn "You MUST file bugs without these variables set."
-
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
-
- elif ! use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
- fi
- mycmakeargs+=(
- -DEXTRA_CHARSETS=all
- -DMYSQL_USER=mysql
- -DDISABLE_SHARED=$(usex static YES NO)
- -DWITH_DEBUG=$(usex debug)
- -DWITH_EMBEDDED_SERVER=OFF
- -DWITH_PROFILING=$(usex profiling)
- )
-
- if use static; then
- mycmakeargs+=( -DWITH_PIC=1 )
- fi
-
- if use jemalloc || use tcmalloc ; then
- mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
- fi
-
- # Storage engines
- mycmakeargs+=(
- -DWITH_ARCHIVE_STORAGE_ENGINE=1
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1
- -DWITH_CSV_STORAGE_ENGINE=1
- -DWITH_HEAP_STORAGE_ENGINE=1
- -DWITH_INNOBASE_STORAGE_ENGINE=1
- -DWITH_MYISAMMRG_STORAGE_ENGINE=1
- -DWITH_MYISAM_STORAGE_ENGINE=1
- -DWITH_PARTITION_STORAGE_ENGINE=1
- )
-
- else
- mycmakeargs+=(
- -DWITHOUT_SERVER=1
- -DWITH_EMBEDDED_SERVER=OFF
- -DEXTRA_CHARSETS=none
- -DINSTALL_SQLBENCHDIR=
- -DWITH_SYSTEMD=no
- )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- _disable_test() {
- local rawtestname bug reason
- rawtestname="${1}" ; shift
- bug="${1}" ; shift
- reason="${@}"
- ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
- echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
- }
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if ! use server ; then
- einfo "Skipping server tests due to minimal build."
- return 0
- fi
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- if [[ -z "${MTR_PARALLEL}" ]] ; then
- local -x MTR_PARALLEL=$(makeopts_jobs)
-
- if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
- # Running multiple tests in parallel usually require higher ulimit
- # and fs.aio-max-nr setting. In addition, tests like main.multi_update
- # are known to hit timeout when system is busy.
- # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
- # using "auto".
- local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
- info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
- einfo "${info_msg}"
- unset info_msg
- MTR_PARALLEL=4
- fi
- else
- einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
- fi
-
- # Try to increase file limits to increase test coverage
- if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
- # Upper limit comes from parts.partition_* tests
- ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
- if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
- # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
- ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
- if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
- ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
- else
- einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
- fi
- else
- einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
- fi
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log} || die
-
- cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
-
- local -a disabled_tests
- disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
- disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
- disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
- disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
- disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
- disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
- disabled_tests+=( "mariabackup.*;0;Broken test suite" )
- disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
- disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
- disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
- disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
- disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
-
- if ! use latin1 ; then
- disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
- disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
- disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
- fi
-
- local test_infos_str test_infos_arr
- for test_infos_str in "${disabled_tests[@]}" ; do
- IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
- if [[ ${#test_infos_arr[@]} != 3 ]] ; then
- die "Invalid test data set, not matching format: ${test_infos_str}"
- fi
-
- _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
- done
- unset test_infos_str test_infos_arr
-
- # run mysql-test tests
- pushd "${TESTDIR}" &>/dev/null || die
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
- retstatus_tests=$?
-
- popd &>/dev/null || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
-
-src_install() {
- cmake_src_install
-
- # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
- if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
- rm "${ED}/usr/include/mysql/server/private/config.h" || die
- fi
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Convenience links
- einfo "Making Convenience links for mysqlcheck multi-call binary"
- dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
- dosym "mysqlcheck" "/usr/bin/mysqlrepair"
- dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
- # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
- if [[ -d "${ED}/usr/data" ]] ; then
- rm -Rf "${ED}/usr/data" || die
- fi
-
- # Unless they explicitly specific USE=test, then do not install the
- # testsuite. It DOES have a use to be installed, esp. when you want to do a
- # validation of your database configuration after tuning it.
- if ! use test ; then
- rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
- fi
-
- # Configuration stuff
- einfo "Building default configuration ..."
- insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
-
- if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
- einfo "Including support files and sample configurations"
- docinto "support-files"
- local script
- for script in \
- "${S}"/support-files/magic
- do
- [[ -f "$script" ]] && dodoc "${script}"
- done
-
- docinto "scripts"
- for script in "${S}"/scripts/mysql* ; do
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
- done
- # Manually install supporting files that conflict with other packages
- # but are needed for galera and initial installation
- exeinto /usr/libexec/mariadb
- doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
-
- if use pam ; then
- keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
- fi
- fi
-
- # Remove mytop if perl is not selected
- if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
- rm -f "${ED}/usr/bin/mytop" || die
- fi
-
- # Fix a dangling symlink when galera is not built
- if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
- rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
- fi
-
- # Remove broken SST scripts that are incompatible
- local scriptremove
- for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
- if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
- rm "${ED}/usr/bin/${scriptremove}" || die
- fi
- done
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- # Create log directory securely if it does not exist
- [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
-
- if use server ; then
- if use pam; then
- einfo
- elog "This install includes the PAM authentication plugin."
- elog "To activate and configure the PAM plugin, please read:"
- elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
- einfo
- chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
- fi
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo
- elog "You might want to run:"
- elog "\"emerge --config =${CATEGORY}/${PF}\""
- elog "if this is a new install."
- elog
- elog "If you are switching server implentations, you should run the"
- elog "mysql_upgrade tool."
- einfo
- else
- einfo
- elog "If you are upgrading major versions, you should run the"
- elog "mysql_upgrade tool."
- einfo
- fi
-
- if use galera ; then
- einfo
- elog "Be sure to edit the my.cnf file to activate your cluster settings."
- elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
- elog "The first time the cluster is activated, you should add"
- elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
- elog "This option should then be removed for subsequent starts."
- einfo
- if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- local rver
- for rver in ${REPLACING_VERSIONS} ; do
- if ver_test "${rver}" -lt "10.4.0" ; then
- ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
- ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
- ewarn "for more information"
- fi
- done
- fi
- fi
- fi
-
- # Note about configuration change
- einfo
- elog "This version of mariadb reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/${PN}.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
- einfo
-}
-
-pkg_config() {
- _getoptval() {
- local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
- local section="$1"
- local flag="--${2}="
- local extra_options="${3}"
- "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
- }
- local old_MY_DATADIR="${MY_DATADIR}"
- local old_HOME="${HOME}"
- # my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX}/root
-
- # Make sure the vars are correctly initialized
- mysql_init_vars
-
- [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
- if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
- die "Minimal builds do NOT include the MySQL server"
- fi
-
- if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
- local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
- MY_DATADIR_s="${MY_DATADIR_s%%/}"
- local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
- old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
- if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
- ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
- else
- elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
- mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
- || die "Moving MY_DATADIR failed"
- fi
- else
- ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
- if [[ -d "${MY_DATADIR_s}" ]]; then
- ewarn "Attempting to use ${MY_DATADIR_s}"
- else
- eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
- fi
- fi
- fi
-
- local pwd1="a"
- local pwd2="b"
- local maxtry=15
-
- if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
- local tmp_mysqld_password_source=
-
- for tmp_mysqld_password_source in mysql client; do
- einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
- if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
- ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
- MYSQL_ROOT_PASSWORD=
- continue
- fi
-
- einfo "Found password in '${tmp_mysqld_password_source}' section!"
- break
- fi
- done
-
- # Sometimes --show is required to display passwords in some implementations of my_print_defaults
- if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
- MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
- fi
-
- unset tmp_mysqld_password_source
- fi
- MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
- # These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
- MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
- MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
- if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
- einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
- fi
- if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
- einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
- fi
- if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
- einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
- install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
- fi
-
- if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
- ewarn "You have already a MySQL database in place."
- ewarn "(${ROOT}/${MY_DATADIR}/*)"
- ewarn "Please rename or delete it if you wish to replace it."
- die "MySQL database already exists!"
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-
- einfo "Please provide a password for the mysql 'root'@'localhost' user now"
- einfo "or through the ${HOME}/.my.cnf file."
- ewarn "Avoid [\"'\\_%] characters in the password"
- einfo "Not entering a password defaults to UNIX authentication"
- read -rsp " >" pwd1 ; echo
-
- if [[ -n "${pwd1}" ]] ; then
- einfo "Retype the password"
- read -rsp " >" pwd2 ; echo
-
- if [[ "x$pwd1" != "x$pwd2" ]] ; then
- die "Passwords are not the same"
- fi
-
- MYSQL_ROOT_PASSWORD="${pwd1}"
- fi
-
- unset pwd1 pwd2
- fi
-
- local options
- local sqltmp="$(emktemp)"
-
- # Fix bug 446200. Don't reference host my.cnf, needs to come first,
- # see https://bugs.mysql.com/bug.php?id=31312
- use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
- # Figure out which options we need to disable to do the setup
- local helpfile="${TMPDIR}/mysqld-help"
- "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
- for opt in host-cache name-resolve networking slave-start \
- federated ssl log-bin relay-log slow-query-log external-locking \
- log-slave-updates \
- ; do
- optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
- egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
- done
-
- einfo "Creating the mysql database and setting proper permissions on it ..."
-
- # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
- PID_DIR="${EROOT}/var/run/mysqld"
- if [[ ! -d "${PID_DIR}" ]]; then
- install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
- fi
-
- if [[ ! -d "${MY_DATADIR}" ]]; then
- install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
- fi
-
- pushd "${TMPDIR}" &>/dev/null || die
-
- # Filling timezones, see
- # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
- "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
- local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
- [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
- cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
- einfo "Command: ${cmd[*]}"
- su -s /bin/sh -c "${cmd[*]}" mysql \
- >"${TMPDIR}"/mysql_install_db.log 2>&1
- if [[ $? -ne 0 ]]; then
- grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
- fi
- popd &>/dev/null || die
- [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
- || die "MySQL databases not installed"
-
- if [[ -z ${sqltmp} && -z ${MYSQL_ROOT_PASSWORD} ]] ; then
- einfo "Done"
- exit 0
- fi
-
- use prefix || options="${options} --user=mysql"
-
- local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
- local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
- local mysqld="${EROOT}/usr/sbin/mysqld \
- ${options} \
- --log-warnings=0 \
- --basedir=${EROOT}/usr \
- --datadir=${ROOT}/${MY_DATADIR} \
- --max_allowed_packet=8M \
- --net_buffer_length=16K \
- --socket=${socket} \
- --pid-file=${pidfile} \
- --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
- #einfo "About to start mysqld: ${mysqld}"
- ebegin "Starting mysqld"
- einfo "Command ${mysqld}"
- ${mysqld} &
- rc=$?
- while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
- maxtry=$((${maxtry}-1))
- echo -n "."
- sleep 1
- done
- eend $rc
-
- if ! [[ -S "${socket}" ]]; then
- die "Completely failed to start up mysqld with: ${mysqld}"
- fi
-
- if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
- ebegin "Setting root password"
- # Do this from memory, as we don't want clear text passwords in temp files
- local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}')"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -e "${sql}"
- unset sql
- eend $?
- fi
-
- if [[ -n "${sqltmp}" ]] ; then
- ebegin "Loading \"zoneinfo\", this step may require a few seconds"
- "${EROOT}/usr/bin/mysql" \
- "--socket=${socket}" \
- -hlocalhost \
- -uroot \
- --password="${MYSQL_ROOT_PASSWORD}" \
- mysql < "${sqltmp}"
- rc=$?
- eend $?
- [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
- fi
-
- # Stop the server and cleanup
- einfo "Stopping the server ..."
- kill $(< "${pidfile}" )
- rm -f "${sqltmp}"
- wait %1
- einfo "Done"
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 6c338f00e575..e711936f33c7 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -4,9 +4,11 @@ DIST sqlite-doc-3350100.zip 10175402 BLAKE2B c8ac8814837dc88320ae0f6973b5ec0b815
DIST sqlite-doc-3350200.zip 10182547 BLAKE2B f50b04495aa79eca1ce935c8a96fe83d0a415f15ec55fda0cd982d02b4473ba8f5175c97d9816de2b79526787bc958b3be5e1234994e5f00d8ee1b432627391e SHA512 7ef973b804d059cf00c759a0ae001b7714df0472398e7cd55e34f59222df816a36511cefd15fa99abf67dec4291ee6babbc12bd87855194608ff556a5c1182ae
DIST sqlite-doc-3350300.zip 10197905 BLAKE2B ffe3e800fa7c9066c6f180a5989cceb89dfff81729258278256901eee717872ef6993a8bb30ebb6c1de5a66c128009c21494ec9bf0011accdd6f8beef712213a SHA512 260981abaf54f452777e37e99474d100010ec2340c740f78445b7794fa17bcbb814e90f004f870d929a9ccab1d89417ee3d65ffe3b65dbf511ca1de7b6a6a4c8
DIST sqlite-doc-3350400.zip 10206227 BLAKE2B 82572a771e72e76149fc7ca4e3d5b6f268d6b2d441cc8a4c02be7f2062582b55cefd1577dbb3c77d2e932e93f1a0403f55a9ffc8b74f7eada06435ef23a6b065 SHA512 cc967b6625e0ae3ffb4a84f87a6efb5bc0e2d3cb2080e438c9e1ba3b8c2ba707612b8bdfc2bf3291ef2ad2836780127050762945a3ff7503f662cf30ab4fde4a
+DIST sqlite-doc-3350500.zip 10205830 BLAKE2B e078713786522f8da7984df6ddf62671c24ec5381cac88fe976c97fcdf4800cff8dc1a595df9c9010c687c9929cb5ab070957f8ccbc0b5e8bd7add88ae9a0514 SHA512 2da5357623f4db7003f46ec7ea8bdd8a794ad6e1be9a25a8ebccfe5222da43eabc32d9d17acfd7766aa4cf1fd010e476a8087fab78ac6f6596c7c5b8a06de685
DIST sqlite-src-3340100.zip 12623711 BLAKE2B 08c98d0c56d46fe909f449f322002ae4d69fd952930d2f04514988a939b31744a13aea85935d84bc05db52faca1aad6a70d7c31e7da0e396bb649685a49699bb SHA512 5ed02fe609b3d08c3297cc43b21e6ee3f56fb51a6616ac391a0e50cd1677dbad03c6bf9bf9c8409cf94b83b16fe6b6e4a112640b18c7d4fd95328066da3c3943
DIST sqlite-src-3350000.zip 12814378 BLAKE2B f77880bfb335da078623841f9d9d9fc690085630757d8d8e3d40d42646902f809febf8dcc5048d38be0e2d74c0114c35f09789bc261e51d49f9685201f6d1297 SHA512 4b77d963092a6aed61b50e59450edf2af187f16b185b05ca54d81c3eecf71b1cb9bc2883a8aadeb971fcebe343fa430ea788aedb77e3712c8b39d4892c93a797
DIST sqlite-src-3350100.zip 12814875 BLAKE2B bc4f6913ce93c32e1c6fbd39f45666a14476096b09f7534047aee56cbb18e949bf5225c080c813281a0abae9198a35165161393db39df0c2af2a92138b4604d9 SHA512 004bcca9c2ae883b05d8f15c8bf28a12fd2fdf9527d1560d137f8e2570c153d14ea5405c500d0e79966a3881a516df4d9ed07be751712f1584df411e86c60977
DIST sqlite-src-3350200.zip 12815298 BLAKE2B a65034fc59c32e950b5337ef4fe1b2476190fe6f1272494b12f9e1d048aac759ac31e7c0f252774c850b0f313bf44b34a97fc563c049e30d2a896f262b199dce SHA512 d5382bf31d812bc51533d28a583c78d3f389b1ecbe1f9f30cc755059f2867f832c0529e9f97b090be5c5bc855c45611b220b8c29b5648c451490566a70cc5122
DIST sqlite-src-3350300.zip 12817388 BLAKE2B 5b07d15ec5ed934ffa776ae4e079d4b4a3d9c91c526577683c7eea4f95ba62738d82b6fd26f1c10560a6f87fd02b070e5786bcc45e908a338a316071009e5b92 SHA512 5b994833e37e5f7579f4e3eefbbadd5b2a3d691b5f662b7d3dc2bbf80ff1cdaf89262ce5612513fcb2daa0a7d1db3de871dfc462f9d162c954593ff7f4ad90fd
DIST sqlite-src-3350400.zip 12818802 BLAKE2B c671c5666d754c763e70f20e742e017320ceb27e1a8668e8713dbe5257aa0842ba8d7343e535be06eefd371dc2bae9ded6718194b7891e46c6eb4081531b4944 SHA512 3a3fa1df47b8f148fffbb056522e0e671d9e295c154173124208b7b1348d321eba410a40fbdea02fdc1af3b55cdfce37044ed09f328502fc50f42f5ecabc1236
+DIST sqlite-src-3350500.zip 12819198 BLAKE2B 0f0d39cd663d78a3c698df62dd533019c32244e8c998e625354cb069f5839cc374476b825e2e2a6408916301333a9954c0c7b9cbab5493522fdffe8859f9b6a5 SHA512 f9afd11b3c42a8241f91e2ecafc3928e7391cc0f1fbee236b8122c2d3ca922d0c82d2605968b131351b6c5e38f983f8eed29b86c94cfa72799e2387b3b3db561
diff --git a/dev-db/sqlite/sqlite-3.34.1.ebuild b/dev-db/sqlite/sqlite-3.34.1.ebuild
index 623578707fa3..6c812d3550d0 100644
--- a/dev-db/sqlite/sqlite-3.34.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.34.1.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.0.ebuild b/dev-db/sqlite/sqlite-3.35.0.ebuild
index e1762793c342..c55b60d754d1 100644
--- a/dev-db/sqlite/sqlite-3.35.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.0.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.1.ebuild b/dev-db/sqlite/sqlite-3.35.1.ebuild
index e1762793c342..c55b60d754d1 100644
--- a/dev-db/sqlite/sqlite-3.35.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.1.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.2.ebuild b/dev-db/sqlite/sqlite-3.35.2.ebuild
index e1762793c342..c55b60d754d1 100644
--- a/dev-db/sqlite/sqlite-3.35.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.2.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.3.ebuild b/dev-db/sqlite/sqlite-3.35.3.ebuild
index e1762793c342..c55b60d754d1 100644
--- a/dev-db/sqlite/sqlite-3.35.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.3.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.4.ebuild b/dev-db/sqlite/sqlite-3.35.4.ebuild
index e1762793c342..c55b60d754d1 100644
--- a/dev-db/sqlite/sqlite-3.35.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.4.ebuild
@@ -320,12 +320,6 @@ multilib_src_configure() {
options+=(--disable-tcl)
fi
- if [[ "${CHOST}" == *-mint* ]]; then
- # sys/mman.h not available in MiNTLib.
- # https://sqlite.org/compile.html#omit_wal
- append-cppflags -DSQLITE_OMIT_WAL
- fi
-
if [[ "${ABI}" == "x86" ]]; then
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
append-cflags -mfpmath=sse
diff --git a/dev-db/sqlite/sqlite-3.35.5.ebuild b/dev-db/sqlite/sqlite-3.35.5.ebuild
new file mode 100644
index 000000000000..c55b60d754d1
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.35.5.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+ DOC_PV="${SRC_PV}"
+ # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://sqlite.org/2021/${PN}-src-${SRC_PV}.zip
+ doc? ( https://sqlite.org/2021/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+ PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+ BDEPEND=">=dev-lang/tcl-8.6:0
+ dev-vcs/fossil"
+else
+ BDEPEND="app-arch/unzip
+ >=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+ icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+ S="${WORKDIR}/${PN}"
+else
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_fossil_fetch() {
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ local repo_id="${1}"
+ local repo_uri="${2}"
+
+ local -x FOSSIL_HOME="${HOME}"
+
+ mkdir -p "${T}/fossil/${repo_id}" || die
+ pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+ if [[ -n "${EVCS_OFFLINE}" ]]; then
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+ fi
+ else
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+ fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+ einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+ fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+ echo
+ fi
+
+ (
+ addwrite "${distdir}"
+ mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+ cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+ )
+ fi
+
+ popd > /dev/null || die
+}
+
+_fossil_checkout() {
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ local repo_id="${1}"
+ local branch_or_commit="${2}"
+ local target_directory="${3}"
+
+ local -x FOSSIL_HOME="${HOME}"
+
+ if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+ die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+ fi
+
+ if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+ mkdir -p "${T}/fossil/${repo_id}" || die
+ cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+ fi
+
+ mkdir "${target_directory}" || die
+ pushd "${target_directory}" > /dev/null || die
+
+ einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+ fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+ echo
+
+ popd > /dev/null || die
+}
+
+fossil_fetch() {
+ local repo_id="${1}"
+ local repo_uri="${2}"
+ local target_directory="${3}"
+
+ local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+ _fossil_fetch "${repo_id}" "${repo_uri}"
+ _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+ if use doc; then
+ fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+ fi
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/"${PN}-3.35.0-build_{1.1,1.2,2.1,2.2}.patch
+
+ eapply_user
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+ local options=()
+
+ options+=(
+ --enable-load-extension
+ --enable-threadsafe
+ )
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support bytecode and tables_used virtual tables.
+ # https://sqlite.org/compile.html#enable_bytecode_vtab
+ # https://sqlite.org/bytecodevtab.html
+ append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+ # Support column metadata functions.
+ # https://sqlite.org/compile.html#enable_column_metadata
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support sqlite_dbpage virtual table.
+ # https://sqlite.org/compile.html#enable_dbpage_vtab
+ # https://sqlite.org/dbpage.html
+ append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/compile.html#enable_dbstat_vtab
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support sqlite3_serialize() and sqlite3_deserialize() functions.
+ # https://sqlite.org/compile.html#enable_deserialize
+ # https://sqlite.org/c3ref/serialize.html
+ # https://sqlite.org/c3ref/deserialize.html
+ append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+ # Support comments in output of EXPLAIN.
+ # https://sqlite.org/compile.html#enable_explain_comments
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/compile.html#enable_fts3
+ # https://sqlite.org/compile.html#enable_fts3_parenthesis
+ # https://sqlite.org/compile.html#enable_fts4
+ # https://sqlite.org/compile.html#enable_fts5
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support JSON1 extension.
+ # https://sqlite.org/compile.html#enable_json1
+ # https://sqlite.org/json1.html
+ append-cppflags -DSQLITE_ENABLE_JSON1
+
+ # Support memsys5 memory allocator.
+ # https://sqlite.org/compile.html#enable_memsys5
+ # https://sqlite.org/malloc.html#memsys5
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+ # Support sqlite3_normalized_sql() function.
+ # https://sqlite.org/c3ref/expanded_sql.html
+ append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+ # Support sqlite_offset() function.
+ # https://sqlite.org/compile.html#enable_offset_sql_func
+ # https://sqlite.org/lang_corefunc.html#sqlite_offset
+ append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+ # Support pre-update hook functions.
+ # https://sqlite.org/compile.html#enable_preupdate_hook
+ # https://sqlite.org/c3ref/preupdate_count.html
+ append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/compile.html#enable_rbu
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/compile.html#enable_rtree
+ # https://sqlite.org/compile.html#enable_geopoly
+ # https://sqlite.org/rtree.html
+ # https://sqlite.org/geopoly.html
+ append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+ # Support Session extension.
+ # https://sqlite.org/compile.html#enable_session
+ # https://sqlite.org/sessionintro.html
+ append-cppflags -DSQLITE_ENABLE_SESSION
+
+ # Support scan status functions.
+ # https://sqlite.org/compile.html#enable_stmt_scanstatus
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support sqlite_stmt virtual table.
+ # https://sqlite.org/compile.html#enable_stmtvtab
+ # https://sqlite.org/stmt.html
+ append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+ # Support unknown() function.
+ # https://sqlite.org/compile.html#enable_unknown_sql_function
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+ # Support unlock notification.
+ # https://sqlite.org/compile.html#enable_unlock_notify
+ # https://sqlite.org/c3ref/unlock_notify.html
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+ # https://sqlite.org/compile.html#enable_update_delete_limit
+ # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+ # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+ append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+ # Support soundex() function.
+ # https://sqlite.org/compile.html#soundex
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # Support URI filenames.
+ # https://sqlite.org/compile.html#use_uri
+ # https://sqlite.org/uri.html
+ append-cppflags -DSQLITE_USE_URI
+
+ # debug USE flag.
+ options+=($(use_enable debug))
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if use readline; then
+ options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/compile.html#secure_delete
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+ options+=(
+ --enable-tcl
+ --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+ )
+ else
+ options+=(--disable-tcl)
+ fi
+
+ if [[ "${ABI}" == "x86" ]]; then
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+ append-cflags -mfpmath=sse
+ else
+ append-cflags -ffloat-store
+ fi
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+ fi
+
+ if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+ emake tclsqlite3.c
+
+ local build_directory="$(pwd)"
+ build_directory="${build_directory##*/}"
+
+ mkdir "${WORKDIR}/${PN}-doc-build" || die
+ pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+ emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+ rmdir doc/matrix{/*,} || die
+
+ popd > /dev/null || die
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool changeset sqlite3-changeset
+ install_tool dbdump sqlite3-db-dump
+ install_tool dbhash sqlite3-db-hash
+ install_tool dbtotxt sqlite3-db-to-txt
+ install_tool index_usage sqlite3-index-usage
+ install_tool rbu sqlite3-rbu
+ install_tool scrub sqlite3-scrub
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showshm sqlite3-show-shm
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+ install_tool sqlite3_checker sqlite3-checker
+ install_tool sqlite3_expert sqlite3-expert
+ install_tool sqltclsh sqlite3-tclsh
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete || die
+
+ doman sqlite3.1
+
+ if use doc; then
+ if [[ "${PV}" == "9999" ]]; then
+ pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+ else
+ pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+ fi
+
+ find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+ if [[ "${PV}" != "9999" ]]; then
+ rm search search.d/admin || die
+ rmdir search.d || die
+ find -name "*~" -delete || die
+ fi
+
+ (
+ docinto html
+ dodoc -r *
+ )
+
+ popd > /dev/null || die
+ fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3070074c769b..d02bb438d885 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 5f921311ff48..90a7eed0092f 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
LICENSE="JDOM"
SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
RDEPEND="
${CDEPEND}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index c6cb75e6c81a..cf89398a1afb 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
KEYWORDS=""
IUSE=""
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2f164b97508b..ffe78b9e7b14 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index a4c6ea4f7f26..cc5dba61485e 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,8 +1,4 @@
-DIST erlang-23.2.7.tar.gz 56600356 BLAKE2B 84daf8810716ac02b50527805b834f9f2ae83fc7ebd89a22e4cba34133a52347f53a72ba65614b492bf1932d0dc47eb68c9ce8731cdfaeecdf57b9f20bde32e8 SHA512 1e94b641644edb1edc3d15679222dd5d198abf1cae6daa4b91304317f8df21514029971f208767396625c0a0be7107c357c9ef80974c9865113a760aa2655220
DIST erlang-23.3.1.tar.gz 56654422 BLAKE2B b1ccd870d4a47f12d1a65b424d6c6b0f59a4654c0779c595fb28fdc2d3e179bb9b12d2473770b239b65665b2f6a3281d239f9fb3d6b86548df3ee69fce8fe5ed SHA512 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0
-DIST erlang-23.3.2.tar.gz 56662450 BLAKE2B 70ead26fe6a416c1b89bc9f8ad8d368bd38d994f9aa9967c916ccbef25aac7a059d89422e0d3b03397b08f1376c9e2eef4e827ecaa9d1114c453771e51acb490 SHA512 bb3dc1d827314b71f7e4da2082681e449859a69589d566a810baf554131e239ad3fe0555f352d69506467162016d6c6864abb20926843ee4da5876b26650810e
DIST erlang-23.3.3.tar.gz 56671339 BLAKE2B 19455670d411adfb6a34a42e27ee8ff9eda052c9e096404f1d1061376ffecb136b912cb89a21cb84a7758c925ccccee5bbbb4ca31ac6b164af4813b0a5e9e747 SHA512 191243df10e0ee03db1a16c94253fefd4b008915464b2966f6fbe93faae3053b2a8950297054a6a8554c180fd3fcc18eda16e2f87e0c1a7a73570e753ec557d4
-DIST erlang_doc_html_23.2.tar.gz 36537148 BLAKE2B b19d3fb5836b50512db6913ccb9116bc06ef4677c9514db89714ac72a9e7569b2c52612c357ccbf9a12610000885cbc8a43cc17f80c533a3c65af89c1b592ba6 SHA512 0d334dfe46ecffd6ff720d176c4514e2d49ba1b5feccd80f8392a8335100a6c289207431d2c0da02043c923de083290f9fd23726a1d1481508acdd7596f67ea4
DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
-DIST erlang_doc_man_23.2.tar.gz 1386417 BLAKE2B 91fb2646461330c2f3793e7819e4c77ba9259366098b710fd102ffbcbcf38fa84ad720613313e3c59c1d419aaddd5a1a85d26c5d41a71d6692d428a494f57012 SHA512 464fa2c3608a6c096a241e5fc2cee710ef51394b169e3b3ce3ab5f69d847437c54780d4afc1a799d13f88ea88ac64056b19bff4d927e1e6bbe54a773b0ccd89d
DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
diff --git a/dev-lang/erlang/erlang-23.2.7.ebuild b/dev-lang/erlang/erlang-23.2.7.ebuild
deleted file mode 100644
index fd509078eb66..000000000000
--- a/dev-lang/erlang/erlang-23.2.7.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
- http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
- doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code. See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
- acct-group/epmd
- acct-user/epmd
- sys-libs/ncurses:0
- sys-libs/zlib
- emacs? ( >=app-editors/emacs-23.1:* )
- java? ( >=virtual/jdk-1.8:* )
- odbc? ( dev-db/unixODBC )
- sctp? ( net-misc/lksctp-tools )
- ssl? ( >=dev-libs/openssl-0.9.7d:0= )
- systemd? ( sys-apps/systemd )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/18.2.1-wx3.0.patch
- "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
- default
-
- ./otp_build autoconf || die
-}
-
-src_configure() {
- use wxwidgets && setup-wxwidgets
-
- local myconf=(
- --disable-builtin-zlib
- $(use_enable hipe)
- $(use_enable kpoll kernel-poll)
- $(use_with java javac)
- $(use_enable sctp)
- $(use_with ssl ssl "${EPREFIX}"/usr)
- $(use_enable ssl dynamic-ssl-lib)
- $(use_enable systemd)
- $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
- )
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use emacs ; then
- pushd lib/tools/emacs &>/dev/null || die
- elisp-compile *.el
- popd &>/dev/null || die
- fi
-}
-
-extract_version() {
- local path="$1"
- local var_name="$2"
- sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
- local erl_libdir_rel="$(get_libdir)/erlang"
- local erl_libdir="/usr/${erl_libdir_rel}"
- local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
- local erl_erts_ver="$(extract_version erts VSN)"
- local my_manpath="/usr/share/${PN}/man"
-
- [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
- [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
- emake INSTALL_PREFIX="${D}" install
-
- if use doc ; then
- # Note: we explicitly install docs into:
- # /usr/share/doc/${PF}/{doc,lib,erts-*}
- # To maintain that layout we gather everything in 'html-docs'.
- # See bug #684376.
- mkdir html-docs || die
- mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
- local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
- docompress -x /usr/share/doc/${PF}
- else
- local DOCS=("README.md")
- fi
-
- einstalldocs
-
- dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
- dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
- dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
- dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
- dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
- ## Clean up the no longer needed files
- rm "${ED}/${erl_libdir}/Install" || die
-
- insinto "${my_manpath}"
- doins -r "${WORKDIR}"/man/*
- # extend MANPATH, so the normal man command can find it
- # see bug 189639
- newenvd - "90erlang" <<-_EOF_
- MANPATH="${my_manpath}"
- _EOF_
-
- if use emacs ; then
- elisp-install erlang lib/tools/emacs/*.{el,elc}
- sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
- elisp-site-file-install "${T}/${SITEFILE}"
- fi
-
- newinitd "${FILESDIR}"/epmd.init-r2 epmd
- newconfd "${FILESDIR}"/epmd.confd-r2 epmd
- use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-23.3.2.ebuild b/dev-lang/erlang/erlang-23.3.2.ebuild
deleted file mode 100644
index 257dbb6d4a2c..000000000000
--- a/dev-lang/erlang/erlang-23.3.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
- http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
- doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code. See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
- acct-group/epmd
- acct-user/epmd
- sys-libs/ncurses:0
- sys-libs/zlib
- emacs? ( >=app-editors/emacs-23.1:* )
- java? ( >=virtual/jdk-1.8:* )
- odbc? ( dev-db/unixODBC )
- sctp? ( net-misc/lksctp-tools )
- ssl? ( >=dev-libs/openssl-0.9.7d:0= )
- systemd? ( sys-apps/systemd )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/18.2.1-wx3.0.patch
- "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
- default
-
- ./otp_build autoconf || die
-}
-
-src_configure() {
- use wxwidgets && setup-wxwidgets
-
- local myconf=(
- --disable-builtin-zlib
- $(use_enable hipe)
- $(use_enable kpoll kernel-poll)
- $(use_with java javac)
- $(use_enable sctp)
- $(use_with ssl ssl "${EPREFIX}"/usr)
- $(use_enable ssl dynamic-ssl-lib)
- $(use_enable systemd)
- $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
- )
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use emacs ; then
- pushd lib/tools/emacs &>/dev/null || die
- elisp-compile *.el
- popd &>/dev/null || die
- fi
-}
-
-extract_version() {
- local path="$1"
- local var_name="$2"
- sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
- local erl_libdir_rel="$(get_libdir)/erlang"
- local erl_libdir="/usr/${erl_libdir_rel}"
- local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
- local erl_erts_ver="$(extract_version erts VSN)"
- local my_manpath="/usr/share/${PN}/man"
-
- [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
- [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
- emake INSTALL_PREFIX="${D}" install
-
- if use doc ; then
- # Note: we explicitly install docs into:
- # /usr/share/doc/${PF}/{doc,lib,erts-*}
- # To maintain that layout we gather everything in 'html-docs'.
- # See bug #684376.
- mkdir html-docs || die
- mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
- local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
- docompress -x /usr/share/doc/${PF}
- else
- local DOCS=("README.md")
- fi
-
- einstalldocs
-
- dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
- dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
- dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
- dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
- dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
- ## Clean up the no longer needed files
- rm "${ED}/${erl_libdir}/Install" || die
-
- insinto "${my_manpath}"
- doins -r "${WORKDIR}"/man/*
- # extend MANPATH, so the normal man command can find it
- # see bug 189639
- newenvd - "90erlang" <<-_EOF_
- MANPATH="${my_manpath}"
- _EOF_
-
- if use emacs ; then
- elisp-install erlang lib/tools/emacs/*.{el,elc}
- sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
- elisp-site-file-install "${T}/${SITEFILE}"
- fi
-
- newinitd "${FILESDIR}"/epmd.init-r2 epmd
- newconfd "${FILESDIR}"/epmd.confd-r2 epmd
- use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
index 024329f0def8..c9826227a597 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
-
MY_PN=mozart2-stdlib
+inherit cmake
PATCHSET_VER="0"
@@ -23,14 +22,10 @@ RDEPEND=">=dev-lang/mozart-2.0.1"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
- eapply_user
-
- cmake-utils_src_prepare
+ cmake_src_prepare
}
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
index 09d87b133828..d469901f25b6 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils java-pkg-2 java-ant-2
+inherit cmake java-pkg-2 java-ant-2
PATCHSET_VER="1"
@@ -31,50 +31,46 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest:= )"
S="${WORKDIR}/${PN}2-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
- eapply_user
- touch "${S}"/stdlib/CMakeLists.txt
- touch "${S}"/vm/vm/test/gtest/CMakeLists.txt
+ touch stdlib/CMakeLists.txt || die
+ touch vm/vm/test/gtest/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DMOZART_BOOST_USE_STATIC_LIBS=OFF
- -DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi)
- )
+ -DEMACS=$(usex emacs "/usr/bin/emacs" "")
+ )
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
EANT_GENTOO_CLASSPATH="scala:2.12"
- cd "${S}"/bootcompiler
+ pushd bootcompiler > /dev/null || die
ANT_OPTS="-Xss2M" eant jar
+ popd > /dev/null || die
- cd "${S}"
- cmake-utils_src_compile
+ cmake_src_compile
}
src_test() {
- cmake-utils_src_compile vmtest platform-test
- cmake-utils_src_test -V
+ cmake_build vmtest platform-test
+ cmake_src_test -V
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
- cd "${BUILD_DIR}"
- dolib.so vm/vm/main/libmozartvm.so
- dolib.so vm/boostenv/main/libmozartvmboost.so
+ dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
+ dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
}
pkg_postinst() {
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5741964b2b2a..cb86df38ef7c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -4,5 +4,6 @@ DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d699
DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c0e653ad7ba27de441d26e049e62dc67b17d58dfe5755f31bdd157e349d47fd46a98699207729f8f4f747930ed1064ba2 SHA512 42ed00f5f6be40af59e02691ff439a048cccd96fb970cca0976209faa921af98a773cc4cb1466e164328350d58cb46950ffa8c6f2fddabbeb3e8819349b06849
DIST perl-5.32.0.tar.xz 12717336 BLAKE2B 4abad9f1ddabaad5f2bbfe8ab6d061aeb8c558e458d4bf1bcf737a8ecc1cf20f7dffaddd0bc867578b457787ec284fa81be3fae1edd7f72d58aeec7b5cd744e5 SHA512 1540247415893bbd94dfeede7b4fba6052688dc0bf27ced817f448246fcdc6e9a6486abc34577dec5b00bf02ed607b2d24ccd4977c3b3c51e8e6edfc0b81c760
DIST perl-5.32.1.tar.xz 12610988 BLAKE2B 9f89bcf9cffb245a0f2cb0afa17c25f092c84cc2f29bb1c744294c2f0393c72dc3beb9fcbe256cf252677b33bc594b294b3f6a4774ad9e30b771aceed1f4f147 SHA512 3443c75aea91f0fe3712fee576239f1946d2301b8f7390b690e2f5d070fe71af8f9fa7769e42086c2d33d5f84370f80368fa9350b4f10cc0ac3e6c1f6209d8f9
+DIST perl-5.34.0-RC1.tar.xz 12881680 BLAKE2B acb26d65b3a439676cb7cf9477d2590e33f24bc4d0f7af6b2069c81aab2c74b047ceae349ef58fa49ce2ed8668cf7eec1922498bd2db144d08968a4fd1b7d9a3 SHA512 fdf686349c00f637eb95691efadb5042f15bce8ec1174595869815761e779f616504d19d01d52a6d13ec444974e7d90bfdb15a83aa36d2acb840bf1ff7dc97d6
DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
diff --git a/dev-lang/perl/perl-5.34.0_rc1.ebuild b/dev-lang/perl/perl-5.34.0_rc1.ebuild
new file mode 100644
index 000000000000..c9b82bfa8462
--- /dev/null
+++ b/dev-lang/perl/perl-5.34.0_rc1.ebuild
@@ -0,0 +1,816 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.3.4
+PATCH_BASE="perl-5.32.0-patches-${PATCH_VER}"
+PATCH_DEV=kentnl
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+# Yes we can.
+PERL_SINGLE_SLOT=y
+
+if [[ "${PV##*.}" == "9999" ]]; then
+ DIST_VERSION=5.30.0
+else
+ DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+ SUBSLOT="${DIST_VERSION%-RC*}"
+else
+ SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+ mirror://cpan/src/5.0/${MY_P}.tar.xz
+ mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+ https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+ https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+ https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=""
+fi
+
+IUSE="berkdb debug doc gdbm ithreads minimal"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+ app-arch/bzip2
+ sys-libs/zlib
+ virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PDEPEND="
+ !minimal? (
+ >=app-admin/perl-cleaner-2.5
+ >=virtual/perl-File-Temp-0.230.400-r2
+ >=virtual/perl-Data-Dumper-2.154.0
+ virtual/perl-Test-Harness
+ )
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+ src_remove_dual perl-core/Archive-Tar 2.360.0 ptar ptardiff ptargrep
+ src_remove_dual perl-core/CPAN 2.270.0 cpan
+ src_remove_dual perl-core/Digest-SHA 6.20.0 shasum
+ src_remove_dual perl-core/Encode 3.60.0 enc2xs piconv
+ src_remove_dual perl-core/ExtUtils-MakeMaker 7.440.0 instmodsh
+ src_remove_dual perl-core/ExtUtils-ParseXS 3.400.0 xsubpp
+ src_remove_dual perl-core/IO-Compress 2.93.0 zipdetails
+ src_remove_dual perl-core/JSON-PP 4.40.0 json_pp
+ src_remove_dual perl-core/Module-CoreList 5.202.101.23 corelist
+ src_remove_dual perl-core/Pod-Checker 1.730.0 podchecker
+ src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc
+ src_remove_dual perl-core/Pod-Usage 1.690.0 pod2usage
+ src_remove_dual perl-core/Test-Harness 3.420.0 prove
+ src_remove_dual perl-core/podlators 4.140.0 pod2man pod2text
+ src_remove_dual_man perl-core/podlators 4.140.0 /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+ # Fresh install
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ return 0;
+ # Major Upgrade
+ # doesn't matter if there's multiple copies, it still needs a rebuild
+ # if the string is anything other than "5.CURRENTMAJOR"
+ elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+ echo ""
+ ewarn "UPDATE THE PERL MODULES:"
+ ewarn "After updating dev-lang/perl the installed Perl modules"
+ ewarn "have to be re-installed. In most cases, this is done automatically"
+ ewarn "by the package manager, but subsequent steps are still recommended"
+ ewarn "to ensure system consistency."
+ ewarn
+ ewarn "You should start with a depclean to remove any unused perl dependencies"
+ ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+ ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+ ewarn "Recommended: emerge --depclean -va"
+ ewarn
+ ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+ ewarn "remaining rebuilds portage may have missed."
+ ewarn "Use: perl-cleaner --all"
+ return 0;
+
+ # Reinstall w/ USE Change
+ elif ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+ ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \
+ ( use debug && ! has_version dev-lang/perl[debug] ) || \
+ ( ! use debug && has_version dev-lang/perl[debug] ) ; then
+ echo ""
+ ewarn "TOGGLED USE-FLAGS WARNING:"
+ ewarn "You changed one of the use-flags ithreads or debug."
+ ewarn "You must rebuild all perl-modules installed."
+ ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+ fi
+}
+
+pkg_setup() {
+ case ${CHOST} in
+ *-freebsd*) osname="freebsd" ;;
+ *-dragonfly*) osname="dragonfly" ;;
+ *-netbsd*) osname="netbsd" ;;
+ *-openbsd*) osname="openbsd" ;;
+ *-darwin*) osname="darwin" ;;
+ *-solaris*) osname="solaris" ;;
+ *-cygwin*) osname="cygwin" ;;
+ *) osname="linux" ;;
+ esac
+
+ myarch="${CHOST%%-*}-${osname}"
+ if use debug ; then
+ myarch+="-debug"
+ fi
+ if use ithreads ; then
+ mythreading="-multi"
+ myarch+="-thread"
+ fi
+
+ PRIV_BASE="/usr/$(get_libdir)/perl5"
+ SITE_BASE="/usr/local/$(get_libdir)/perl5"
+ VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+ LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+ # This ENV var tells perl to build with a directory like "5.30"
+ # regardless of its patch version. This is for experts only
+ # at this point.
+ if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
+ PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+ ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+ SITE_LIB="${SITE_BASE}/${MY_PV}"
+ SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+ VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+ VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+ else
+ PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+ ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+ SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+ SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+ VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+ VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+ fi
+
+ dual_scripts
+}
+
+src_remove_dual_file() {
+ local i pkg ver
+ pkg="$1"
+ ver="$2"
+ shift 2
+ case "${EBUILD_PHASE:-none}" in
+ postinst|postrm)
+ for i in "$@" ; do
+ alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+ done
+ ;;
+ setup)
+ for i in "$@" ; do
+ if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+ has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+ break
+ fi
+ done
+ ;;
+ install)
+ for i in "$@" ; do
+ if ! [[ -f "${ED}"${i} ]] ; then
+ ewarn "${i} does not exist!"
+ continue
+ fi
+ mv "${ED}"${i}{,-${ver}-${P}} || die
+ done
+ ;;
+ esac
+}
+
+src_remove_dual_man() {
+ local i pkg ver ff
+ pkg="$1"
+ ver="$2"
+ shift 2
+ case "${EBUILD_PHASE:-none}" in
+ postinst|postrm)
+ for i in "$@" ; do
+ ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+ ff=${ff##*${i#${i%.[0-9]}}}
+ alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+ done
+ ;;
+ install)
+ for i in "$@" ; do
+ if ! [[ -f "${ED}"${i} ]] ; then
+ ewarn "${i} does not exist!"
+ continue
+ fi
+ mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+ done
+ ;;
+ esac
+}
+
+src_remove_dual() {
+ local i pkg ver
+ pkg="$1"
+ ver="$2"
+ shift 2
+ for i in "$@" ; do
+ src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}"
+ src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+ done
+}
+
+src_prepare_perlcross() {
+ cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+ # bug 604072
+ MAKEOPTS+=" -j1"
+ export MAKEOPTS
+}
+src_prepare_dynamic() {
+ ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+ ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+ local patchdir="${WORKDIR}/patches"
+ local infodir="${WORKDIR}/patch-info"
+ local src_name dest_name desc
+ src_name="$1"
+ dest_name="$2"
+ desc="$3"
+ shift; shift; shift;
+ einfo "Adding ${dest_name} to patch bundle"
+ cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+ if [[ -n "${desc}" ]]; then
+ printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+ fi
+ if [[ $# -gt 0 ]]; then
+ # Note: when $@ is more than one element, this emits a
+ # line for each element
+ printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+ fi
+}
+# Remove a patch using a glob expr
+# eg:
+# rm_patch *-darin-Use-CC*
+#
+rm_patch() {
+ local patchdir="${WORKDIR}/patches"
+ local expr="$1"
+ local patch="$( cd "${patchdir}"; echo $expr )"
+ einfo "Removing $patch ($expr) from patch bundle"
+ if [[ -e "${patchdir}/${patch}" ]]; then
+ rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+ else
+ ewarn "No ${expr} found in ${patchdir} to remove"
+ fi
+}
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+ local slash dquote
+ slash='\'
+ dquote='"'
+ re_slash="${slash}${slash}"
+ re_dquote="${slash}${dquote}"
+
+ # Convert \ to \\,
+ # " to \"
+ echo "$1" |\
+ sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+ sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+ c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+ local patchdir="${WORKDIR}/patches"
+ local infodir="${WORKDIR}/patch-info"
+ local patchoutput="patchlevel-gentoo.h"
+
+ # Inject Patch-Level info into description for patchlevel.h patch
+ # to show in -V
+ local patch_expr="*List-packaged-patches*"
+ local patch="$( cd "${patchdir}"; echo $patch_expr )";
+ einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+ if [[ -e "${patchdir}/${patch}" ]]; then
+ printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+ >"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+ else
+ eerror "No $patch_expr found in ${patchdir}"
+ fi
+
+ # Compute patch list to apply
+ # different name other than PATCHES to stop default
+ # reapplying it
+ # Single depth is currently only supported, as artifacts can reside
+ # from the old layout being multiple-directories, as well as it grossly
+ # simplifying the patchlevel_gentoo.h generation.
+ local PERL_PATCHES=($(
+ find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+ grep -E '[.](diff|patch)$' |\
+ sort -n
+ ))
+
+ for patch in "${PERL_PATCHES[@]}"; do
+ eapply "${WORKDIR}"/patches/${patch}
+ done
+
+ einfo "Generating $patchoutput"
+
+ # This code creates a header file, each iteration
+ # creates one-or-more-lines for each entry found in PERL_PATCHES
+ # and STDOUT is redirected to the .h file
+ for patch in "${PERL_PATCHES[@]}"; do
+ local desc_f="${infodir}/${patch}.desc"
+ local bugs_f="${infodir}/${patch}.bugs"
+
+ printf ',"%s"\n' "${patch}"
+ if [[ ! -e "${desc_f}" ]]; then
+ ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+ else
+ local desc="$(c_escape_file "${desc_f}")"
+ printf ',"- %s"\n' "${desc}"
+ fi
+ if [[ -e "${bugs_f}" ]]; then
+ while read -d $'\n' -r line; do
+ local esc_line="$(c_escape_string "${line}")"
+ printf ',"- Bug: %s"\n' "${esc_line}"
+ done <"${bugs_f}"
+ fi
+ done > "${S}/${patchoutput}"
+ printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+src_prepare() {
+ local patchdir="${WORKDIR}/patches"
+
+ # Prepare Patch dir with additional patches / remove unwanted patches
+ # Inject bug/desc entries for perl -V
+ if use hppa ; then
+ # bug 634162
+ add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+ "Fix broken miniperl on hppa"\
+ "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+ fi
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # do NOT mess with nsl, on Solaris this is always necessary,
+ # when -lsocket is used e.g. to get h_errno
+ rm_patch "*-nsl-and-cl*"
+ fi
+
+ apply_patchdir
+
+ tc-is-cross-compiler && src_prepare_perlcross
+
+ tc-is-static-only || src_prepare_dynamic
+
+ if use gdbm; then
+ sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
+ ext/NDBM_File/Makefile.PL || die
+ fi
+
+ # Use errno.h from prefix rather than from host system, bug #645804
+ if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+ sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+ fi
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # set a soname, fix linking against just built libperl
+ sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # fix install_name (soname) not to reference $D
+ sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+ fi
+
+ default
+}
+
+myconf() {
+ # the myconf array is declared in src_configure
+ myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+# /usr/lib64/perl5/
+# /usr/local/lib64/perl5/
+# /usr/lib64/perl5/vendor_perl/
+#
+# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
+# is enabled, where it will also allow numbers like "5.x"
+#
+# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
+# if you used that.
+find_candidate_inc_versions() {
+ local regex='.*/5[.][0-9]+[.][0-9]+$';
+ if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
+ regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+ fi
+ local dirs=(
+ "${EROOT}${PRIV_BASE}"
+ "${EROOT}${SITE_BASE}"
+ "${EROOT}${VENDOR_BASE}"
+ )
+ for dir in "${dirs[@]}"; do
+ if [[ ! -e "${dir}" ]]; then
+ continue
+ fi
+ # Without access to readdir() on these dirs, find will not be able
+ # to reveal any @INC directories inside them, and will subsequently prune
+ # them from the built perl's @INC support, breaking our compatiblity options
+ # entirely.
+ if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+ eerror "Bad permissions on ${dir}, this will probably break things"
+ eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+ eerror "Recommended permission is +rx for all"
+ eerror "> chmod o+rx ${dir}"
+ fi
+ done
+ einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+ find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f " 2>/dev/null
+}
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+ local vexclude="${DIST_VERSION%-RC}"
+ if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+ vexclude="${SUBSLOT}"
+ fi
+ einfo "Normalizing/Sorting candidate list: $*"
+ einfo " to remove '${vexclude}'"
+ # Note, general numeric sort has to be used
+ # for the last component, or unique will convert
+ # 5.30.0 + 5.30 into just 5.30
+ printf "%s\n" "$@" |\
+ grep -vxF "${vexclude}" |\
+ sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+ local oldv="${PERL_BIN_OLDVERSEN}"
+ if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+ oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+ fi
+ for v; do
+ has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+ echo -n "${v}/ ";
+ done
+}
+versions_to_gentoolibdirs() {
+ local oldv="${PERL_BIN_OLDVERSEN}"
+ local root
+ local v
+ if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+ oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+ fi
+ for v; do
+ for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+ local fullpath="${EROOT}${root}/${v}"
+ if [[ -e "${fullpath}" ]]; then
+ has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+ printf "%s:" "${fullpath}"
+ fi
+ done
+ done
+}
+
+src_configure() {
+ declare -a myconf
+
+ export LC_ALL="C"
+ [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+ # Perl has problems compiling with -Os in your flags with glibc
+ use elibc_uclibc || replace-flags "-Os" "-O2"
+
+ # xlocale.h is going away in glibc-2.26, so it's counterproductive
+ # if we use it and include it in CORE/perl.h ... Perl builds just
+ # fine with glibc and locale.h only.
+ # However, the darwin prefix people have no locale.h ...
+ use elibc_glibc && myconf -Ui_xlocale
+
+ # This flag makes compiling crash in interesting ways
+ filter-flags "-malign-double"
+
+ # Generic LTO broken since 5.28, triggers EUMM failures
+ filter-flags "-flto"
+
+ use sparc && myconf -Ud_longdbl
+
+ export BUILD_BZIP2=0
+ export BZIP2_INCLUDE=${EROOT}/usr/include
+ export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+ export BUILD_ZLIB=False
+ export ZLIB_INCLUDE=${EROOT}/usr/include
+ export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+ # allow either gdbm to provide ndbm (in ) or db1
+ myndbm='U'
+ mygdbm='U'
+ mydb='U'
+ if use gdbm ; then
+ mygdbm='D'
+ if use berkdb ; then
+ myndbm='D'
+ fi
+ fi
+ if use berkdb ; then
+ mydb='D'
+ has_version '=sys-libs/db-1*' && myndbm='D'
+ fi
+
+ myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+ if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+ ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+ myconf -Ui_db -Ui_ndbm
+ fi
+
+ use ithreads && myconf -Dusethreads
+
+ if use debug ; then
+ append-cflags "-g"
+ myconf -DDEBUGGING
+ elif [[ ${CFLAGS} == *-g* ]] ; then
+ myconf -DDEBUGGING=-g
+ else
+ myconf -DDEBUGGING=none
+ fi
+
+ # Autodiscover all old version directories, some of them will even be newer
+ # if you downgrade
+ if [[ -z ${PERL_OLDVERSEN} ]]; then
+ PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+ fi
+
+ # Fixup versions, removing self match, fixing order and dupes
+ PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+ # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+ if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+ local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+ einfo "This version of perl may partially support modules previously"
+ einfo "installed in any of the following paths:"
+ for incpath in ${inclist}; do
+ [[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+ [[ -e "${EROOT}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+ [[ -e "${EROOT}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+ done
+ einfo "This is a temporary measure and you should aim to cleanup these paths"
+ einfo "via world updates and perl-cleaner"
+ # myconf -Dinc_version_list="${inclist}"
+ myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+ fi
+
+ [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+ # Make sure we can do the final link #523730, need to set deployment
+ # target to override hardcoded 10.3 which breaks on modern OSX
+ [[ ${CHOST} == *-darwin* ]] && \
+ myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+ # Older macOS with non-Apple GCC chokes on inline in system headers
+ # using c89 mode as injected by cflags.SH
+ [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+ append-cflags -Dinline=__inline__
+
+ # flock on 32-bit sparc Solaris is broken, fall back to fcntl
+ [[ ${CHOST} == sparc-*-solaris* ]] && \
+ myconf -Ud_flock
+
+ # Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+ # Prefix itself we don't do multilib either, so make sure perl can find
+ # something compatible.
+ if use prefix ; then
+ # Set a hook to check for each detected library whether it actually works.
+ export libscheck="
+ ( echo 'main(){}' > '${T}'/conftest.c &&
+ $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+ ) || xxx=/dev/null"
+
+ # Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+ local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+ myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+ elif [[ $(get_libdir) != "lib" ]] ; then
+ # We need to use " and not ', as the written config.sh use ' ...
+ myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+ fi
+
+ # don't try building ODBM, bug #354453
+ disabled_extensions="ODBM_File"
+
+ if ! use gdbm ; then
+ # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+ disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+ fi
+
+ myconf -Dnoextensions="${disabled_extensions}"
+
+ [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+ [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+ # allow fiddling via EXTRA_ECONF, bug 558070
+ eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+ # setting -Dld= to tc-getLD breaks perl and all perl things
+ # https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
+ myconf \
+ -Duseshrplib \
+ -Darchname="${myarch}" \
+ -Dcc="$(tc-getCC)" \
+ -Dar="$(tc-getAR)" \
+ -Dnm="$(tc-getNM)" \
+ -Dcpp="$(tc-getCPP)" \
+ -Dranlib="$(tc-getRANLIB)" \
+ -Doptimize="${CFLAGS}" \
+ -Dldflags="${LDFLAGS}" \
+ -Dprefix="${EPREFIX}"'/usr' \
+ -Dsiteprefix="${EPREFIX}"'/usr/local' \
+ -Dvendorprefix="${EPREFIX}"'/usr' \
+ -Dscriptdir="${EPREFIX}"'/usr/bin' \
+ -Dprivlib="${EPREFIX}${PRIV_LIB}" \
+ -Darchlib="${EPREFIX}${ARCH_LIB}" \
+ -Dsitelib="${EPREFIX}${SITE_LIB}" \
+ -Dsitearch="${EPREFIX}${SITE_ARCH}" \
+ -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+ -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+ -Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+ -Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+ -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+ -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+ -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+ -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+ -Dman1ext='1' \
+ -Dman3ext='3pm' \
+ -Dlibperl="${LIBPERL}" \
+ -Dlocincpth="${EPREFIX}"'/usr/include ' \
+ -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+ -Duselargefiles \
+ -Dd_semctl_semun \
+ -Dcf_by='Gentoo' \
+ -Dmyhostname='localhost' \
+ -Dperladmin='root@localhost' \
+ -Ud_csh \
+ -Dsh="${EPREFIX}"/bin/sh \
+ -Dtargetsh="${EPREFIX}"/bin/sh \
+ -Uusenm \
+ "${myconf[@]}" \
+ "${EXTRA_ECONF[@]}"
+
+ if tc-is-cross-compiler; then
+ ./configure \
+ --target="${CHOST}" \
+ --build="${CBUILD}" \
+ -Dinstallprefix='' \
+ -Dinstallusrbinperl='undef' \
+ -Dusevendorprefix='define' \
+ "${myconf[@]}" \
+ || die "Unable to configure"
+ else
+ sh Configure \
+ -des \
+ -Dinstallprefix="${EPREFIX}"'/usr' \
+ -Dinstallusrbinperl='n' \
+ "${myconf[@]}" \
+ || die "Unable to configure"
+ fi
+}
+
+src_test() {
+ export NO_GENTOO_NETWORK_TESTS=1;
+ export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+ export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+ if [[ ${EUID} == 0 ]] ; then
+ ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+ return 0
+ fi
+ use elibc_uclibc && export MAKEOPTS+=" -j1"
+ TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+ local i
+ local coredir="${ARCH_LIB}/CORE"
+
+ emake DESTDIR="${D}" install
+
+ rm -f "${ED}/usr/bin/perl${MY_PV}"
+ ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+ if ! tc-is-static-only ; then
+ dolib.so "${ED}"${coredir}/${LIBPERL}
+ rm -f "${ED}"${coredir}/${LIBPERL}
+ ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+ ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+ ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+ ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+ ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+ fi
+
+ rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+ # This removes ${D} from Config.pm
+ for i in $(find "${D}" -iname "Config.pm" ) ; do
+ einfo "Removing ${D} from ${i}..."
+ sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+ done
+
+ dodoc Changes* README AUTHORS
+
+ if use doc ; then
+ # HTML Documentation
+ # We expect errors, warnings, and such with the following.
+
+ dodir /usr/share/doc/${PF}/html
+ LD_LIBRARY_PATH=. ./perl installhtml \
+ --podroot='.' \
+ --podpath='lib:ext:pod:vms' \
+ --recurse \
+ --htmldir="${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+ dual_scripts
+}
+
+pkg_preinst() {
+ check_rebuild
+}
+
+pkg_postinst() {
+ dual_scripts
+
+ if [[ "${ROOT}" = "/" ]] ; then
+ local INC DIR file
+ INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+ einfo "Removing old .ph files"
+ for DIR in ${INC} ; do
+ if [[ -d "${DIR}" ]] ; then
+ for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+ rm -f "${file}"
+ einfo "<< ${file}"
+ done
+ fi
+ done
+ # Silently remove the now empty dirs
+ for DIR in ${INC} ; do
+ if [[ -d "${DIR}" ]] ; then
+ find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+ fi
+ done
+
+ fi
+}
+
+pkg_postrm() {
+ dual_scripts
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 6e7bc787437e..2565f59c7548 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,8 +1,5 @@
-DIST swi-prolog-8.2.2-gentoo-patchset-0.tar.gz 539 BLAKE2B 53d8f4aeb6f83eae628027f3f4d581f7a8c4e7e6c763350acc85bd0cc4ec4f6e8d7afe680763afc4bef9e5babb8100aeca0f887d029ffa115f4ead89cbc48cdd SHA512 d745b978c6926ed6b9f84d98c5cfd08716aaebe05bcf4a6fd9bd647a5d265b731e4daf2c0f5028eac36d7cea052eb52f80fe8287d4e9e285b3b8ffd544408da1
DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa88dd14284ea147ab5090695ff1c950365823451ac656403bee97c7dd4a039e2d58085456842f8bbc7caa26d18916c6f8718a204097c SHA512 c1f0dce1e336c79fe84a3f9d0fe5e873d33c00071f91cbb683a73fbceaba1c6ca8c2875b58045829eafcbee78a0e713009a07bd51a2c56bf146f14881899f934
-DIST swipl-8.2.2.tar.gz 11002077 BLAKE2B 581c3ea83d2440cbe2454ba12ea2752bec9fda926f3afef6e36de1bbf70b43b34931ad768335bb15809a3d76959c7eec7dd3ad54a0a4085ad8ba34075dd3f4d9 SHA512 fb77cfd58932dc35c3d808899c1f493ffb22a58f56fe364ce0c0b48b8cabdd204d4f920346c39f696fadd9ee8335e163a8eb8d0a770c2835d803f030c1f3f878
DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f
DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327f9f995cd46657a71b6779d021eb4f5651b2be77883197c7c5ee31c23259f46ed559aeeb0bb53ad10aea0081ed SHA512 cdbd23d4a0e9699ecc32bdcad9979e4042fb0f24de84010f6f097bc7148af38150b0e61e393c057b0dbae932d0fc1c02a41808bcbafd2c23e24fd73070bed470
-DIST swipl-8.3.20.tar.gz 11136550 BLAKE2B 83dd6ea056fd579816b88ca1faa3f857cb880d39d0cebc186aab0a0bf7cfdde19348874d4a7efb5e27995adfffb3ee075c42aa7fde1088ee17a5a05c137667ed SHA512 7f64ba639db0e1d75bd459e61ec14c30498035bbb59995f888702174fac159ebc96c47f22be2c3e466f5ba5547b39aaf83d296da2b2419ed89ff9195f355f3a4
DIST swipl-8.3.21.tar.gz 11143843 BLAKE2B 4e4a009e40609d17f33bd783c477295e20805d471ffdb8f6451b52a7c51a749c123e79d0e5087a473fe20c5a673648208540e7039403c35c7ffb044851f72f04 SHA512 fe8596a4d0ecc5d2d48e7532619bdf09364d1b52beffc4ea73cdd79d29dde9d68ddc1a66a4f2f579d7eee1a3e215e13e918ca59b26788957e5e2dd5af2905139
DIST swipl-8.3.22.tar.gz 11153417 BLAKE2B a02638ca29d4a19978b10062ab7f8913480e397551cb88327dd020bb2ae40bf623911f673f88e41074f68c667e7075fa18fc7dcf7b3013e582cbc70d59a6a729 SHA512 6fdf0ce6743c042ef7af0195e8c92fb81fe9fef2f16e9ec2d4ff355de70d21b325dd6058c9e7a0a0dd3e41cc168a251784ab7a473108d272e323470c601d5839
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild
deleted file mode 100644
index 476ccc7c68dc..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="https://www.swi-prolog.org/"
-SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- https://dev.gentoo.org/~keri/distfiles/swi-prolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
- sys-libs/zlib
- archive? ( app-arch/libarchive )
- berkdb? ( >=sys-libs/db-4:= )
- odbc? ( dev-db/unixODBC )
- pcre? ( dev-libs/libpcre )
- readline? ( sys-libs/readline:= )
- libedit? ( dev-libs/libedit )
- gmp? ( dev-libs/gmp:0 )
- ssl? (
- dev-libs/openssl:0
- )
- java? ( >=virtual/jdk-1.8:* )
- uuid? ( dev-libs/ossp-uuid )
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- )
- X? (
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )
- yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use debug && append-flags -DO_DEBUG
-
- mycmakeargs=(
- -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
- -DUSE_GMP=$(usex gmp)
- -DINSTALL_DOCUMENTATION=$(use doc && usex archive)
- -DSWIPL_PACKAGES_BASIC=$(usex !minimal)
- -DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
- -DSWIPL_PACKAGES_ODBC=$(usex odbc)
- -DSWIPL_PACKAGES_BDB=$(usex berkdb)
- -DSWIPL_PACKAGES_PCRE=$(usex pcre)
- -DSWIPL_PACKAGES_YAML=$(usex yaml)
- -DSWIPL_PACKAGES_SSL=$(usex ssl)
- -DSWIPL_PACKAGES_JAVA=$(usex java)
- -DSWIPL_PACKAGES_QT=$(usex qt5)
- -DSWIPL_PACKAGES_X=$(usex X)
- -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- XDG_CONFIG_DIRS="${HOME}" \
- XDG_DATA_DIRS="${HOME}" \
- cmake-utils_src_compile
-}
-
-src_test() {
- USE_PUBLIC_NETWORK_TESTS=false \
- USE_ODBC_TESTS=false \
- cmake-utils_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild
index 9719353911ff..531032848810 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild
@@ -3,11 +3,11 @@
EAPI=7
-inherit cmake desktop xdg-utils flag-o-matic multilib
+inherit cmake desktop xdg-utils flag-o-matic
PATCHSET_VER="0"
-DESCRIPTION="versatile implementation of the Prolog programming language"
+DESCRIPTION="Versatile implementation of the Prolog programming language"
HOMEPAGE="https://www.swi-prolog.org/"
SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
@@ -49,17 +49,15 @@ DEPEND="${RDEPEND}
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
- eapply_user
- sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
+ sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \
+ -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \
+ -i CMakeLists.txt || die
cmake_src_prepare
}
@@ -68,7 +66,7 @@ src_configure() {
append-flags -fno-strict-aliasing
use debug && append-flags -DO_DEBUG
- mycmakeargs=(
+ local mycmakeargs=(
-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-DUSE_GMP=$(usex gmp)
-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
@@ -83,7 +81,7 @@ src_configure() {
-DSWIPL_PACKAGES_QT=$(usex qt5)
-DSWIPL_PACKAGES_X=$(usex X)
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
- )
+ )
cmake_src_configure
}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild
deleted file mode 100644
index 2ea9f0c72e9c..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-8.3.20.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
- sys-libs/zlib
- archive? ( app-arch/libarchive )
- berkdb? ( >=sys-libs/db-4:= )
- odbc? ( dev-db/unixODBC )
- pcre? ( dev-libs/libpcre )
- readline? ( sys-libs/readline:= )
- libedit? ( dev-libs/libedit )
- gmp? ( dev-libs/gmp:0 )
- ssl? (
- dev-libs/openssl:0
- )
- java? ( >=virtual/jdk-1.8:* )
- uuid? ( dev-libs/ossp-uuid )
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- )
- X? (
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )
- yaml? ( dev-libs/libyaml )"
-
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use debug && append-flags -DO_DEBUG
-
- mycmakeargs=(
- -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
- -DUSE_GMP=$(usex gmp)
- -DINSTALL_DOCUMENTATION=$(use doc && usex archive)
- -DSWIPL_PACKAGES_BASIC=$(usex !minimal)
- -DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
- -DSWIPL_PACKAGES_ODBC=$(usex odbc)
- -DSWIPL_PACKAGES_BDB=$(usex berkdb)
- -DSWIPL_PACKAGES_PCRE=$(usex pcre)
- -DSWIPL_PACKAGES_YAML=$(usex yaml)
- -DSWIPL_PACKAGES_SSL=$(usex ssl)
- -DSWIPL_PACKAGES_JAVA=$(usex java)
- -DSWIPL_PACKAGES_QT=$(usex qt5)
- -DSWIPL_PACKAGES_X=$(usex X)
- -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- XDG_CONFIG_DIRS="${HOME}" \
- XDG_DATA_DIRS="${HOME}" \
- cmake-utils_src_compile
-}
-
-src_test() {
- USE_PUBLIC_NETWORK_TESTS=false \
- USE_ODBC_TESTS=false \
- cmake-utils_src_test -V
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
index 81dffeb547e4..914c832b3536 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.21.ebuild
@@ -3,13 +3,11 @@
EAPI=7
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
-PATCHSET_VER="0"
-
-DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
@@ -49,17 +47,15 @@ DEPEND="${RDEPEND}
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
- eapply_user
- sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
+ sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \
+ -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \
+ -i CMakeLists.txt || die
cmake_src_prepare
}
@@ -68,7 +64,7 @@ src_configure() {
append-flags -fno-strict-aliasing
use debug && append-flags -DO_DEBUG
- mycmakeargs=(
+ local mycmakeargs=(
-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-DUSE_GMP=$(usex gmp)
-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
@@ -83,7 +79,7 @@ src_configure() {
-DSWIPL_PACKAGES_QT=$(usex qt5)
-DSWIPL_PACKAGES_X=$(usex X)
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
- )
+ )
cmake_src_configure
}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild
index a6117bd15bc8..2a8883edddfd 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.22.ebuild
@@ -3,11 +3,11 @@
EAPI=7
-inherit cmake desktop xdg-utils flag-o-matic multilib
+inherit cmake desktop xdg-utils flag-o-matic
PATCHSET_VER="0"
-DESCRIPTION="versatile implementation of the Prolog programming language"
+DESCRIPTION="Versatile implementation of the Prolog programming language"
HOMEPAGE="https://www.swi-prolog.org/"
SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
@@ -49,17 +49,15 @@ DEPEND="${RDEPEND}
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/swipl-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
- eapply_user
- sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- sed -i -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" CMakeLists.txt || die
+ sed -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" \
+ -e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1 $(get_libdir)/|" \
+ -i CMakeLists.txt || die
cmake_src_prepare
}
@@ -68,7 +66,7 @@ src_configure() {
append-flags -fno-strict-aliasing
use debug && append-flags -DO_DEBUG
- mycmakeargs=(
+ local mycmakeargs=(
-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
-DUSE_GMP=$(usex gmp)
-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
@@ -83,7 +81,7 @@ src_configure() {
-DSWIPL_PACKAGES_QT=$(usex qt5)
-DSWIPL_PACKAGES_X=$(usex X)
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
- )
+ )
cmake_src_configure
}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a92e6e05c482..252889b53023 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 5509e2815c24..0df8aa5911d2 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,5 @@
DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
DIST Botan-2.18.0.tar.xz 5941536 BLAKE2B 2a4182bab5e681fdfeafa113462bf5a31057d7be97d71d0a6e60975b84432dd3932498f42f0b879e216727df4bbfcbf0d844e971df95eaf9cf922280f32858b4 SHA512 8613412e3e2fe8b787db7a4d4dbadf60b8fe6b68a84408c600c37cd0b5dbdf3f347a49f5bd88eb8d4f658e927a8b976884146551bf7d256fa80e9675297c0f09
DIST Botan-2.18.0.tar.xz.asc 488 BLAKE2B b9a9c98e11eae227fb900cae2dca3aecc2114ecacd87336cf5cdbe6fbcb9676514f11e365e94dbfecf3b9edc1a9a3398ff2c66f34a77d7b4d6b0f87518af6d9a SHA512 f2e1689e10b0706eed5a3cf08dfcb163874d3ada12968ac739eeff259ae81b1329fafdae4d29290195276fe3bb1cdeaf3f302b8df53a377c5bbdb7964deaa044
+DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
+DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
diff --git a/dev-libs/botan/botan-2.18.1.ebuild b/dev-libs/botan/botan-2.18.1.ebuild
new file mode 100644
index 000000000000..4d9fc251745d
--- /dev/null
+++ b/dev-libs/botan/botan-2.18.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
+inherit python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist doc boost bzip2 lzma python ssl static-libs sqlite zlib"
+
+CPU_USE=(
+ cpu_flags_arm_{aes,neon}
+ cpu_flags_ppc_altivec
+ cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+ boost? ( >=dev-libs/boost-1.48:= )
+ bzip2? ( >=app-arch/bzip2-1.0.5:= )
+ lzma? ( app-arch/xz-utils:= )
+ python? ( ${PYTHON_DEPS} )
+ ssl? ( dev-libs/openssl:0=[bindist=] )
+ sqlite? ( dev-db/sqlite:3= )
+ zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ ')
+ verify-sig? ( app-crypt/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+ if use doc ; then
+ has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+ fi
+}
+
+src_configure() {
+ local disable_modules=(
+ $(usex boost '' 'boost')
+ $(usex bindist 'ecdsa' '')
+ )
+
+ if [[ -z "${DISABLE_MODULES}" ]] ; then
+ elog "Disabling module(s): ${disable_modules[@]}"
+ fi
+
+ local chostarch="${CHOST%%-*}"
+
+ # Arch specific wrangling
+
+ local myos=
+ case ${CHOST} in
+ *-darwin*)
+ myos=darwin
+ ;;
+
+ *)
+ myos=linux
+
+ if [[ ${CHOST} == *hppa* ]] ; then
+ chostarch=parisc
+ elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+ chostarch="sparc32-v9"
+ fi
+ ;;
+
+ esac
+
+ local pythonvers=()
+ if use python ; then
+ _append() {
+ pythonvers+=( ${EPYTHON/python/} )
+ }
+
+ python_foreach_impl _append
+ fi
+
+ local myargs=(
+ # Intrinsics
+ # TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+ # TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+ $(usex cpu_flags_arm_aes '' '--disable-armv8crypto')
+ $(usex cpu_flags_arm_neon '' '--disable-neon')
+ $(usex cpu_flags_ppc_altivec '' '--disable-altivec')
+ $(usex cpu_flags_x86_aes '' '--disable-aes-ni')
+ $(usex cpu_flags_x86_avx2 '' '--disable-avx2')
+ $(usex cpu_flags_x86_popcnt '' '--disable-bmi2')
+ $(usex cpu_flags_x86_rdrand '' '--disable-rdrand')
+ $(usex cpu_flags_x86_sse2 '' '--disable-sse2')
+ $(usex cpu_flags_x86_ssse3 '' '--disable-ssse3')
+ $(usex cpu_flags_x86_sse4_1 '' '--disable-sse4.1')
+ $(usex cpu_flags_x86_sse4_2 '' '--disable-sse4.2')
+
+ $(usex hppa --without-stack-protector '')
+
+ $(use_with boost)
+ $(use_with bzip2)
+ $(use_with doc documentation)
+ $(use_with doc sphinx)
+ $(use_with lzma)
+ $(use_enable static-libs static-library)
+ $(use_with ssl openssl)
+ $(use_with sqlite sqlite3)
+ $(use_with zlib)
+
+ --cpu=${chostarch}
+ --docdir=share/doc
+ --disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+ --distribution-info="Gentoo ${PVR}"
+ --libdir=$(get_libdir)
+
+ # Don't install Python bindings automatically
+ # (do it manually later in the right place)
+ # https://bugs.gentoo.org/723096
+ --no-install-python-module
+
+ --os=${myos}
+ --prefix="${EPREFIX}/usr"
+ --with-endian="$(tc-endian)"
+ --with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+ --without-doxygen
+ )
+
+ tc-export CC CXX AR
+
+ ./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+ default
+
+ # Manually install the Python bindings (bug #723096)
+ if use python ; then
+ python_foreach_impl python_domodule src/python/botan2.py
+ fi
+}
diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index 6f49eba8f496..4ffd18ae6be9 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ https://dickey.his.com/cdk/CHANGES.html
+
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
new file mode 100644
index 000000000000..63310078b432
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --disable-demos \
+ --disable-unittest
+
+ eapply "${FILESDIR}/${P}_gcc11.patch"
+
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+
+ # remove static libs
+ rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
+}
diff --git a/dev-libs/cxxtools/cxxtools-3.0.ebuild b/dev-libs/cxxtools/cxxtools-3.0.ebuild
index 124abb7c1635..23367377184d 100644
--- a/dev-libs/cxxtools/cxxtools-3.0.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
RDEPEND="virtual/libiconv"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
new file mode 100644
index 000000000000..d8fb34886420
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
@@ -0,0 +1,23 @@
+compilefix gcc 11
+
+based on compile fix from upstream
+https://www.gitmemory.com/issue/maekitalo/cxxtools/30/770247974
+
+Signed-off-by: Joerg Bornkessel (09 May 2021)
+diff -Naur cxxtools-3.0.orig/include/cxxtools/char.h cxxtools-3.0/include/cxxtools/char.h
+--- cxxtools-3.0.orig/include/cxxtools/char.h 2021-05-09 18:32:41.415653108 +0200
++++ cxxtools-3.0/include/cxxtools/char.h 2021-05-09 18:33:56.117653108 +0200
+@@ -68,9 +68,10 @@
+ typedef int32_t value_type;
+
+ //! Constructs a character with a value of 0.
+- Char()
+- : _value(0)
+- {}
++// Char()
++// : _value(0)
++// {}
++ Char() = default;
+
+ //! Constructs a character using the given value as base for the character value.
+ Char(value_type ch)
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 839b14098c7a..e3728779fae9 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1 +1,2 @@
DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
+DIST fstrm-0.6.1.tar.gz 135425 BLAKE2B 607852bd6bd18d2dc4e862c7425882274710674da1edb3a525b409f5eff9cb46748f8e5b7b1e88ab180ddfed7a19ee41aaa9551d70331ac80ff178ffa0b4ca98 SHA512 7bf2728e2d0d1fdbd4e93069ddb03a01dc56909dbac57650ed530c80f761170b257c7191a3d789d4661df1f09c15594f20ec93a4eb5e5deb7ea3a7eabe56806c
diff --git a/dev-libs/fstrm/fstrm-0.6.1.ebuild b/dev-libs/fstrm/fstrm-0.6.1.ebuild
new file mode 100644
index 000000000000..cc4ed85f22b2
--- /dev/null
+++ b/dev-libs/fstrm/fstrm-0.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Frame Streams implementation in C"
+HOMEPAGE="https://github.com/farsightsec/fstrm"
+SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="utils"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="utils? ( dev-libs/libevent:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable utils programs)
+}
+
+multilib_src_install_all() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libfido2/libfido2-1.7.0.ebuild b/dev-libs/libfido2/libfido2-1.7.0.ebuild
index 21c57df89552..ad132c0d8eb9 100644
--- a/dev-libs/libfido2/libfido2-1.7.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="nfc +static-libs"
DEPEND="
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index c15f66c355d0..7887ad1aa834 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2-with-linking-exception"
SLOT="0/1.1"
KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-IUSE="examples gssapi ssh test +threads trace"
+IUSE="examples gssapi +ssh test +threads trace"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
index 32b1a3ae4c9f..3298fa0ece76 100644
--- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libreport/libreport-2.15.1.ebuild b/dev-libs/libreport/libreport-2.15.1.ebuild
index 886cb5a64cc3..2cdc5d5a57d5 100644
--- a/dev-libs/libreport/libreport-2.15.1.ebuild
+++ b/dev-libs/libreport/libreport-2.15.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/abrt/libreport"
SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/1"
KEYWORDS="~amd64 ~x86"
IUSE="gtk +python"
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 8dcfb5c2424b..b7e66ae652f6 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug examples static-libs"
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 2858173346a2..d08915a62ed0 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,3 +1 @@
-DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
-DIST onig-6.9.7.tar.gz 935733 BLAKE2B dcabf46429ba1a99fb3c645144ee68cba2594ae30972dbfedc229eaca0686c32b776688218c68564a8c24f9f782f84901cd81bca01e2126ec39c742c002a517c SHA512 eba6057f87ef5897fe72d4535942e005329ec532db2f4cf8d5e901c478c151eedf3886ce04d595c406e2d5ad98273c0c2696eb46da5ee359b24f8221531e1f5a
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
deleted file mode 100644
index 57411083c8d4..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "9999" ]]; then
- inherit autotools git-r3
-
- EGIT_REPO_URI="https://github.com/kkos/oniguruma"
-fi
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/onig-${PV}"
-fi
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-src_prepare() {
- # https://github.com/kkos/oniguruma/issues/223
- # https://github.com/kkos/oniguruma/commit/d177786282a618c76cdf2e993e3d0d9a684e9666
- sed -e "/^AM_LDFLAGS[[:space:]]*=/s:-L\$(prefix)/lib:-L\$(libdir):" -i {sample,test}/Makefile.{am,in} || die
-
- default
-
- if [[ "${PV}" == "9999" ]]; then
- eautoreconf
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --enable-posix-api \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild b/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
deleted file mode 100644
index a600340da373..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "9999" ]]; then
- inherit autotools git-r3
-
- EGIT_REPO_URI="https://github.com/kkos/oniguruma"
-fi
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-BDEPEND=""
-DEPEND=""
-RDEPEND=""
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/onig-${PV}"
-fi
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-src_prepare() {
- default
-
- if [[ "${PV}" == "9999" ]]; then
- eautoreconf
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --enable-posix-api \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index adc2b704358f..ca997c7db9b8 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
KEYWORDS=""
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/re2/re2-0.2021.04.01.ebuild b/dev-libs/re2/re2-0.2021.04.01.ebuild
index 383b552b2a85..79d181996604 100644
--- a/dev-libs/re2/re2-0.2021.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.04.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
# https://abi-laboratory.pro/tracker/timeline/re2/
SONAME="9"
SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="icu"
BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index 2dd289308caa..24ed5d0c4ea1 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
IUSE="doc gnutls server ssl"
RDEPEND=">=dev-libs/cxxtools-3.0
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
index 3f480a08e886..f173f6fa26e2 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.12.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="static-libs regression-test test"
RESTRICT="!test? ( test )"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 39ede8459be7..9a6c43db8b7e 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/md5/Manifest b/dev-lua/md5/Manifest
new file mode 100644
index 000000000000..6da3d677a38a
--- /dev/null
+++ b/dev-lua/md5/Manifest
@@ -0,0 +1 @@
+DIST md5-1.3.tar.gz 31377 BLAKE2B b6080c1ef71b5dd1e2d1831b055f31c6a45dd530a24436440a2188500f2fe0ad45730b23627eed7135b01102797a290af65b7550960add10346ac9f7ce906a9a SHA512 eda222b89432228a03c603237a787d55b6d0251f53ee3da11aaf0369ff26e3497ed8479a295b659e02b3fee85c636cd5f8cc9fd68367bf4ed2d3edcbbc373903
diff --git a/dev-lua/md5/md5-1.3.ebuild b/dev-lua/md5/md5-1.3.ebuild
new file mode 100644
index 000000000000..95caf85b7d2f
--- /dev/null
+++ b/dev-lua/md5/md5-1.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua
+
+DESCRIPTION="Offers basic cryptographic facilities for Lua"
+HOMEPAGE="https://github.com/keplerproject/md5"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ lua_copy_sources
+}
+
+src_configure() {
+ # Provided 'configure' script is useless.
+ :;
+}
+
+lua_src_compile() {
+ pushd "${BUILD_DIR}" || die
+
+ local myemakeargs=(
+ "CC=$(tc-getCC)"
+ "CFLAGS=${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS}"
+ )
+
+ emake "${myemakeargs[@]}"
+
+ popd
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ pushd "${BUILD_DIR}/src" || die
+
+ # Workaround for tests.
+ ln -s core.so md5.so || die
+
+ "${ELUA}" ../tests/test.lua
+
+ popd
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ pushd "${BUILD_DIR}" || die
+
+ # Workaround, as 'Makefile' does not create this directory.
+ dodir "$(lua_get_cmod_dir)"
+
+ local myemakeargs=(
+ "LUA_DIR=${ED}/$(lua_get_lmod_dir)"
+ "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+ )
+
+ emake "${myemakeargs[@]}" install
+
+ popd
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+
+ einstalldocs
+}
diff --git a/dev-lua/md5/metadata.xml b/dev-lua/md5/metadata.xml
new file mode 100644
index 000000000000..5907ba34a816
--- /dev/null
+++ b/dev-lua/md5/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ conikost@gentoo.org
+ Conrad Kostecki
+
+
+ MD5 offers basic cryptographic facilities for Lua.
+ A hash (digest) function, a pair crypt/decrypt based on MD5 and CFB,
+ and a pair crypt/decrypt based on DES with 56-bit keys.
+
+
+
+ keplerproject/md5
+
+
diff --git a/dev-perl/JSON/JSON-4.30.0.ebuild b/dev-perl/JSON/JSON-4.30.0.ebuild
new file mode 100644
index 000000000000..285220bfa7d6
--- /dev/null
+++ b/dev-perl/JSON/JSON-4.30.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ISHIGAKI
+DIST_VERSION=4.03
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="JSON (JavaScript Object Notation) encoder/decoder"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test +xs"
+RESTRICT="!test? ( test )"
+
+RDEPEND="xs? ( >=dev-perl/JSON-XS-2.340.0 )"
+BDEPEND="
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+ perl_rm_files t/00_pod.t
+ perl-module_src_test
+}
diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest
index b23b3ab2c7b9..018e6e82e98e 100644
--- a/dev-perl/JSON/Manifest
+++ b/dev-perl/JSON/Manifest
@@ -1 +1,2 @@
DIST JSON-2.94.tar.gz 82629 BLAKE2B 284e8fc19732ad680c9f953211f916222e29a032f2d70075d81df2372769874d409aea5a77c4f25fd00f2ff47784e34f421603adbdd0001834ce2e579c4de4b1 SHA512 0a20562441d525ee37fff467111f7d65124525e06b4f825079948752da2a983757e719025dd2ab896115b34ba146b4c495f738e4f005542dce0b058440c73a46
+DIST JSON-4.03.tar.gz 91373 BLAKE2B 0b1ca6496972942c76d4316c5749fe857c77dc693a6ea86a042ee05c546d9c54fe4cf662ffea69c2c4542b21359552304e4d55db6c57c85e4d509738a95a9f30 SHA512 5910818d3a866a50ea655da7d9ae617f21d3bc7e8511d35cff96ec4ea04fe553638c7843422cf2d00c37835a6d9f931b1defd224f57c40a3e52d7cef4684ef8c
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 4395f24fd212..0d0594b74815 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Math-BigInt-GMP/Manifest b/dev-perl/Math-BigInt-GMP/Manifest
index 56b493f309f9..ac9762592b43 100644
--- a/dev-perl/Math-BigInt-GMP/Manifest
+++ b/dev-perl/Math-BigInt-GMP/Manifest
@@ -1 +1,2 @@
DIST Math-BigInt-GMP-1.6006.tar.gz 2460173 BLAKE2B 29d448e01aef4f6b1e91a2a82a284db4f6cf0e92b39a678dbea7fa9458c48813775865f24603a5189b3fd4137378aa9c0b588c2c554372411482fd733339e2be SHA512 9ac48f8b136d835d6a1a90fb4170321f8684f6650e49dcf7ee2147d7ee0f89400ac93aa72deb8b5c5fd56d2ada391789f573f97487e46a3863e6735f2f53828c
+DIST Math-BigInt-GMP-1.6007.tar.gz 2459995 BLAKE2B 971f4785b2068d02d80a6a50b4aecea4ef584c7b0e679ddfd3001518425361b36a646d1919fd06fc14a2b18733fdf2534e11aea666d4999b3003cbd946ae27d7 SHA512 cdeaeec1e450e95d761cefc63c5262c0b43cf5fc5865e62d0463e34821541c2b83d156979c1e7a8157c9747ccf5e3cefa80ac52489a7ce3186425bc27c176512
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.700.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.700.ebuild
new file mode 100644
index 000000000000..5ab963a85805
--- /dev/null
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.700.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=1.6007
+inherit perl-module
+
+DESCRIPTION="Use the GMP library for Math::BigInt routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-Math-BigInt-1.999.817
+ >=virtual/perl-XSLoader-0.20.0
+ >=dev-libs/gmp-4.0.0:0
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.580.0
+ test? ( >=virtual/perl-Test-Simple-0.820.0 )
+"
+
+src_test() {
+ perl_rm_files t/author-*.t t/00sig.t t/02pod.t t/03podcov.t
+ perl-module_src_test
+}
diff --git a/dev-perl/Math-BigInt-Lite/Manifest b/dev-perl/Math-BigInt-Lite/Manifest
index 675c92ebdfe1..f0ff4e659387 100644
--- a/dev-perl/Math-BigInt-Lite/Manifest
+++ b/dev-perl/Math-BigInt-Lite/Manifest
@@ -1 +1,2 @@
DIST Math-BigInt-Lite-0.18.tar.gz 75809 BLAKE2B 5cbd8b937fdfb810580c589ec6eddd7b7f8ad846d1328e0efc38e348093ae904da4423102afe73420ed75cd613bcc7c014c963fe12751314c26894d8a24f3847 SHA512 f7bf76742a0de6a9065c577eb583d5df71a7264d056bea73ffb5f54364a25d8b191c81bc7a30631589988c38418b520c99ac85aa4e83c5dd43308ac98ff74f64
+DIST Math-BigInt-Lite-0.19.tar.gz 78863 BLAKE2B b94cd9a75324cb6ca1d1e7bd4cd1b6462fc87a60050f06e8e5eaea0ef5b6d510fa1197ff6376158b8398879a9b1449d213e9dfc5f4688bc708598e73439a5e3e SHA512 a0babaa718678c278a3c0a9a74d687563355460aa1c76d8b67adff68232e3dfb96ed56feb72b599a99e65adc228bf0296481773d20489390cc40564da01301d4
diff --git a/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.190.0.ebuild b/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.190.0.ebuild
new file mode 100644
index 000000000000..9d6b448d94bd
--- /dev/null
+++ b/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.190.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="What BigInts are before they become big"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-Math-BigInt-1.999.812
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.940.0
+ )
+"
+
+src_test() {
+ local bad_files=( "t/pod_cov.t" "t/pod.t" )
+ perl_rm_files "${bad_files[@]}"
+ perl-module_src_test
+}
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0-r1.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0-r1.ebuild
new file mode 100644
index 000000000000..02edca568036
--- /dev/null
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DORMANDO
+DIST_VERSION=${PV%0.0}
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/ https://metacpan.org/release/MogileFS-Server"
+
+IUSE="mysql +sqlite test postgres"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( sqlite ) || ( mysql sqlite postgres )"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+#KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="
+ acct-group/mogile
+ acct-user/mogile
+ dev-perl/Net-Netmask
+ >=dev-perl/Danga-Socket-1.610.0
+ >=dev-perl/Sys-Syscall-0.220.0
+ >=dev-perl/Perlbal-1.790
+ >=dev-perl/IO-AIO-4
+ dev-perl/libwww-perl
+ >=dev-perl/MogileFS-Client-1.170.0
+ >=dev-perl/MogileFS-Utils-2.280.0
+ dev-perl/Cache-Memcached
+ dev-perl/DBI
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ sqlite? ( dev-perl/DBD-SQLite )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.720.0-gentoo-init-conf.patch"
+)
+
+DIST_TEST="never verbose"
+
+src_install() {
+ perl-module_src_install || die "perl-module_src_install failed"
+ cd "${S}" || die
+
+ newconfd "${S}"/gentoo/conf.d/mogilefsd mogilefsd
+ newinitd "${S}"/gentoo/init.d/mogilefsd mogilefsd
+
+ newconfd "${S}"/gentoo/conf.d/mogstored mogstored
+ newinitd "${S}"/gentoo/init.d/mogstored mogstored
+
+ newinitd "${S}"/gentoo/init.d/mogautomount mogautomount
+
+ diropts -m 700 -o mogile
+ keepdir /var/mogdata
+
+ diropts -m 755 -o root
+ dodir /etc/mogilefs
+
+ insinto /etc/mogilefs
+ insopts -m 600 -o root -g mogile
+ newins "${S}"/gentoo/conf/mogilefsd.conf mogilefsd.conf
+ newins "${S}"/gentoo/conf/mogstored.conf mogstored.conf
+}
+
+pkg_postinst() {
+ chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+ chown root:mogile "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}
+
+src_test() {
+ # these need to be in the env and the makeopts
+ export MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite TMPDIR="${T}/mogile"
+ #perl-module_src_test
+ make -j1 test TEST_VERBOSE=1 MOGTEST_DBUSER=${MOGTEST_DBUSER} MOGTEST_DBNAME=${MOGTEST_DBNAME} MOGTEST_DBTYPE=${MOGTEST_DBTYPE} TMPDIR="${TMPDIR}"
+}
diff --git a/dev-perl/PPIx-QuoteLike/Manifest b/dev-perl/PPIx-QuoteLike/Manifest
new file mode 100644
index 000000000000..677bc3d259c4
--- /dev/null
+++ b/dev-perl/PPIx-QuoteLike/Manifest
@@ -0,0 +1 @@
+DIST PPIx-QuoteLike-0.017.tar.gz 71431 BLAKE2B a7ff0062dc5d9a1656365fc48633fe100dca75c7ed7990c68f2c2b88d9e54ad054f8a9438e636fc4e4dd22e3a39bc8d2531eb1bc0a371b31812068dda939f3b7 SHA512 ec51e4ee529e18305a5255d9d0d04a5868963481157c31ffbb92e3492c4153117b54b14c1c75b1792fdeb91d68c2a0596b7ace829a25b27a53dc4ec785d48bca
diff --git a/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
new file mode 100644
index 000000000000..cb202adbccfb
--- /dev/null
+++ b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.017
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Parse Perl string literals and string-literal-like things"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test examples"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Encode
+ virtual/perl-Exporter
+ >=dev-perl/PPI-1.117.0
+ dev-perl/PPIx-Regexp
+ dev-perl/Readonly
+ virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.420.0
+ test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/PPIx-QuoteLike/metadata.xml b/dev-perl/PPIx-QuoteLike/metadata.xml
new file mode 100644
index 000000000000..2b9a936fc0a1
--- /dev/null
+++ b/dev-perl/PPIx-QuoteLike/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
diff --git a/dev-perl/PPIx-Regexp/Manifest b/dev-perl/PPIx-Regexp/Manifest
index f115546e8fe6..e64d33726ab0 100644
--- a/dev-perl/PPIx-Regexp/Manifest
+++ b/dev-perl/PPIx-Regexp/Manifest
@@ -1 +1,2 @@
DIST PPIx-Regexp-0.053.tar.gz 204221 BLAKE2B 6bea11c9e906bb94db19bd72e75ebeee6d3c2aa64c78e91c3e536d21e494288cfe95067b1a20ddd438ff8829f5f7b23e408c6440a31a5f70fe0680d14e752d81 SHA512 2f9e913347ad415be47240f48536845d9c1f77211534f2d540f2e1583936a11586c224fe909fc2f7f876398cb1c8048386c001279a724a72f1f71015a43840b7
+DIST PPIx-Regexp-0.080.tar.gz 239081 BLAKE2B 4af40b202b755d85d3092f876b16e7790a79fe623a977cee671def42df5c1704e0bcbcc65fcb518dc1a96ebc964eed00d66f55bb3cf77da78955d572876e1cc7 SHA512 6e4f91b1544d4f87079296e7032114dad55505647523ae21638ac157d3f9b47da644829b0813d35383a7d870149ccc58c77f73f3794a004f5634403c891e6254
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
new file mode 100644
index 000000000000..f56c25d823c5
--- /dev/null
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.080
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Represent a regular expression of some sort"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="test examples"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Encode
+ virtual/perl-Exporter
+ dev-perl/List-MoreUtils
+ >=dev-perl/PPI-1.117.0
+ virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.420.0
+ test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index da71f10b3861..f2ef1330e826 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -1 +1,2 @@
DIST Perl-Critic-1.130.tar.gz 647052 BLAKE2B 2b0905636486531dd8de50af6e490701f1785851744b78a5164539797e6d2549b46c9daef05d3061b53f82005ffc1fa47b7e2dccec613f9a5490c597d61072f4 SHA512 b443ddbb5905a61835061f49d7f10e2e71579e5df96778eb183c3d1e9987342e1536db61196b32e66a192c92916eafd9ebb7b713b0be71ce89c1f93155e89828
+DIST Perl-Critic-1.140.tar.gz 650449 BLAKE2B 648e3605278fbcd9c62437b1c3d587353541db3146829ed2d4aee5d0e240e13d692358146fd860150d1bae79d359ade93b53451a095a36f9c05f49cb0fd93d5c SHA512 46afc8260d2b500edbb29836be993f065270ed9ffa6aa00611a980b294025b794286bc820afeabb94b7d1cdd9bfb4e715e44e466fb0340cb9d938e031b54a6f0
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.140.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.140.0.ebuild
new file mode 100644
index 000000000000..1060da915b09
--- /dev/null
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.140.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=1.140
+inherit perl-module elisp-common
+
+DESCRIPTION="Critique Perl source code for best-practices"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test minimal examples emacs"
+RESTRICT="!test? ( test )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+ >=dev-perl/B-Keywords-1.50.0
+ virtual/perl-Carp
+ >=dev-perl/Config-Tiny-2
+ >=dev-perl/Exception-Class-1.230.0
+ >=virtual/perl-Exporter-5.630.0
+ virtual/perl-File-Path
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ dev-perl/File-Which
+ virtual/perl-Getopt-Long
+ dev-perl/IO-String
+ >=dev-perl/List-MoreUtils-0.190.0
+ >=dev-perl/Module-Pluggable-3.100.0
+ >=dev-perl/PPI-1.265.0
+ dev-perl/PPIx-QuoteLike
+ >=dev-perl/PPIx-Regexp-0.80.0
+ >=dev-perl/PPIx-Utilities-1.1.0
+ virtual/perl-Pod-Parser
+ >=dev-perl/Pod-Spell-1
+ >=dev-perl/Readonly-2
+ virtual/perl-Scalar-List-Utils
+ >=dev-perl/String-Format-1.180.0
+ dev-perl/Task-Weaken
+ >=virtual/perl-Term-ANSIColor-2.20.0
+ >=virtual/perl-Test-Simple-0.920.0
+ >=virtual/perl-Text-ParseWords-3
+ dev-perl/Perl-Tidy
+ >=virtual/perl-version-0.770.0
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.402.400
+ test? (
+ dev-perl/Test-Deep
+ !minimal? (
+ dev-perl/Test-Memory-Cycle
+ )
+ )"
+
+src_compile() {
+ perl-module_src_compile
+ if use emacs; then
+ elisp-compile extras/perlcritic.el
+ fi
+}
+
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples/
+ dodoc -r examples/*
+ fi
+ if use emacs; then
+ ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway"
+ ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682"
+ elisp-install ${PN} extras/perlcritic.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-perl/SOAP-WSDL/Manifest b/dev-perl/SOAP-WSDL/Manifest
index b0088a2a008d..e2fd0777fe0f 100644
--- a/dev-perl/SOAP-WSDL/Manifest
+++ b/dev-perl/SOAP-WSDL/Manifest
@@ -1 +1,2 @@
DIST SOAP-WSDL-3.003.tar.gz 238159 BLAKE2B 7ddf1fe07e27b920ed4ee360e0fc7c99f00e512cc275416e54d32435ce98c60ee13e2a4d3733c72fef707d887935d61c07cf9f9df49ee8ba107685c85e358c21 SHA512 a74416ea1208f589ddde3799856e9cb7c495e5d6c31aa0e8659abfcbf21bcaa9570200c5b86746401a7566d8de25c4a7ba4338828830d11f7b66f2abb424b2b3
+DIST SOAP-WSDL-3.004.tar.gz 232536 BLAKE2B 9a1abeb64ab9e92cf1c4d4d02b18e219071af0751e0672d4c281e5d6df094ce7c8e2ad85f69eba38d0cca5a4725df3702ef9fda5d5866da064d42722d0f34035 SHA512 938ba812630de9630a9a725ec39e22f989ca543da84bc0b6dc1711c7761447c52db6b59ab600c6f97f17dfdd18af3f803f1539806b48988115e894a85ad1c402
diff --git a/dev-perl/SOAP-WSDL/SOAP-WSDL-3.4.0.ebuild b/dev-perl/SOAP-WSDL/SOAP-WSDL-3.4.0.ebuild
new file mode 100644
index 000000000000..0eed8fbdeb90
--- /dev/null
+++ b/dev-perl/SOAP-WSDL/SOAP-WSDL-3.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_VERSION=3.004
+DIST_AUTHOR=SWALTERS
+inherit perl-module
+
+DESCRIPTION="SOAP with WSDL support"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test examples"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/Class-Load-0.200.0
+ >=dev-perl/Class-Std-Fast-0.0.5
+ virtual/perl-Data-Dumper
+ dev-perl/TimeDate
+ virtual/perl-File-Path
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ dev-perl/libwww-perl
+ dev-perl/Module-Build
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ >=dev-perl/Template-Toolkit-2.180.0
+ dev-perl/TermReadKey
+ dev-perl/URI
+ dev-perl/XML-Parser
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/CGI
+ virtual/perl-Test-Simple
+ virtual/perl-Getopt-Long
+ virtual/perl-Storable
+ )
+"
+
+DIST_TEST="do" # parallel testing dies
+
+src_prepare() {
+ perl-module_src_prepare
+ perl_rm_files test_html.pl
+}
+
+src_test() {
+ perl_rm_files t/098_pod.t t/099_pod_coverage.t t/094_cpan_meta.t t/095_copying.t t/096_characters.t t/097_kwalitee.t
+ perl-module_src_test
+}
+
+src_install() {
+ perl-module_src_install
+ dodoc MIGRATING
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples
+ dodoc -r example/*
+ fi
+}
diff --git a/dev-perl/rename/Manifest b/dev-perl/rename/Manifest
index a230c6dcf4fd..75e1bd229a21 100644
--- a/dev-perl/rename/Manifest
+++ b/dev-perl/rename/Manifest
@@ -1 +1,2 @@
+DIST rename-1.11.tar.gz 6227 BLAKE2B 91ec4b6ed8c37efcdea27266d45b0b1d17e9eb65d38b966fed8b5188a30c87f0434472e6c7d8479349db15628e51289f666f59c63f5bf89c2d9238a923155c6c SHA512 4e799d57948127b172f64a26d52fb5c513f2aeafeedf68d39271d93ac0fc6dd8f0cb2b0da3c43ce24ec2c04f905602557a4d063ec329672cb93f088e959439ad
DIST rename-1.9.tar.gz 5942 BLAKE2B d0dbf877d6db754acec6bc119a6245761dc865b193ede0391b8a3d84c0ee354caa7fc39e48f5f2b3a0906c7a6acd2b7f2716e274522b18c5512f98ae44a08898 SHA512 f6977d6b1698d7da6b2b5ef262cd13a4c4739e4f468d164ba6876ecabfd7bc44532eddb9350aa61e9fb154138ef38ea8323e3768c7d3d611ce7ee49b1561c4d0
diff --git a/dev-perl/rename/rename-1.1100.0.ebuild b/dev-perl/rename/rename-1.1100.0.ebuild
new file mode 100644
index 000000000000..f24610414ec4
--- /dev/null
+++ b/dev-perl/rename/rename-1.1100.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PEDERST
+DIST_VERSION=1.11
+inherit perl-module
+
+DESCRIPTION="A filename renaming utility based on perl regular expression"
+
+HOMEPAGE="https://metacpan.org/source/PEDERST/rename-${DIST_VERSION}"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+ perl-module_src_install
+
+ mv -vf "${D}"/usr/bin/rename "${D}"/usr/bin/perl-rename || die
+ mv -vf "${D}"/usr/share/man/man1/rename.1 "${D}"/usr/share/man/man1/perl-rename.1 || die
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 4d9a029eb91f..6b41cebadb43 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
index 5086168d63bf..13bb99b5f850 100644
--- a/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
+++ b/dev-php/ca-bundle/ca-bundle-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/composer/composer-2.0.13.ebuild b/dev-php/composer/composer-2.0.13.ebuild
index 2556cfa44993..24fa78b2de66 100644
--- a/dev-php/composer/composer-2.0.13.ebuild
+++ b/dev-php/composer/composer-2.0.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/json-schema/json-schema-5.2.10.ebuild b/dev-php/json-schema/json-schema-5.2.10.ebuild
index e14c73b57894..31bbe18d869f 100644
--- a/dev-php/json-schema/json-schema-5.2.10.ebuild
+++ b/dev-php/json-schema/json-schema-5.2.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
# Tests are not in the release tarball
RESTRICT="test"
diff --git a/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild b/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild
index 84dcb6064580..55d83a4e8228 100644
--- a/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild
+++ b/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild b/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild
index 06f4d8658771..9327082fb5f8 100644
--- a/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild
+++ b/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/metadata-minifier/archive/${PV}.tar.gz -> $
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/phar-utils/phar-utils-1.1.1.ebuild b/dev-php/phar-utils/phar-utils-1.1.1.ebuild
index dec5a496d528..43b1c5940fef 100644
--- a/dev-php/phar-utils/phar-utils-1.1.1.ebuild
+++ b/dev-php/phar-utils/phar-utils-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*[phar]
diff --git a/dev-php/psr-log/psr-log-1.1.3.ebuild b/dev-php/psr-log/psr-log-1.1.3.ebuild
index 5a9c2cc8f2b8..13310b3e11ca 100644
--- a/dev-php/psr-log/psr-log-1.1.3.ebuild
+++ b/dev-php/psr-log/psr-log-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
index 62064b56a4b8..bcc2cd5557a4 100644
--- a/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
+++ b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/reactphp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/semver/semver-3.2.4.ebuild b/dev-php/semver/semver-3.2.4.ebuild
index 7e4cf1345544..fa87acb2b105 100644
--- a/dev-php/semver/semver-3.2.4.ebuild
+++ b/dev-php/semver/semver-3.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild
index 8a7a72db38cd..b304cd775644 100644
--- a/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild
+++ b/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/symfony-config/symfony-config-2.8.20.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
index d7fc81dbeca4..60317d7d2700 100644
--- a/dev-php/symfony-config/symfony-config-2.8.20.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/symfony-console/symfony-console-2.8.52.ebuild b/dev-php/symfony-console/symfony-console-2.8.52.ebuild
index ec0c60c9d045..87d04719232c 100644
--- a/dev-php/symfony-console/symfony-console-2.8.52.ebuild
+++ b/dev-php/symfony-console/symfony-console-2.8.52.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild
index 342fd1d10de2..f0e4869bbdf1 100644
--- a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild
+++ b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/dependency-injection/archive/v${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
# The test suite requires the unpackaged symfony-expression-language.
diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
index 1a228cd6792e..2e2a694d65a1 100644
--- a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
+++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/event-dispatcher/archive/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
index 96f61ca6bacb..d34ab533a863 100644
--- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
index 6e429fcdf006..5649030280f1 100644
--- a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
+++ b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-find
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/symfony-process/symfony-process-3.4.38.ebuild b/dev-php/symfony-process/symfony-process-3.4.38.ebuild
index 11d16fd2c3b2..11d8a4f73eca 100644
--- a/dev-php/symfony-process/symfony-process-3.4.38.ebuild
+++ b/dev-php/symfony-process/symfony-process-3.4.38.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="test"
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild
index 38620ba56a5e..3bda89b13555 100644
--- a/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild
+++ b/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/php:*
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ef115d7e1bf1..6e5bbedb8f0a 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
index 2eda49774ef6..731e4a1838db 100644
--- a/dev-python/autobahn/autobahn-21.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.3.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="crypt scram test xbr"
RESTRICT="!test? ( test )"
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 2bb705955617..02d5ebec89e2 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1 +1,2 @@
DIST awxkit-19.0.0.tar.gz 95820 BLAKE2B eadb3ffbfd5a1bf2835e4a7df788e06676cd7c8132c8527c04c4876e87039b72ed00775ddc342e0b31bb0c4a7036b3ecb0456761b9a6a1a5f40e60656fd06521 SHA512 169531549fd668e9917db55f2d61d8959645659496f249d9bb94432b9d7449aa549a751aa3c0255c38334e24684e4039e581d26aa2c291ede88b623824b78ff9
+DIST awxkit-19.1.0.tar.gz 94839 BLAKE2B 751084164581dd772c4f99b14d3e3526effd758bffda0820be56f0d963903314458c0037df33606bf0329009186ef86df1fa0c41f9ecd377b8c2d2de15bcd9e0 SHA512 a4be398f81f370e62b60605c0add70775eebf78bbd21080a65caa64c5b9f9daf33315516cd3771d434ff86d2bb9ec089545adbc174bd19ef5e52ae69e6cb79db
diff --git a/dev-python/awxkit/awxkit-19.1.0.ebuild b/dev-python/awxkit/awxkit-19.1.0.ebuild
new file mode 100644
index 000000000000..95c60a9bd9ee
--- /dev/null
+++ b/dev-python/awxkit/awxkit-19.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ dev-python/websocket-client[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+ -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/blessed/blessed-1.18.0.ebuild b/dev-python/blessed/blessed-1.18.0.ebuild
index 4db2921df380..da2210a3cac7 100644
--- a/dev-python/blessed/blessed-1.18.0.ebuild
+++ b/dev-python/blessed/blessed-1.18.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/cachetools/cachetools-4.2.2.ebuild b/dev-python/cachetools/cachetools-4.2.2.ebuild
index 4e0424ad1b9d..3f29f4a1e88a 100644
--- a/dev-python/cachetools/cachetools-4.2.2.ebuild
+++ b/dev-python/cachetools/cachetools-4.2.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/colorlog/colorlog-5.0.1.ebuild b/dev-python/colorlog/colorlog-5.0.1.ebuild
index 0aff57a0f429..655bc1f1eef3 100644
--- a/dev-python/colorlog/colorlog-5.0.1.ebuild
+++ b/dev-python/colorlog/colorlog-5.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index e9d83979015f..8cd32614929d 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1 @@
-DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f SHA512 72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
-DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e SHA512 e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e SHA512 2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47
diff --git a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
deleted file mode 100644
index 05d1db1f2708..000000000000
--- a/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -i -e '/vcver/d' setup.py || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
deleted file mode 100644
index 3bd2c651aa47..000000000000
--- a/dev-python/deepmerge/deepmerge-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools to handle merging of nested data structures in python"
-HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="
- https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/deepmerge/deepmerge-0.3.0.ebuild b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
index 3bd2c651aa47..fa53622bb877 100644
--- a/dev-python/deepmerge/deepmerge-0.3.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-0.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="Tools to handle merging of nested data structures in python"
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
index a882da0fde8a..2af3f49073c1 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
diff --git a/dev-python/dominate/dominate-2.6.0.ebuild b/dev-python/dominate/dominate-2.6.0.ebuild
index 104f733b1dd3..524adfd81d6e 100644
--- a/dev-python/dominate/dominate-2.6.0.ebuild
+++ b/dev-python/dominate/dominate-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index 41483b1474f4..8049a7fd856f 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1 +1,2 @@
DIST findimports-1.5.2.gh.tar.gz 32211 BLAKE2B ea3110925085d466df7f95eaa06dce9e331ecba52c1772b76b05e51c633a8adc1ff91295db441049dab39129606e3927f69834376cc5fb864f5f3b62ac68bac2 SHA512 86432d29d180d4299ba789b69601722a6a15eed9badbf2f930e8867be06c64a2f1f8123ae182d7c6b73339287d04c2cdb4a18a31662ea72e86283ee165dc4d45
+DIST findimports-2.0.0.gh.tar.gz 33896 BLAKE2B e457d9e67102018cbd99f907afed33446fe11e3fc8fd9ec44459b2ed9fbe469d825b3f5fb1884b436d0576bcabacc787ef921bb5378e0389ecf789068d439e4a SHA512 c6f5b6aad6fe57f7625592c445286827c0eec74d513e85532c7e650a5f33021f7c204cb6857641a18874c640f0a79d468321875d13fb03ed645554488973294a
diff --git a/dev-python/findimports/findimports-2.0.0.ebuild b/dev-python/findimports/findimports-2.0.0.ebuild
new file mode 100644
index 000000000000..af4535f46433
--- /dev/null
+++ b/dev-python/findimports/findimports-2.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module import analysis tool"
+HOMEPAGE="https://github.com/mgedmin/findimports"
+SRC_URI="
+ https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 9ae4e0ec8302..6eaa87ec259b 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,2 +1 @@
-DIST h11-0.11.0.tar.gz 97509 BLAKE2B 51e4eee959f36775317ac67450c80a6484309efcdd5adad3737d2d80ab5d9808d5d8aeb0118aa79f88848c052c330542ebfb4c03b96bdd805015fd9ad9f9fd41 SHA512 13dba59afd949d715fd693e5224e57dea5c923eb91b0981a5b5987bbe6e6e00e32552e1602353a48458615a8dd21f2a561961747ae15291eb3462fe42cef3f82
DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
diff --git a/dev-python/h11/h11-0.11.0.ebuild b/dev-python/h11/h11-0.11.0.ebuild
deleted file mode 100644
index af6478dc9875..000000000000
--- a/dev-python/h11/h11-0.11.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 5c7e3d135185..4e7e11c637ba 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index c35586ef47f4..3e785ac0702e 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index 9a20a55bd5a3..13834cac533b 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-python/humanize/humanize-3.5.0.ebuild b/dev-python/humanize/humanize-3.5.0.ebuild
index 7bc5554aa175..c806307de9e9 100644
--- a/dev-python/humanize/humanize-3.5.0.ebuild
+++ b/dev-python/humanize/humanize-3.5.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/hyperframe/hyperframe-6.0.1.ebuild b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
index 77b5a213e353..da2c546c3588 100644
--- a/dev-python/hyperframe/hyperframe-6.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/inflection/inflection-0.5.1.ebuild b/dev-python/inflection/inflection-0.5.1.ebuild
index ced70bafbde9..e3b7b12e03a9 100644
--- a/dev-python/inflection/inflection-0.5.1.ebuild
+++ b/dev-python/inflection/inflection-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 614f90975ef6..22fb3719796a 100644
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
RDEPEND="dev-libs/libsodium"
BDEPEND="${RDEPEND}"
diff --git a/dev-python/llvmlite/llvmlite-0.36.0.ebuild b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
index c4a3ab2254ed..e7d1d1dbbe84 100644
--- a/dev-python/llvmlite/llvmlite-0.36.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
IUSE="examples"
LLVM_MAX_SLOT=10
diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
index af9a680ac8ae..c763adcbf2d5 100644
--- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index d84a6134ec43..b7c12afe777e 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,4 +1,2 @@
-DIST marshmallow-3.10.0.tar.gz 172801 BLAKE2B 1d1f5d531a9704a9b82170347e2c5dd2b3fd4488204a05f9be7705a39e5a6a42342bcce1438484c22944a6fb4470a731825314ed7ced79dbaf9cc195f049d9b2 SHA512 41520a7cfde483ca06a69e49ab04f8972932d0fbf7a6c75ef568779b55d5f2f666aead4c161e03416e9b90fba71fd73b3f14630f0d7050b8a7fe7a4bb50d5bf0
-DIST marshmallow-3.11.0.tar.gz 173648 BLAKE2B 66bc79b880551c106fa88dfea3c17a171db8b7516be570882e0d686af335bb8e2667782a84a8503c2f5d5d6c4f273c93160138b97a285478f15a9aea656e6d55 SHA512 a9b2a2bb8830b1b9c773921f0a7154db3dee1840f8a6cd41a74464ed0cf91f946d00ccf8df32ed875de0201df067b0a310ddfc653e48179ca32450e48fbc06cf
DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5206ae5badb1e9b46d83d3bdcd926d324c39321e4fa2b4fdf276158d36c2d3634086f76086dececaa24213bbb765e42 SHA512 ebb6b20ffc1b199408ede0c88d1512cada14cf7220315100398137b8374940c03dda2e6449ab9135963598ab321669068a9eca0e1c4cd2f3f2454eba19db04bd
-DIST marshmallow-3.5.1.tar.gz 168839 BLAKE2B 8abf8e8d45d37794c3c615f6dac8ccd0acb76357e92ddaa4c23232b7aefba63db9bd42fb7f13dd99f9ea2ec4c7608459bc36014f9344ab91894176d0f02259c9 SHA512 89b3abce9e31dad6a20cf8ceef62270c8f95cbdf80965b6d29f1728d37d51171a020463da9d0354688183ea07e3f47a0ddab8694da13fe238f11a3dc755d4d6e
+DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312
diff --git a/dev-python/marshmallow/marshmallow-3.10.0.ebuild b/dev-python/marshmallow/marshmallow-3.10.0.ebuild
deleted file mode 100644
index 9a70f0ef5fb9..000000000000
--- a/dev-python/marshmallow/marshmallow-3.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.11.0.ebuild b/dev-python/marshmallow/marshmallow-3.12.0.ebuild
similarity index 100%
rename from dev-python/marshmallow/marshmallow-3.11.0.ebuild
rename to dev-python/marshmallow/marshmallow-3.12.0.ebuild
diff --git a/dev-python/marshmallow/marshmallow-3.5.1.ebuild b/dev-python/marshmallow/marshmallow-3.5.1.ebuild
deleted file mode 100644
index a08b397b9f38..000000000000
--- a/dev-python/marshmallow/marshmallow-3.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/minidb/minidb-2.0.4.ebuild b/dev-python/minidb/minidb-2.0.4.ebuild
index be7daa76636f..76b8f51300b0 100644
--- a/dev-python/minidb/minidb-2.0.4.ebuild
+++ b/dev-python/minidb/minidb-2.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
PYTHON_REQ_USE="sqlite"
DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 29de8b167970..14c0a2bca16e 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -4,3 +4,4 @@ DIST pikepdf-2.11.1.tar.gz 2382829 BLAKE2B 97a3cd65c22de0e7e3ab3099a3f51993367ec
DIST pikepdf-2.11.2.tar.gz 2297115 BLAKE2B c1ab1b99d13da7a52eda214d550597871f4d67553490f2c14096e6a620fa8bab6278a34b39e162de1bd0d71f781b79011468e5d045201dc936ec8eef07272657 SHA512 ff86e5c12e029978c0eb8e6bae7c5cd9a1b8e1f8eb07a6e623767ccb14ecc747493aa9eefc48be25464192e97eba5cd49c56983182f237532c4b4817b5732c28
DIST pikepdf-2.11.3.tar.gz 2298121 BLAKE2B 981c3607302ef5406bff886706b0d192943b367b753e4acbdbb36ea97a6921a24443f0204bc99b982b79260ba32b619e4a5f07b8a5b834be54feb0a6efdb950c SHA512 f9413ebf5bbb0a17c2ffeccc08262e59d47aaba60e68a7b1c2c43276c33fbe8b8363203394c850e21f1cc4883100047b966f7a8fbca6b3d5950bfda6f6918064
DIST pikepdf-2.11.4.tar.gz 2298520 BLAKE2B 4c657e50259cc126a4537f699c30723eb5d06303b2fabaa53c4ed2862236bcc253ab793d20905f7f2e298649a3ba8c5c8b66deeb4b859b66e18ab50cd512b843 SHA512 292fa0cfdd0a3d43bfc533dd339acc35b93958cdab476a7963274f0e98f2d8ad0c121d7605b53fe9e1a318cab59b24a46343ccf9f25e6de32e6e39d6dfc02ff1
+DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
diff --git a/dev-python/pikepdf/pikepdf-2.12.0.ebuild b/dev-python/pikepdf/pikepdf-2.12.0.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+ -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+ >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+ >=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+ >=dev-python/psutil-5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-6[${PYTHON_USEDEP}]
+ >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+ >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+ )"
+
+#distutils_enable_sphinx docs \
+# dev-python/ipython \
+# dev-python/matplotlib \
+# dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e '/wheel/d' setup.py || die
+ sed -i -e '/-n auto/d' setup.cfg || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 99a41f3837c5..7405fde695b2 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -23,7 +23,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
KEYWORDS=""
IUSE=""
@@ -62,5 +62,5 @@ python_test() {
python_install_all() {
distutils-r1_python_install_all
- find "${D}" -name "*.pth" -type f -delete || die
+ find "${ED}" -name "*.pth" -type f -delete || die
}
diff --git a/dev-python/pudb/pudb-2021.1.ebuild b/dev-python/pudb/pudb-2021.1.ebuild
index 85b6a8ab92ca..dcfe8e2d6be6 100644
--- a/dev-python/pudb/pudb-2021.1.ebuild
+++ b/dev-python/pudb/pudb-2021.1.ebuild
@@ -17,5 +17,9 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/urwid[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )"
distutils_enable_tests pytest
diff --git a/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
index 79f47c33505c..5f2f3c00f1d2 100644
--- a/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 94d6c89412f8..0fe6df2d2da7 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index e204312fd797..3ca1a4990e3e 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1 +1,2 @@
DIST radon-4.1.0.tar.gz 3672016 BLAKE2B 3da02d62a2be0ab709bbb573372b86971f2eafd98724ea984236710c7f3e3517215bf496d621d42e9e93b747e3b8742f9cf156d3477c5c1cc4ac6098f0008b8f SHA512 c594fb2822a5311f1daf18304c601b4363477bee808f32a0eada6dd28560668a93cfa614196a614240eca436dea48945a29915bd4d347946aa28def0780bc93c
+DIST radon-4.5.1.tar.gz 1873194 BLAKE2B 3bbbfd1fcddb8c89c39240d7de082342b667c53a663e766dea16032ae5a7a1eca2a3a55664f39d0a60551db8c27e0f1102439409ee50520f8ffeb7ea20e5319b SHA512 8f27af1b9fed27806415f7af12f7480f638c71c741b3e7e150a0137964f48d43e615d410a84a8e093aaed28c92ad57f22e36e1d1a9819c335635ec175c4e8314
diff --git a/dev-python/radon/metadata.xml b/dev-python/radon/metadata.xml
index 9e6e4bdcd5d1..a8b773fc1ee5 100644
--- a/dev-python/radon/metadata.xml
+++ b/dev-python/radon/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ python@gentoo.org
+ Python
+
radon
rubik/radon
diff --git a/dev-python/radon/radon-4.5.1.ebuild b/dev-python/radon/radon-4.5.1.ebuild
new file mode 100644
index 000000000000..fe5b81488746
--- /dev/null
+++ b/dev-python/radon/radon-4.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/flake8-polyfill[${PYTHON_USEDEP}]
+ dev-python/mando[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 78fcd8bb6c83..200330039b37 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1 +1,2 @@
DIST serpent-1.30.2.tar.gz 24182 BLAKE2B 9a7f492dbd06331e7e0b7c264fff2c0b184258565d43773eb75dcdd53b8d74df60995439060af0514904043528757201b8fcea4c9bfa56237efe77849abc582e SHA512 1cbc490deae3fb81c59abf74a98437e8c31f1ad88ce31a96c7ae48f344701dfcd67e973d2829cf793c405c6c1930cb7f15dec129c0a0e1b475286dd4f219ff99
+DIST serpent-1.40.tar.gz 24140 BLAKE2B 8a790e3f0973e99840cbea6ad354012cde0b7c6ee09c50f31d56110e12cf848543a30a38900e821419c9a0aaeb2b55fe0161dbc9c233f236a21dc553cefce9e6 SHA512 9f8edebcd6e37de7442a00157f64b1dec6742cd198f45ab475be7f38aff4e090345739f7500181f0b0a4dbdc9241b2f11bca5ada7a89aa577d94646269d7ab28
diff --git a/dev-python/serpent/serpent-1.40.ebuild b/dev-python/serpent/serpent-1.40.ebuild
new file mode 100644
index 000000000000..4e40de17c426
--- /dev/null
+++ b/dev-python/serpent/serpent-1.40.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index e62707eb6f6f..e01b01ce4c47 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1 +1,2 @@
DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
+DIST service_identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
diff --git a/dev-python/service_identity/service_identity-21.1.0.ebuild b/dev-python/service_identity/service_identity-21.1.0.ebuild
new file mode 100644
index 000000000000..37e61b27093b
--- /dev/null
+++ b/dev-python/service_identity/service_identity-21.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service-identity"
+SRC_URI="https://github.com/pyca/service-identity/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# TODO: upstream made pyopenssl optional
+RDEPEND="
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 17917de93786..062a0965e70b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,3 +2,4 @@ DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50
DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
DIST setuptools-56.1.0.tar.gz 2109659 BLAKE2B 2538391c7ee135f12550da9bb7c110aedcc1480616260195f3f8fc8b8a650651f5bb1f0244832801f897381a8663fc88e2b3840101c560595844af5b192259a2 SHA512 e490c61b4453678339ed3222b4ff39f218fdf515f6de0079b7e4343bf2e1a74a0c8d2f2c9108f462986cf06bc940f260bce29c3f61cc9e0c88471914de345ef1
+DIST setuptools-56.2.0.tar.gz 2110133 BLAKE2B 90c75ba006becc9f564eecd7d46a9ce70c9ad17eacf2e17b3551116b962e08af0084919fccc18ec29a54b98e8fe2419d129554a7b38fdd1104f472fb2e6f9995 SHA512 858d46909335ff0b0441d5860788803100a8fe9f5a1d1f17353bf961bc77191c3237501c1838fdb6ec8e4b2c66874ffd4e8342b42cc2673cb866706660704ea6
diff --git a/dev-python/setuptools/setuptools-56.2.0.ebuild b/dev-python/setuptools/setuptools-56.2.0.ebuild
new file mode 100644
index 000000000000..d47acafe9ddc
--- /dev/null
+++ b/dev-python/setuptools/setuptools-56.2.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/jaraco-envs[${PYTHON_USEDEP}]
+ >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ ' python3_{7..9} pypy3)
+ )
+"
+PDEPEND="
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ ' python3_{7..9} pypy3)"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+ # temporarily skipped, until we port all test deps
+ [[ ${EPYTHON} == python3.10 ]] && continue
+
+ distutils_install_for_testing --via-root
+ local deselect=(
+ # network
+ 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+ setuptools/tests/test_distutils_adoption.py
+ # TODO
+ setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+ )
+ [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+ )
+
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+ setuptools
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/sniffio/metadata.xml b/dev-python/sniffio/metadata.xml
index 0c53f9f9d1e2..1115ec74c3cb 100644
--- a/dev-python/sniffio/metadata.xml
+++ b/dev-python/sniffio/metadata.xml
@@ -3,6 +3,7 @@
python@gentoo.org
+ Python
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 89f3dc32585e..ea9fbac068cb 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
DESCRIPTION="Sniff out which async library your code is running under"
@@ -26,6 +26,5 @@ python_test() {
sniffio/_tests/test_sniffio.py::test_curio
)
- pytest -vv ${deselect[@]/#/--deselect } ||
- die "Tests failed with ${EPYTHON}"
+ epytest ${deselect[@]/#/--deselect }
}
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
index a437b0ae5c21..6d5c3b27dc97 100644
--- a/dev-python/tempita/tempita-0.5.3-r3.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
# The package uses pkg_resources
DISTUTILS_USE_SETUPTOOLS=manual
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 3fb55b6ed306..c68d8764b8bf 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,2 +1 @@
-DIST transitions-0.8.7.tar.gz 1094059 BLAKE2B f8a524751567e450818e8e1219af661661985ead8014a060fcde2af5b7c16b3d2d87140804a85cb92d003682aa237de81865336f011f0b46805ba3d2839cf415 SHA512 0a7300a38facf46fe999f53114dc42040ee6aa423f08e378727d0e083a543d1246cb83ca08a861d4e598560e55124905808649e25e57a6002bd12992ba91dc8d
DIST transitions-0.8.8.tar.gz 1100609 BLAKE2B 18ebbb1d45e33e7933208b043b56dca40e8dcda936ffc2af4c38ad9325f3e19c0d3c9a35e4d728be05b97feb47eb922fd48317018761bc5c3243887d2f077e33 SHA512 ff6c039ed5ce9fe484c3469d2aee791010a99af7a9bc8777842f1514d7eca3fd7714694240cb57839754367c58228d59b41a88f12c2b7d75353f75e63768160d
diff --git a/dev-python/transitions/transitions-0.8.7.ebuild b/dev-python/transitions/transitions-0.8.7.ebuild
deleted file mode 100644
index c4dc2836302f..000000000000
--- a/dev-python/transitions/transitions-0.8.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="
- || (
- dev-python/pygraphviz[${PYTHON_USEDEP}]
- dev-python/graphviz[${PYTHON_USEDEP}]
- )
- dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="
- test? (
- dev-python/dill[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pycodestyle[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_install() {
- distutils-r1_src_install
-
- use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.8.8.ebuild b/dev-python/transitions/transitions-0.8.8.ebuild
index baacbad3ee0a..c4dc2836302f 100644
--- a/dev-python/transitions/transitions-0.8.8.ebuild
+++ b/dev-python/transitions/transitions-0.8.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/wand/wand-0.6.6.ebuild b/dev-python/wand/wand-0.6.6.ebuild
index 7c72b4e84647..7c69ca333813 100644
--- a/dev-python/wand/wand-0.6.6.ebuild
+++ b/dev-python/wand/wand-0.6.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/whisper/whisper-1.1.7.ebuild b/dev-python/whisper/whisper-1.1.7.ebuild
index ad3271e64c22..0b3dd86386f4 100644
--- a/dev-python/whisper/whisper-1.1.7.ebuild
+++ b/dev-python/whisper/whisper-1.1.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
inherit distutils-r1
DESCRIPTION="Fixed size round-robin style database"
@@ -15,19 +15,7 @@ SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
distutils_enable_tests pytest
-
-#python_test() {
-# py.test || die "tests failed with ${EPYTHON}"
-#}
diff --git a/dev-python/xarray/xarray-0.17.0.ebuild b/dev-python/xarray/xarray-0.17.0.ebuild
index bedc8b3da110..4be25c37cc3c 100644
--- a/dev-python/xarray/xarray-0.17.0.ebuild
+++ b/dev-python/xarray/xarray-0.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index acea5f0cd605..a22b073b8ccc 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild
index 2f950375e6db..9e55566737c6 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -42,7 +42,7 @@ ruby_add_bdepend "test? (
all_ruby_prepare() {
# Remove items from the common Gemfile that we don't need for this
# test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\)/ s:^:#:" \
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\)/ s:^:#:" \
-e '/:job/,/end/ s:^:#:' \
-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
rm ../Gemfile.lock || die
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
index 8e697a420314..f9de1b021062 100644
--- a/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -40,7 +40,7 @@ ruby_add_bdepend "test? (
all_ruby_prepare() {
# Remove items from the common Gemfile that we don't need for this
# test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\)/ s:^:#:" \
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\)/ s:^:#:" \
-e '/:job/,/end/ s:^:#:' \
-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
rm ../Gemfile.lock || die
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild
index d97bcf87e57e..6220578fea14 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_DOC=""
RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/nio4r/nio4r-2.5.7.ebuild b/dev-ruby/nio4r/nio4r-2.5.7.ebuild
index 658632327942..d53ece5e8831 100644
--- a/dev-ruby/nio4r/nio4r-2.5.7.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -25,8 +25,6 @@ IUSE=""
# Note that nio4r bundles a patched copy of libev, and without these
# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
-
all_ruby_prepare() {
sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
sed -e '/extension/ s:^:#:' -i Rakefile || die
diff --git a/dev-ruby/rails/rails-6.0.3.7.ebuild b/dev-ruby/rails/rails-6.0.3.7.ebuild
index a6d73b63f618..8e4850d7e743 100644
--- a/dev-ruby/rails/rails-6.0.3.7.ebuild
+++ b/dev-ruby/rails/rails-6.0.3.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 43adb1e57d05..3d6955e52ce9 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -1,3 +1 @@
-DIST rqrcode_core-0.1.0.tar.gz 20241 BLAKE2B 1d6f97cd8e1188c0a3ba0246d2102a901ac64fb0bb08317479f9061d3273ea49388e4a6ea02c8de6b54f8e928aefab62fe8b0dca8ba9f7ed31625cf84965df4b SHA512 30ba73f45d69360b0efbf543a774c709a4397bd8f726f4edeaa830397187cd5c7535ac5816d65cea00f356f7111f69629f03fa508b7a7fc91d5618c4cebd8167
-DIST rqrcode_core-0.1.2.tar.gz 20165 BLAKE2B 7d8cabcb2258a667c3b27fcbd11988bbe5cba849b191c45f3288b4d096a6d13df614e64977ce633ec829f0350bbd7ee153342070845f5ed0d6121e6e2aab321a SHA512 9e4362b3b72193a20e44b636b3dfdbb7e496667b147e391660464ea6fd279720cbf4419e3d94561b61bee291c56fee8a3171f2287e2660f071dbda8d7153285b
DIST rqrcode_core-0.2.0.tar.gz 20167 BLAKE2B 68ddad8e908404a9e156cffd0d1f2704671ffeaca0ce48a2a74b3512076d89812f19b537cbef98f3b0ae046486ab11f7681b187a07fb53539afb188bdcc87c21 SHA512 96a1fc3484aabfc30b9a26da705405e56cb82168d34ce252f35481b03142ddab359dfbfc4601d12f67f5a65d466120fc0a295c66c0a7ae07401b58cbd8d5c47a
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
deleted file mode 100644
index 76d6b6aeafc2..000000000000
--- a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
-SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
- sed -i -e '/bundler/ s:^:#:' Rakefile || die
- sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-0.1.2.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-0.1.2.ebuild
deleted file mode 100644
index 76d6b6aeafc2..000000000000
--- a/dev-ruby/rqrcode_core/rqrcode_core-0.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
-SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
- sed -i -e '/bundler/ s:^:#:' Rakefile || die
- sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 9848cd5925ec..8e9684845478 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 4fa311b84520..2987d1221564 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -1,2 +1 @@
-DIST guile-git-0.5.0.tar.gz 304072 BLAKE2B 4f71448d19261fe1dd40fbeafbf9c3a6affbd3ddc16352c2829d28ff3b0253a0017cc40e02fa15eb0141ed9230c1fa2397b46c9076b5e144a629416b937ab1eb SHA512 3ba48ca91208c08ac3a629b0ee97060cc5982c2d823b198cc9ef823a168a434283499a241fc936fa81ba67ee2f5a01db7db563fe0e9d3112da6eb3d77136ee03
DIST guile-git-0.5.1.tar.gz 305077 BLAKE2B f1dd4dade424045f992f9df9fb6c0c6e010deab26d77b32c6a7febda20e03192c91a5ec024bfdf05ea9585c7be307610c1eea6d569a5a97b90d5eedf715e5c59 SHA512 b5a07fc3e2a6c8d6277b3a2d6c2d47461e76441573dcf02c046e272853e3d46266adb2025e15f203d590b751def21c026eb55ed66a6f81795c1409ae5d6aa3c2
diff --git a/dev-scheme/guile-git/guile-git-0.5.0.ebuild b/dev-scheme/guile-git/guile-git-0.5.0.ebuild
deleted file mode 100644
index d34955c8f172..000000000000
--- a/dev-scheme/guile-git/guile-git-0.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Guile bindings of git"
-HOMEPAGE="https://gitlab.com/guile-git/guile-git"
-SRC_URI="https://gitlab.com/guile-git/guile-git/uploads/30be542d90619ca844dd3a3ed2e13808/guile-git-${PV}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# older libgit seems to be incompatible with guile-git bindings
-# https://github.com/trofi/nix-guix-gentoo/issues/7
-RDEPEND="
- >=dev-scheme/guile-2.0.11:=
- dev-scheme/bytestructures
- >=dev-libs/libgit2-1:=
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT=test # Tets suite needs a fix: https://gitlab.com/guile-git/guile-git/issues/18
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_FLAGS_IGNORED='.*[.]go'
-
-src_prepare() {
- default
-
- # guile is trying to avoid recompilation by checking if file
- # /usr/lib64/guile/2.2/site-ccache/
- # is newer than
- #
- # In case it is instead of using guile
- # loads system one (from potentially older version of package).
- # To work it around we bump last modification timestamp of
- # '*.scm' files.
- # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
- find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_test() {
- emake check VERBOSE=1
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b3182e925fd5..936a1de9d34a 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 81d4321b6bf1..e72ba23842d1 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,3 +2,4 @@ DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a1869
DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
+DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
diff --git a/dev-util/bcc/bcc-0.20.0.ebuild b/dev-util/bcc/bcc-0.20.0.ebuild
new file mode 100644
index 000000000000..de2211fe25ce
--- /dev/null
+++ b/dev-util/bcc/bcc-0.20.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake linux-info llvm lua-single python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/libbpf-0.3[static-libs(-)]
+ >=sys-kernel/linux-headers-4.14
+ >=dev-libs/elfutils-0.166:=
+ <=sys-devel/clang-13:=
+ <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+ lua? ( ${LUA_DEPS} )
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+ test? (
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
+ net-analyzer/netperf
+ net-misc/iperf:*
+ )
+"
+BDEPEND="
+ dev-util/cmake
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+ "${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+ ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+ ~KPROBES"
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=12 llvm_pkg_setup
+ python_setup
+}
+
+src_prepare() {
+ local bpf_link_path
+
+ # this avoids bundling
+ bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+ ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+ cmake_src_prepare
+}
+
+python_add_impl() {
+ bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+ local bcc_python_impls
+ python_foreach_impl python_add_impl
+
+ local -a mycmakeargs=(
+ -DREVISION=${PV%%_*}
+ -DENABLE_LLVM_SHARED=ON
+ -DCMAKE_USE_LIBBPF_PACKAGE=ON
+ -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+ -DPYTHON_CMD="${bcc_python_impls%;}"
+
+ )
+ if use lua && use lua_single_target_luajit; then
+ mycmakeargs+=( -DWITH_LUAJIT=1 )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+ python_foreach_impl python_optimize
+
+ newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
index 6f49eba8f496..1279f095ac29 100644
--- a/dev-util/bcpp/metadata.xml
+++ b/dev-util/bcpp/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ https://invisible-island.net/bcpp/CHANGES
+
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index a7958be1462f..939daad7621f 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1 +1,2 @@
DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
+DIST byacc-20210328.tgz 874281 BLAKE2B acd0fb0ebd99987ad5e823391e5186cedc64a9a7b5a1088ba42ac2c1a80d98d86f47c7626af5294853026a2e6bd4aeeca7b39b1a39527c170f118e33c021eba7 SHA512 fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae
diff --git a/dev-util/byacc/byacc-20210328.ebuild b/dev-util/byacc/byacc-20210328.ebuild
new file mode 100644
index 000000000000..556684fdc8ae
--- /dev/null
+++ b/dev-util/byacc/byacc-20210328.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+ econf --program-prefix=b
+}
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index 56c124413057..cc5a71f5bad8 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -1,8 +1,11 @@
-
- base-system@gentoo.org
- Gentoo Base System
-
+
+ base-system@gentoo.org
+ Gentoo Base System
+
+
+ https://invisible-island.net/byacc/CHANGES.html
+
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 49339f452d05..474cb0254145 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,2 +1 @@
DIST ccache-4.2.1.tar.xz 431484 BLAKE2B 10bb0d1e263e441d91c2dfcd2b2c89f64dfb10b4c5aa66012c388fea2c99d8488538e84b5cef86abf0c9f9aaa0a562b7c7be8a9d4a4073ae3c046e7fe28b7eda SHA512 46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77
-DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe
diff --git a/dev-util/ccache/ccache-4.2.ebuild b/dev-util/ccache/ccache-4.2.ebuild
deleted file mode 100644
index 543cf2ad6286..000000000000
--- a/dev-util/ccache/ccache-4.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- app-arch/zstd:0=
- dev-util/shadowman
- sys-apps/gentoo-functions
-"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
- test? ( dev-libs/elfutils )
-"
-BDEPEND="
- app-text/asciidoc
-"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
- "${FILESDIR}"/${PN}-4.0-objdump.patch
- "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
- "${FILESDIR}"/${PN}-4.2-atomic.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-
- # mainly used in tests
- tc-export CC OBJDUMP
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_CCACHE=OFF
- -DUSE_FASTER_LINKER=OFF
- -DZSTD_FROM_INTERNET=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- dobin ccache-config
- insinto /usr/share/shadowman/tools
- newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT:-/} == / ]]; then
- eselect compiler-shadow update ccache
- fi
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index fd99281c3c56..7fa1a3115a2e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.1.tar.gz 9438789 BLAKE2B 44f3f209f0bf55fa56d439d6196faac311ef55031eb23dafaa61266d83280eca32d9575f6c462b947f12c068e61c63d031b2046ab57099668dfcf7e61ffa1bb2 SHA512 726a2ea36dcc2887adc9b2a579060a7c5d7780bf246bc7915a3bfd35a800a544bb27d4daeae2a37c8f8acf576ed9feb45f97f2d53d7049da98b73cd2d2524248
DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
diff --git a/dev-util/cmake/cmake-3.20.1.ebuild b/dev-util/cmake/cmake-3.20.1.ebuild
deleted file mode 100644
index 3d40c53f2157..000000000000
--- a/dev-util/cmake/cmake-3.20.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
- toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-arch/libarchive-3.3.3:=
- app-crypt/rhash
- >=dev-libs/expat-2.0.1
- >=dev-libs/jsoncpp-1.9.2-r2:0=
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
- test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
- # Next patch needs to be reworked
- #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # disable running of cmake in bootstrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- # bootstrap script isn't exactly /bin/sh compatible
- tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actually bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
- # TestUpload: requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # disable Xcode hooks, bug #652134
- sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
- Source/CMakeLists.txt || die
- sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
- -e '/cmGlobalXCodeGenerator.h/d' \
- Source/cmake.cxx || die
- # disable isysroot usage with GCC, we've properly instructed
- # where things are via GCC configuration and ldwrapper
- sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
- Modules/Platform/Apple-GNU-*.cmake || die
- # disable isysroot usage with clang as well
- sed -i -e '/_SYSROOT_FLAG/d' \
- Modules/Platform/Apple-Clang.cmake || die
- # don't set a POSIX standard, system headers don't like that, #757426
- sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
- Source/cmLoadCommandCommand.cxx \
- Source/cmStandardLexer.h \
- Source/cmSystemTools.cxx \
- Source/cmTimestamp.cxx
- sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
- Source/cmStandardLexer.h
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
- use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if use qt5; then
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- if use qt5; then
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
-}
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
index 6f49eba8f496..d8d8b11f5ba5 100644
--- a/dev-util/cproto/metadata.xml
+++ b/dev-util/cproto/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ https://invisible-island.net/cproto/CHANGES.html
+
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index fc5198d6971a..949ec2796a1d 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1 +1,2 @@
DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
+DIST dialog-1.3-20210324.tgz 561235 BLAKE2B fbeae52e207def0b9ebcd9669f9321a711be82d0b6e163a94adaa21192a8fefa67255cd8b0a0121559728f4e5108ea8a90992a64d39fd0fa0f32e201de11f5a9 SHA512 6850485de5ffb4b5b702be792381b1e2c3e3e74143474b9d96f418ff755e17bd8075f1efab950cf0ca84fffb61c2373526d3607f2f1805b4056aac0ea6831069
diff --git a/dev-util/dialog/dialog-1.3.20210324.ebuild b/dev-util/dialog/dialog-1.3.20210324.ebuild
new file mode 100644
index 000000000000..49c4faca4039
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20210324.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples minimal nls static-libs unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )"
+
+src_prepare() {
+ default
+ sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+ sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+ econf \
+ --disable-rpath-hack \
+ $(use_enable nls) \
+ $(use_with !minimal libtool) \
+ --with-libtool-opts=$(usex static-libs '' '-shared') \
+ --with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+ use minimal && default || emake DESTDIR="${D}" install-full
+
+ use examples && dodoc -r samples
+
+ dodoc CHANGES README
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index 0c448e73a433..05ae37b868f1 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -1,11 +1,14 @@
-
-base-system@gentoo.org
-Gentoo Base System Project
-
-
+
+ base-system@gentoo.org
+ Gentoo Base System Project
+
+
+
+ https://invisible-island.net/dialog/CHANGES.html
+
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c9ce1abf73a0..4a5341dace58 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-170.tar.gz 1569521 BLAKE2B c036ce959f3d36eefbb2a6638c0e34ccb554c3999a17e3f32ada5d10580c96d42ffd8da59ffd21987648e185ce42afa7540129a203d65d94026e2a001fde9b9c SHA512 c569d223de8219348d856647d69b3e7bc04ee0740e54b85a1a91580ea91e550bcf23592372068a2dd8d166c79ae2f266b63173c1c2c75667747b23c028aa5d57
DIST diffoscope-174.tar.gz 1590794 BLAKE2B 8ff40a301571f33953aafb431081a34e1c84fc8b222869fa0a7967f842e950727467af38dfb733257637a946b313bdc72a176b23ea1a36f977bdc8484e1d01e7 SHA512 8bc51c902ca24e08aacb96e3f225837f1de926746feddfbea7cd6bb947710c29ce3f32a98e032fb417d7938a86ec9de2bf15f556e7887571480facd6ce63acd3
diff --git a/dev-util/diffoscope/diffoscope-170.ebuild b/dev-util/diffoscope/diffoscope-170.ebuild
deleted file mode 100644
index a189ed464d44..000000000000
--- a/dev-util/diffoscope/diffoscope-170.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- acl? ( sys-apps/acl )
- binutils? ( sys-devel/binutils )
- bzip2? ( app-arch/bzip2 )
- libcaca? ( media-libs/libcaca )
- colord? ( x11-misc/colord )
- cpio? ( app-arch/cpio )
- diff? ( sys-apps/diffutils )
- docx? ( app-text/docx2txt )
- dtc? ( sys-apps/dtc )
- e2fsprogs? ( sys-fs/e2fsprogs )
- file? ( sys-apps/file )
- find? ( sys-apps/findutils )
- gettext? ( sys-devel/gettext )
- gif? ( media-libs/giflib )
- gpg? ( app-crypt/gnupg )
- gzip? ( app-arch/gzip )
- haskell? ( dev-lang/ghc )
- hdf5? ( sci-libs/hdf5 )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( app-cdr/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- )
- postscript? ( app-text/ghostscript-gpl )
- R? ( dev-lang/R )
- rpm? ( app-arch/rpm )
- sqlite? ( dev-db/sqlite:3 )
- squashfs? ( sys-fs/squashfs-tools )
- ssh? ( net-misc/openssh )
- tar? ( app-arch/tar )
- tcpdump? ( net-analyzer/tcpdump )
- xz? ( app-arch/xz-utils )
- zip? ( app-arch/unzip )
- zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index d052c330f8fc..ed4b0ab35d3c 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org/"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
IUSE="gjs gtk-doc +introspection python webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index f801b3b477e3..4f3e1d2a82c8 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
distutils_enable_tests setup.py
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.7-py310-update.patch
+)
+
src_test() {
local -x PYTHONDONTWRITEBYTECODE=
distutils-r1_src_test
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 13de99749745..dda473a6264d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,3 +1,2 @@
DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.2.0.tar.gz 8254980 BLAKE2B 51335b5560ea9085a7cb6ae998657d62353ad65e10f715ca25ec34cde75d48cd06d8312a898de71096138365d3ea13de45e6e48b2c0f06cea7d593cca43a0ef9 SHA512 664ea6df65c1ea8d13a80d281c3dbbcae16fb308826b9276e68d63f26f239f4a5c0d59abcf9325c299894ad4ebf1098b964aa3cad0bbe58b6c96cbd6e7b25952
DIST radare2-5.2.1.tar.gz 8302475 BLAKE2B 2edfa30d15214ac4dac6065349c808b539619413e7a100459efd5bf74e95c2483edb1ec13de8387d3a7dcfe25a2922ee377c37f4781c374df04e63fe98910b7e SHA512 c744f5c8fff163022a7a9a913fe34dfa0dee0d9ab3b18bd4cc038c2d487dbfeba2f1523aa12a3166a2c22c45bcc71e802fae101b72fc2e6adab96b522c0de17b
diff --git a/dev-util/radare2/radare2-5.2.0.ebuild b/dev-util/radare2/radare2-5.2.0.ebuild
deleted file mode 100644
index ce046dd6d939..000000000000
--- a/dev-util/radare2/radare2-5.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
- SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
- dev-libs/libzip
- dev-libs/xxhash
- sys-apps/file
- sys-libs/zlib
- dev-libs/capstone:0=
- ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-ssl-build.patch)
-
-src_prepare() {
- # Fix hardcoded docdir for fortunes
- sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
- libr/include/r_userconf.h.acr
- default
-}
-
-src_configure() {
- # Ideally these should be set by ./configure
- tc-export CC AR LD OBJCOPY RANLIB
- export HOST_CC=${CC}
-
- econf \
- --without-libuv \
- --with-syscapstone \
- --with-sysmagic \
- --with-sysxxhash \
- --with-syszip \
- $(use_with ssl openssl)
-}
-
-src_install() {
- default
-
- insinto /usr/share/zsh/site-functions
- doins doc/zsh/_*
-
- newbashcomp doc/bash_autocompletion.sh "${PN}"
- bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
- # a workaround for unstable $(INSTALL) call, bug #574866
- local d
- for d in doc/*; do
- if [[ -d ${d} ]]; then
- rm -rfv "${d}" || die "failed to delete '${d}'"
- fi
- done
-
- # These are not really docs. radare assumes
- # uncompressed files: bug #761250
- docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 0f946fa5573b..5b03f7a2db8f 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,2 +1 @@
-DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
deleted file mode 100644
index 6057a230e385..000000000000
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_configure() {
- econf \
- --enable-golang \
- ac_cv_path_BISON="no" \
- $(use_enable debug)
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index d83572a074ca..65b00525e6e3 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,2 +1 @@
-DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
DIST ShellCheck-0.7.2.tar.gz 173937 BLAKE2B ac5b6c4aec9a9bb736e1218726780e9f97775ad5f144e5862daf24a88fe0bf24404b58880638e03ceeb02ff5ca84027727ebd637a82f8ae272dc18bc14d5c532 SHA512 ec77038763b3520deef3838d0f51f06bc3d755945f519b19be09765b3122f0251f00cd4907cb60c38612161b0c03f73025e0f52b3c47e22855f0b0e3ff5f81c5
diff --git a/dev-util/shellcheck/shellcheck-0.7.1.ebuild b/dev-util/shellcheck/shellcheck-0.7.1.ebuild
deleted file mode 100644
index 357bb0ecd576..000000000000
--- a/dev-util/shellcheck/shellcheck-0.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/diff-0.2.0:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- >=dev-haskell/parsec-3.0:=[profile?]
- >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
- dev-haskell/regex-tdfa:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index b31818acb312..a788c8273c03 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,2 +1 @@
-DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
DIST visualvm-2.0.6.tar.gz 39086223 BLAKE2B f5657d4ccc0063281226b4d70c35820c78333db5574bae5acadc321938cfe42a3e0e4c1752badcc3e01b5694f6081213f5da898f5a13587d44e36d18fbd5c2c7 SHA512 03ad628f753e31f26217366d8f5f184f4657ba55badd55f1466dbf00cda61e9c320cc8ddb82b228863b9c6416aec3e94a01c5429e2b2f4664c9daaccd02f5d7b
diff --git a/dev-util/visualvm/files/visualvm-r1.conf b/dev-util/visualvm/files/visualvm-r1.conf
deleted file mode 100644
index fce7cfece13f..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default user directory
-visualvm_default_userdir="${HOME}/.visualvm"
-visualvm_default_cachedir="${HOME}/.cache/visualvm"
-
-# Default runtime options
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J-XX:+IgnoreUnrecognizedVMOptions"
-
-# JDK home
-visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm-r1.sh b/dev-util/visualvm/files/visualvm-r1.sh
deleted file mode 100644
index dd6956da0697..000000000000
--- a/dev-util/visualvm/files/visualvm-r1.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# source the configuration file
-. /etc/visualvm/visualvm.conf
-
-# launch visualvm
-exec sh /usr/share/visualvm/platform/lib/nbexec \
- --branding visualvm \
- --jdkhome "${visualvm_jdkhome}" \
- --userdir "${visualvm_default_userdir}" \
- --cachedir "${visualvm_default_cachedir}" \
- --clusters /usr/share/visualvm/cluster:/usr/share/visualvm/platform:/usr/share/visualvm/profiler \
- ${visualvm_default_options} "${@}"
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
deleted file mode 100644
index a33b5289f774..000000000000
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=90
-NBT=24042018
-NBZ=nb${NBV}_${PN}_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-# SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-# https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=virtual/jre-1.7"
-
-DEPEND="
- >=virtual/jdk-1.7"
-
-S="${WORKDIR}/${P}/${PN}"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}" || die
- # unpack ${NBZ}
- unpack "${S}"/"${NBZ}" # archive is included in the main archive
-}
-
-src_prepare() {
- default
-
- # Remove unneeded binaries
- rm -rv netbeans/platform/lib/*.{dll,exe} \
- netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
- find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
- -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
- # this is the visualvm cluster
- insinto ${INSTALL_DIR}
- doins -r build/cluster netbeans/{platform,profiler}
-
- # configuration file that can be used to tweak visualvm startup parameters
- insinto /etc/${PN}
- newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
-
- # visualvm runtime script
- newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
-
- # makes visualvm entry
- make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.0.6.ebuild b/dev-util/visualvm/visualvm-2.0.6.ebuild
index e132e704c5ce..001ed43cc6e0 100644
--- a/dev-util/visualvm/visualvm-2.0.6.ebuild
+++ b/dev-util/visualvm/visualvm-2.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
>=virtual/jre-1.8"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 795403f759bd..1da00b93f669 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index ab3886b3a297..79611242d1be 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,2 +1 @@
-DIST cvs-fast-export-1.56.tar.gz 492482 BLAKE2B 936f9f448dd6577122ace45380d8726f648fd31ffb9840bd931e343cc6c3f3526e4aa6f8735feb2a49d4d8df5fdb83ea54438e51951ea2be3b1ab221fdc11c33 SHA512 852a13fab095817a9650164c93f11aaeb4ced827489f20bde35baa492f6f125e82c3f35410899978706589105275536d98d973fbf482758ed054b3bbe9e3c581
DIST cvs-fast-export-1.57.tar.gz 503473 BLAKE2B 06d5b03d550be9604a04b4f03cd19d06abbe84efb6fbb424a3ae8c58f2964dff31e1718baf61adf70fe17c2beb6753cdd0fba9e0e1a5ba5e9d8ae7b87721a336 SHA512 bb129d58a66ca8aa9feb6dcdf6d83553ed1099d6023041c4fb8fa9b923461b6eb9e59ec304b3443f754d7710a2655fd2c104cbaa5ac604ee471de727b92fc091
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.56.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.56.ebuild
deleted file mode 100644
index 45dc138ac582..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.56.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast-export history from a CVS repository or RCS collection"
-HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- app-text/asciidoc"
-
-RESTRICT=test # upstream does not ship some tests in tarball
-
-src_prepare() {
- default
-
- tc-export CC
- export prefix="${EPREFIX}"/usr
-
- # respect CC, CFLAGS and LDFLAGS
- sed \
- -e 's/cc /$(CC) $(LDFLAGS) /' \
- -e 's/^CFLAGS += -O/#&/' \
- -e 's/CFLAGS=/CFLAGS+=/' \
- -i Makefile || die
-}
-
-src_compile() {
- # '.adoc.html' rules can't be executed in parallel
- # as they reuse the same 'docbook-xsl.css' file name.
- emake -j1 html
- # Allow full parallelism for the rest
- emake
-}
-
-src_install() {
- default
- dodoc README.adoc
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 2ca1bcd66716..dbad7933760f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/base.eclass b/eclass/base.eclass
deleted file mode 100644
index 3a81fb76ccf1..000000000000
--- a/eclass/base.eclass
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# DEPRECATED
-# This eclass has been deprecated and must not be used by any new
-# ebuilds or eclasses. Replacements for particular phase functions
-# in EAPI 2+:
-#
-# base_src_unpack() - default (or unpacker_src_unpack if unpacker.eclass
-# was inherited)
-# base_src_prepare() - inherit eutils, inline:
-# epatch "${PATCHES[@]}" # if PATCHES defined as array
-# epatch ${PATCHES} # if PATCHES defined as string
-# epatch_user
-# base_src_configure() - default
-# base_src_compile() - default
-# base_src_install() - default
-# base_src_install_docs() - einstalldocs from eutils.eclass
-
-# @DEAD
-# @ECLASS: base.eclass
-# @MAINTAINER:
-# QA Team
-# @AUTHOR:
-# Original author: Dan Armak
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5
-# @BLURB: The base eclass defines some default functions and variables.
-# @DEPRECATED: none
-# @DESCRIPTION:
-# The base eclass defines some default functions and variables.
-
-if [[ -z ${_BASE_ECLASS} ]]; then
-_BASE_ECLASS=1
-
-inherit eutils
-
-BASE_EXPF="src_unpack src_compile src_install"
-case "${EAPI:-0}" in
- 0|1) ;;
- 2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
- *) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
-esac
-
-EXPORT_FUNCTIONS ${BASE_EXPF}
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-#
-# DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-#
-# HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-# This variable is expected to be defined in global scope of ebuild.
-# Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase based on EAPI.
-#
-# NOTE: if using patches folders with special file suffixes you have to
-# define one additional variable EPATCH_SUFFIX="something"
-#
-# PATCHES=( "${FILESDIR}/mypatch.patch" "${FILESDIR}/patches_folder/" )
-
-
-# @FUNCTION: base_src_unpack
-# @DESCRIPTION:
-# The base src_unpack function, which is exported.
-# Calls also src_prepare with eapi older than 2.
-base_src_unpack() {
- debug-print-function $FUNCNAME "$@"
-
- pushd "${WORKDIR}" > /dev/null
-
- if [[ $(type -t unpacker_src_unpack) == "function" ]] ; then
- unpacker_src_unpack
- elif [[ -n ${A} ]] ; then
- unpack ${A}
- fi
- has src_prepare ${BASE_EXPF} || base_src_prepare
-
- popd > /dev/null
-}
-
-# @FUNCTION: base_src_prepare
-# @DESCRIPTION:
-# The base src_prepare function, which is exported
-# EAPI is greater or equal to 2. Here the PATCHES array is evaluated.
-base_src_prepare() {
- debug-print-function $FUNCNAME "$@"
- debug-print "$FUNCNAME: PATCHES=$PATCHES"
-
- local patches_failed=0
-
- pushd "${S}" > /dev/null
- if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
- for x in "${PATCHES[@]}"; do
- debug-print "$FUNCNAME: applying patch from ${x}"
- if [[ -d "${x}" ]]; then
- # Use standardized names and locations with bulk patching
- # Patch directory is ${WORKDIR}/patch
- # See epatch() in eutils.eclass for more documentation
- EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
-
- # in order to preserve normal EPATCH_SOURCE value that can
- # be used other way than with base eclass store in local
- # variable and restore later
- oldval=${EPATCH_SOURCE}
- EPATCH_SOURCE=${x}
- EPATCH_FORCE=yes
- epatch
- EPATCH_SOURCE=${oldval}
- elif [[ -f "${x}" ]]; then
- epatch "${x}"
- else
- ewarn "QA: File or directory \"${x}\" does not exist."
- ewarn "QA: Check your PATCHES array or add missing file/directory."
- patches_failed=1
- fi
- done
- [[ ${patches_failed} -eq 1 ]] && die "Some patches failed. See above messages."
- else
- for x in ${PATCHES}; do
- debug-print "$FUNCNAME: patching from ${x}"
- epatch "${x}"
- done
- fi
-
- # Apply user patches
- debug-print "$FUNCNAME: applying user patches"
- epatch_user
-
- popd > /dev/null
-}
-
-# @FUNCTION: base_src_configure
-# @DESCRIPTION:
-# The base src_configure function, which is exported when
-# EAPI is greater or equal to 2. Runs basic econf.
-base_src_configure() {
- debug-print-function $FUNCNAME "$@"
-
- # there is no pushd ${S} so we can override its place where to run
- [[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "$@"
-}
-
-# @FUNCTION: base_src_compile
-# @DESCRIPTION:
-# The base src_compile function, calls src_configure with
-# EAPI older than 2.
-base_src_compile() {
- debug-print-function $FUNCNAME "$@"
-
- has src_configure ${BASE_EXPF} || base_src_configure
- base_src_make "$@"
-}
-
-# @FUNCTION: base_src_make
-# @DESCRIPTION:
-# Actual function that runs emake command.
-base_src_make() {
- debug-print-function $FUNCNAME "$@"
-
- if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
- emake "$@" || die "died running emake, $FUNCNAME"
- fi
-}
-
-# @FUNCTION: base_src_install
-# @DESCRIPTION:
-# The base src_install function. Runs make install and
-# installs documents and html documents from DOCS and HTML_DOCS
-# arrays.
-base_src_install() {
- debug-print-function $FUNCNAME "$@"
-
- emake DESTDIR="${D}" "$@" install || die "died running make install, $FUNCNAME"
- base_src_install_docs
-}
-
-# @FUNCTION: base_src_install_docs
-# @DESCRIPTION:
-# Actual function that install documentation from
-# DOCS and HTML_DOCS arrays.
-base_src_install_docs() {
- debug-print-function $FUNCNAME "$@"
-
- local x
-
- pushd "${S}" > /dev/null
-
- if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
- for x in "${DOCS[@]}"; do
- debug-print "$FUNCNAME: docs: creating document from ${x}"
- dodoc "${x}" || die "dodoc failed"
- done
- fi
- if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
- for x in "${HTML_DOCS[@]}"; do
- debug-print "$FUNCNAME: docs: creating html document from ${x}"
- dohtml -r "${x}" || die "dohtml failed"
- done
- fi
-
- popd > /dev/null
-}
-
-fi
diff --git a/eclass/games.eclass b/eclass/games.eclass
deleted file mode 100644
index c3645ea5a802..000000000000
--- a/eclass/games.eclass
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: games.eclass
-# @MAINTAINER:
-# Games team
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5
-# @BLURB: Standardizing the install of games.
-# @DEPRECATED: none
-# @DESCRIPTION:
-# This eclass makes sure that games are consistently handled in gentoo.
-# It installs game files by default in FHS-compatible directories
-# like /usr/share/games and sets more restrictive permissions in order
-# to avoid some security bugs.
-#
-# The installation directories as well as the user and group files are
-# installed as can be controlled by the user. See the variables like
-# GAMES_BINDIR, GAMES_USER etc. below. These are NOT supposed to be set
-# by ebuilds!
-#
-# For a general guide on writing games ebuilds, see:
-# https://wiki.gentoo.org/wiki/Project:Games/Ebuild_howto
-#
-# WARNING: This eclass is DEPRECATED and must not be used by new games
-# ebuilds, bug #574082. When writing game ebuilds, no specific eclass
-# is needed. For more details, see the QA team policies page:
-# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games
-
-
-if [[ -z ${_GAMES_ECLASS} ]]; then
-_GAMES_ECLASS=1
-
-inherit base multilib toolchain-funcs eutils user
-
-case ${EAPI:-0} in
- 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;;
- 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
- *) die "games.eclass is banned in EAPI=${EAPI}, see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games" ;;
-esac
-
-if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then
- # environment file
- RDEPEND="games-misc/games-envd"
-fi
-
-# @ECLASS-VARIABLE: GAMES_PREFIX
-# @DESCRIPTION:
-# Prefix where to install games, mostly used by GAMES_BINDIR. Games data should
-# still go into GAMES_DATADIR. May be set by the user.
-GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
-
-# @ECLASS-VARIABLE: GAMES_PREFIX_OPT
-# @DESCRIPTION:
-# Prefix where to install precompiled/blob games, usually followed by
-# package name. May be set by the user.
-GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
-
-# @ECLASS-VARIABLE: GAMES_DATADIR
-# @DESCRIPTION:
-# Base directory where to install game data files, usually followed by
-# package name. May be set by the user.
-GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
-
-# @ECLASS-VARIABLE: GAMES_DATADIR_BASE
-# @DESCRIPTION:
-# Similar to GAMES_DATADIR, but only used when a package auto appends 'games'
-# to the path. May be set by the user.
-GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share}
-
-# @ECLASS-VARIABLE: GAMES_SYSCONFDIR
-# @DESCRIPTION:
-# Where to install global games configuration files, usually followed by
-# package name. May be set by the user.
-GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games}
-
-# @ECLASS-VARIABLE: GAMES_STATEDIR
-# @DESCRIPTION:
-# Where to install/store global variable game data, usually followed by
-# package name. May be set by the user.
-GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games}
-
-# @ECLASS-VARIABLE: GAMES_LOGDIR
-# @DESCRIPTION:
-# Where to store global game log files, usually followed by
-# package name. May be set by the user.
-GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games}
-
-# @ECLASS-VARIABLE: GAMES_BINDIR
-# @DESCRIPTION:
-# Where to install the game binaries. May be set by the user. This is in PATH.
-GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin}
-
-# @ECLASS-VARIABLE: GAMES_ENVD
-# @INTERNAL
-# @DESCRIPTION:
-# The games environment file name which sets games specific LDPATH and PATH.
-GAMES_ENVD="90games"
-
-# @ECLASS-VARIABLE: GAMES_USER
-# @DESCRIPTION:
-# The USER who owns all game files and usually has write permissions.
-# May be set by the user.
-GAMES_USER=${GAMES_USER:-root}
-
-# @ECLASS-VARIABLE: GAMES_USER_DED
-# @DESCRIPTION:
-# The USER who owns all game files related to the dedicated server part
-# of a package. May be set by the user.
-GAMES_USER_DED=${GAMES_USER_DED:-games}
-
-# @ECLASS-VARIABLE: GAMES_GROUP
-# @DESCRIPTION:
-# The GROUP that owns all game files and usually does not have
-# write permissions. May be set by the user.
-# If you want games world-executable, then you can at least set this variable
-# to 'users' which is almost the same.
-GAMES_GROUP=${GAMES_GROUP:-games}
-
-# @FUNCTION: games_get_libdir
-# @DESCRIPTION:
-# Gets the directory where to install games libraries. This is in LDPATH.
-games_get_libdir() {
- echo ${GAMES_PREFIX}/$(get_libdir)
-}
-
-# @FUNCTION: egamesconf
-# @USAGE: [...]
-# @DESCRIPTION:
-# Games equivalent to 'econf' for autotools based build systems. It passes
-# the necessary games specific directories automatically.
-egamesconf() {
- # handle verbose build log pre-EAPI5
- local _gamesconf
- if has "${EAPI:-0}" 0 1 2 3 4 ; then
- if grep -q -s disable-silent-rules "${ECONF_SOURCE:-.}"/configure ; then
- _gamesconf="--disable-silent-rules"
- fi
- fi
-
- # bug 493954
- if grep -q -s datarootdir "${ECONF_SOURCE:-.}"/configure ; then
- _gamesconf="${_gamesconf} --datarootdir=/usr/share"
- fi
-
- econf \
- --prefix="${GAMES_PREFIX}" \
- --libdir="$(games_get_libdir)" \
- --datadir="${GAMES_DATADIR}" \
- --sysconfdir="${GAMES_SYSCONFDIR}" \
- --localstatedir="${GAMES_STATEDIR}" \
- ${_gamesconf} \
- "$@"
-}
-
-# @FUNCTION: gameswrapper
-# @USAGE: [...]
-# @INTERNAL
-# @DESCRIPTION:
-# Wraps an install command like dobin, dolib etc, so that
-# it has GAMES_PREFIX as prefix.
-gameswrapper() {
- # dont want to pollute calling env
- (
- into "${GAMES_PREFIX}"
- cmd=$1
- shift
- ${cmd} "$@"
- )
-}
-
-# @FUNCTION: dogamesbin
-# @USAGE: ...
-# @DESCRIPTION:
-# Install one or more games binaries.
-dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: dogamessbin
-# @USAGE: ...
-# @DESCRIPTION:
-# Install one or more games system binaries.
-dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: dogameslib
-# @USAGE: ...
-# @DESCRIPTION:
-# Install one or more games libraries.
-dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: dogameslib.a
-# @USAGE: ...
-# @DESCRIPTION:
-# Install one or more static games libraries.
-dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: dogameslib.so
-# @USAGE: ...
-# @DESCRIPTION:
-# Install one or more shared games libraries.
-dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: newgamesbin
-# @USAGE:
-# @DESCRIPTION:
-# Install one games binary with a new name.
-newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: newgamessbin
-# @USAGE:
-# @DESCRIPTION:
-# Install one system games binary with a new name.
-newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
-
-# @FUNCTION: games_make_wrapper
-# @USAGE: [chdir] [libpaths] [installpath]
-# @DESCRIPTION:
-# Create a shell wrapper script named wrapper in installpath
-# (defaults to the games bindir) to execute target (default of wrapper) by
-# first optionally setting LD_LIBRARY_PATH to the colon-delimited
-# libpaths followed by optionally changing directory to chdir.
-games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; }
-
-# @FUNCTION: gamesowners
-# @USAGE: [...] ...
-# @DESCRIPTION:
-# Run 'chown' with the given args on the given files. Owner and
-# group are GAMES_USER and GAMES_GROUP and must not be passed
-# as args.
-gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; }
-
-# @FUNCTION: gamesperms
-# @USAGE: ...
-# @DESCRIPTION:
-# Run 'chmod' with games specific permissions on the given files.
-gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; }
-
-# @FUNCTION: prepgamesdirs
-# @DESCRIPTION:
-# Fix all permissions/owners of files in games related directories,
-# usually called at the end of src_install().
-prepgamesdirs() {
- local dir f mode
- for dir in \
- "${GAMES_PREFIX}" "${GAMES_PREFIX_OPT}" "${GAMES_DATADIR}" \
- "${GAMES_SYSCONFDIR}" "${GAMES_STATEDIR}" "$(games_get_libdir)" \
- "${GAMES_BINDIR}" "$@"
- do
- [[ ! -d ${D}/${dir} ]] && continue
- (
- gamesowners -R "${D}/${dir}"
- find "${D}/${dir}" -type d -print0 | xargs -0 chmod 750
- mode=o-rwx,g+r,g-w
- [[ ${dir} = ${GAMES_STATEDIR} ]] && mode=o-rwx,g+r
- find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
-
- # common trees should not be games owned #264872 #537580
- fowners root:0 "${dir}"
- fperms 755 "${dir}"
- if [[ ${dir} == "${GAMES_PREFIX}" \
- || ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
- for d in $(get_libdir) bin ; do
- # check if dirs exist to avoid "nonfatal" option
- if [[ -e ${D}/${dir}/${d} ]] ; then
- fowners root:0 "${dir}/${d}"
- fperms 755 "${dir}/${d}"
- fi
- done
- fi
- ) &>/dev/null
-
- f=$(find "${D}/${dir}" -perm +4000 -a -uid 0 2>/dev/null)
- if [[ -n ${f} ]] ; then
- eerror "A game was detected that is setuid root!"
- eerror "${f}"
- die "refusing to merge a setuid root game"
- fi
- done
- [[ -d ${D}/${GAMES_BINDIR} ]] || return 0
- find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \;
-}
-
-# @FUNCTION: games_pkg_setup
-# @DESCRIPTION:
-# Export some toolchain specific variables and create games related groups
-# and users. This function is exported as pkg_setup().
-games_pkg_setup() {
- tc-export CC CXX LD AR RANLIB
-
- enewgroup "${GAMES_GROUP}" 35
- [[ ${GAMES_USER} != "root" ]] \
- && enewuser "${GAMES_USER}" 35 -1 "${GAMES_PREFIX}" "${GAMES_GROUP}"
- [[ ${GAMES_USER_DED} != "root" ]] \
- && enewuser "${GAMES_USER_DED}" 36 /bin/bash "${GAMES_PREFIX}" "${GAMES_GROUP}"
-
- # Dear portage team, we are so sorry. Lots of love, games team.
- # See Bug #61680
- [[ ${USERLAND} != "GNU" ]] && return 0
- [[ $(egetshell "${GAMES_USER_DED}") == "/bin/false" ]] \
- && usermod -s /bin/bash "${GAMES_USER_DED}"
-}
-
-# @FUNCTION: games_src_configure
-# @DESCRIPTION:
-# Runs egamesconf if there is a configure file.
-# This function is exported as src_configure().
-games_src_configure() {
- [[ -x "${ECONF_SOURCE:-.}"/configure ]] && egamesconf
-}
-
-# @FUNCTION: games_src_compile
-# @DESCRIPTION:
-# Runs base_src_make(). This function is exported as src_compile().
-games_src_compile() {
- case ${EAPI:-0} in
- 0|1) games_src_configure ;;
- esac
- base_src_make
-}
-
-# @FUNCTION: games_pkg_preinst
-# @DESCRIPTION:
-# Synchronizes GAMES_STATEDIR of the ebuild image with the live filesystem.
-games_pkg_preinst() {
- local f
-
- while read f ; do
- if [[ -e ${ROOT}/${GAMES_STATEDIR}/${f} ]] ; then
- cp -p \
- "${ROOT}/${GAMES_STATEDIR}/${f}" \
- "${D}/${GAMES_STATEDIR}/${f}" \
- || die "cp failed"
- # make the date match the rest of the install
- touch "${D}/${GAMES_STATEDIR}/${f}"
- fi
- done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null)
-}
-
-# @FUNCTION: games_pkg_postinst
-# @DESCRIPTION:
-# Prints some warnings and infos, also related to games groups.
-games_pkg_postinst() {
- if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then
- ewarn "Remember, in order to play games, you have to"
- ewarn "be in the '${GAMES_GROUP}' group."
- echo
- case ${CHOST} in
- *-darwin*) ewarn "Just run 'niutil -appendprop / /groups/games users '";;
- *-freebsd*|*-dragonfly*) ewarn "Just run 'pw groupmod ${GAMES_GROUP} -m '";;
- *) ewarn "Just run 'gpasswd -a ${GAMES_GROUP}', then have re-login.";;
- esac
- echo
- einfo "For more info about Gentoo gaming in general, see our website:"
- einfo " https://games.gentoo.org/"
- echo
- fi
-}
-
-# @FUNCTION: games_ut_unpack
-# @USAGE:
-# @DESCRIPTION:
-# Unpack .uz2 files for UT2003/UT2004.
-games_ut_unpack() {
- local ut_unpack="$1"
- local f=
-
- if [[ -z ${ut_unpack} ]] ; then
- die "You must provide an argument to games_ut_unpack"
- fi
- if [[ -f ${ut_unpack} ]] ; then
- uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" \
- || die "uncompressing file ${ut_unpack}"
- fi
- if [[ -d ${ut_unpack} ]] ; then
- while read f ; do
- uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \
- || die "uncompressing file ${f}"
- rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}"
- done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
- fi
-}
-
-# @FUNCTION: games_umod_unpack
-# @USAGE:
-# @DESCRIPTION:
-# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004.
-# Don't forget to set 'dir' and 'Ddir'.
-games_umod_unpack() {
- local umod=$1
- mkdir -p "${Ddir}"/System
- cp "${dir}"/System/{ucc-bin,{Manifest,Def{ault,User}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System
- cd "${Ddir}"/System
- UT_DATA_PATH=${Ddir}/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \
- || die "uncompressing file ${umod}"
- rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \
- || die "Removing temporary files"
-}
-
-fi
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 3ff65cc32645..4f1c56c98f87 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index 24e258af6a83..b8526b981b14 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1 +1,2 @@
DIST gnuchess-6.2.7.tar.gz 802863 BLAKE2B 2fea825cdf0e629b3c2e9965d16f432edff81ceac8e7fbfd99b7be93f7281f813b10b91a62b3823acbf8967af538b04d2d87f93abde4a580e659e1fbdc5966e9 SHA512 1ed9e9344fbfc8e78504290a44e2710acab53f211c4349cafb7b64cc9a1fa923fbef4b4cbe3dd96438049b1da21415db3eb81fe663a94551c30105207086e343
+DIST gnuchess-6.2.8.tar.gz 804080 BLAKE2B 7079c07ae7cd2f225c428a7bf14d53eec394382508544994918b87db35d5cbdeb9cf42a11f5bc2f9c0c7b778384d6cdb9aad4490bc9cfd40a513fc2e36cbdd67 SHA512 9146ee727c1eb8002eb3b1e762d71876b512eff0799eafec7019d5312766fe2bd6655c622e66f86e92f80d2f3666e48158a1245b42c30bd3221a8b379689ecdd
diff --git a/games-board/gnuchess/gnuchess-6.2.8.ebuild b/games-board/gnuchess/gnuchess-6.2.8.ebuild
new file mode 100644
index 000000000000..3d7f17e471b5
--- /dev/null
+++ b/games-board/gnuchess/gnuchess-6.2.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Console based chess interface"
+HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
+SRC_URI="mirror://gnu/chess/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+src_configure() {
+ # bug #491088
+ econf --without-readline
+}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 815d8942418c..41d7875b39d8 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
deleted file mode 100644
index fe4002ec2d46..000000000000
--- a/games-misc/games-envd/games-envd-0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib games
-
-DESCRIPTION="Environment file for gentoo games"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S=${WORKDIR}
-
-pkg_setup() {
- games_pkg_setup
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- if [[ -e "${EROOT%/}/etc/env.d/${GAMES_ENVD}" ]] ; then
- einfo "removing ${EROOT%/}/etc/env.d/${GAMES_ENVD}"
- rm "${EROOT%/}/etc/env.d/${GAMES_ENVD}" || die
- fi
- fi
-}
-
-src_prepare() {
- local d libdirs
-
- for d in $(get_all_libdirs) ; do
- libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
- done
-
- cat <<-EOF > ${GAMES_ENVD} || die
- # if you don't want these added for non-games users
- # see https://bugs.gentoo.org/show_bug.cgi?id=408615
- LDPATH="${libdirs:1}"
- PATH="${GAMES_BINDIR}"
- EOF
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
- doenvd ${GAMES_ENVD}
- gamesowners "${ED%/}"/etc/env.d/${GAMES_ENVD}
- gamesperms "${ED%/}"/etc/env.d/${GAMES_ENVD}
-}
-
-pkg_preinst() { :; }
-
-pkg_postinst() { :; }
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 259cb531436d..e7fedf008bfb 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch b/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
new file mode 100644
index 000000000000..9e335b781aad
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/40.0-windowsNavigator-Adjust-to-gnome-shell-change.patch
@@ -0,0 +1,43 @@
+From e094dead91389c4a5f602e5bef2747ad5e73e8bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?=
+Date: Thu, 8 Apr 2021 16:38:40 +0200
+Subject: [PATCH] windowsNavigator: Adjust to gnome-shell change
+
+Parts of WindowPreview were moved to C for performance reasons, which
+turned a formerly private JS property into a GObject property.
+
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/302
+
+Part-of:
+---
+ extensions/windowsNavigator/extension.js | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
+index 0ea9645..bb72d7b 100644
+--- a/extensions/windowsNavigator/extension.js
++++ b/extensions/windowsNavigator/extension.js
+@@ -84,17 +84,17 @@ class MyWorkspace extends Workspace.Workspace {
+ });
+
+ this._text.add_constraint(new Clutter.BindConstraint({
+- source: this._windowContainer,
++ source: this.windowContainer,
+ coordinate: Clutter.BindCoordinate.POSITION,
+ }));
+ this._text.add_constraint(new Clutter.AlignConstraint({
+- source: this._windowContainer,
++ source: this.windowContainer,
+ align_axis: Clutter.AlignAxis.X_AXIS,
+ pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+ factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
+ }));
+ this._text.add_constraint(new Clutter.AlignConstraint({
+- source: this._windowContainer,
++ source: this.windowContainer,
+ align_axis: Clutter.AlignAxis.Y_AXIS,
+ pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+ factor: 0,
+--
+2.26.3
+
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
similarity index 95%
rename from gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
rename to gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
index 3c33ad2de500..1d9b5892655f 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.0-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-windowsNavigator-Adjust-to-gnome-shell-change.patch
+)
+
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="Installed extensions installed are initially disabled by default.
To change the system default and enable some extensions, you can use
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 3dc220d955f3..fbd4ce52d505 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild
index da2f898bd72a..ff9bf315dd99 100644
--- a/gui-libs/wlroots/wlroots-0.13.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.13.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
SLOT="0/9999"
else
SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 arm64 ~ppc64 x86"
SLOT="0/13"
fi
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index eb83b5cee032..e77c269d28b3 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6.ebuild
index e5febb24e88b..2cd639ebc15b 100644
--- a/gui-wm/sway/sway-1.6.ebuild
+++ b/gui-wm/sway/sway-1.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
MY_PV=${PV/_rc/-rc}
SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 arm64 ~ppc64 x86"
S="${WORKDIR}/${PN}-${MY_PV}"
fi
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index c9f9246a1db9..9da59af8fcca 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
index 7f9f2d90c9af..84ed6041e315 100644
--- a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
+ # TODO: Downstream hack, track upstream bug for better solution
+ "${FILESDIR}/${PN}-21.04.0-fix-no-semantic-desktop.patch" # KDE-bug 435586
)
src_configure() {
diff --git a/kde-apps/dolphin/dolphin-21.04.0.ebuild b/kde-apps/dolphin/dolphin-21.04.0.ebuild
index 2f5121e83267..c9439d4dddc3 100644
--- a/kde-apps/dolphin/dolphin-21.04.0.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.0.ebuild
@@ -62,6 +62,9 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
"
+# TODO: Downstream hack, track upstream bug for better solution
+PATCHES=( "${FILESDIR}/${P}-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
+
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch b/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
new file mode 100644
index 000000000000..4f97a53c5230
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
@@ -0,0 +1,23 @@
+diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
+index d52d146a8..9f0078631 100644
+--- a/src/search/dolphinfacetswidget.cpp
++++ b/src/search/dolphinfacetswidget.cpp
+@@ -7,6 +7,8 @@
+
+ #include "dolphinfacetswidget.h"
+
++#include
++
+ #include
+
+ #include
+@@ -257,7 +259,9 @@ void DolphinFacetsWidget::updateTagsSelector()
+ void DolphinFacetsWidget::updateTagsMenu()
+ {
+ updateTagsMenuItems({}, {});
++#ifdef HAVE_BALOO
+ m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
++#endif
+ }
+
+ void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 7b2bd40a1df9..1b6b94e1bb3f 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index f0eb4e2e39ac..5ec59bea8b6e 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,2 @@
DIST attica-5.80.0.tar.xz 66216 BLAKE2B 2b9c890dfc9bc74ee2de73af1ccec35f92d51c456387da6cb9b8406fffacb0fa06388b014449214b87d139abca6936ba224784ab62a3ef77730c9f55471434e3 SHA512 70cecfe60ce396a4cdbfa4b2d133076897912ae32a5494dfaea6f777e51f5be79b240d18d2e6b4f71f8dc4ff0f18d43243c711629c6913b8512aed0ba6b3f051
-DIST attica-5.81.0.tar.xz 66240 BLAKE2B ac76a4038f07ae20c31ba013f34617f2ff364f25c859eec89147b4b0af8c1977c27e836f326670bc413d3a229ee71b89c9822259796ef67b63d71565fb1a475b SHA512 db8edb25a2cfe8e23785934797d38d5237d4ef26f9deed8e6b43a668c03dee2a6f164d4235d0c7b4cfa339ac69d77b29e4a9fcab080c56f6bb2dbe07d0069655
+DIST attica-5.82.0.tar.xz 66220 BLAKE2B 22ee6014cae294cf772eabd874fe1afb493ad1ac92a1f511cbe6912dbbc4f81a684989a285d388d6a1dc5f7180d6930e839a5ba05c1e81b306ee69e572f6fb2b SHA512 8569ec110679bc026f98cf98ef79aba44279821f10f6153f0054c7a75806921683a83317bc1873896f5bba23679eb4fbe50b50ea43b22813dd2b203e84bf44d2
diff --git a/kde-frameworks/attica/attica-5.81.0.ebuild b/kde-frameworks/attica/attica-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/attica/attica-5.81.0.ebuild
rename to kde-frameworks/attica/attica-5.82.0.ebuild
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index e70939d49bee..8859500ef432 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,2 @@
DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
-DIST baloo-5.81.0.tar.xz 287360 BLAKE2B e5720f83d8f1db575c3525a63cb0c8ffa26f8450cf62c4b8f2554ce11144525b54b5cecc00a50f09ef9b2195f7aa0597cbf2708231a6e92a49df114b0cae0681 SHA512 f4736a2649c6afe6746f9e0e15e2c2adbfac7c8eb12795cb93e805a646c5c4df511dca32f78a607bdac2c123a84c095f9317d085a899d15a8392f9f863c57ae8
+DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
diff --git a/kde-frameworks/baloo/baloo-5.81.0.ebuild b/kde-frameworks/baloo/baloo-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/baloo/baloo-5.81.0.ebuild
rename to kde-frameworks/baloo/baloo-5.82.0.ebuild
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index f93925071688..53263cff31ba 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,2 @@
DIST bluez-qt-5.80.0.tar.xz 101996 BLAKE2B 6feeb0c38bcc1b380322d2019ade4afb7a601ea2743cd7879b13894db6fcd17ce85817ede0b87a6639abd090e0627f51218548df3caac43f1374c792fa4ae59f SHA512 6624d90b10bb742178c2da073a5a34eee534d29f0c068721961fca4f25e38c28723340009c0ecdc071999cc5f1a801b971dcf0f8297c2895beda40c53b59aab9
-DIST bluez-qt-5.81.0.tar.xz 101800 BLAKE2B e1fbc96fd7d084b00559c730679f2034e481fddad67c8f3f19ac5afed2fe3c532a91311e46f6183c36170e0ce7dfbc538bdd115c296cff477f30096e040ea0e2 SHA512 f8ddf8270ae29c3ce53f8711b6cffe0adef27e73f265b4db33eb59869fa65223d2b43535dc29caae3dcc459285e1772f55474f40ce6c24abb074e214ddc16c3f
+DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.81.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/bluez-qt/bluez-qt-5.81.0.ebuild
rename to kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index ded7dc11e5a6..68a2a69221ba 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,2 +1,2 @@
DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
-DIST breeze-icons-5.81.0.tar.xz 2035160 BLAKE2B 0e7f24a1921639afbad24d4f088b72a3178cc6ee66ebb9d85ec99e7e1c2b1e3cea63410e2c8fecd545f4c66002e124942c450168c0c6b3e87c0917cd79acad58 SHA512 edfc8f7390dc74a4916020f6370598d087594ae19231439a5570566a32b735e8530b0092c43bbeb122bd3b1049332b454be420002437f4d0e7583488ab32e575
+DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.81.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
similarity index 71%
rename from kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.81.0.ebuild
rename to kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
index 1b150265de84..cd06b9328b08 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.81.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
@@ -5,7 +5,8 @@ EAPI=7
KDE_ORG_NAME="breeze-icons"
PVCUT=$(ver_cut 1-2)
-inherit cmake kde.org
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake kde.org python-any-r1
DESCRIPTION="Breeze SVG icon theme binary resource"
LICENSE="LGPL-3"
@@ -14,13 +15,18 @@ IUSE="test"
RESTRICT+=" !test? ( test )"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
dev-qt/qtcore:5
>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
test? ( app-misc/fdupes )
"
DEPEND="test? ( dev-qt/qttest:5 )"
+python_check_deps() {
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
src_prepare() {
cmake_src_prepare
use test || cmake_comment_add_subdirectory autotests
@@ -28,6 +34,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DPython_EXECUTABLE="${PYTHON}"
-DBINARY_ICONS_RESOURCE=ON
-DSKIP_INSTALL_ICONS=ON
)
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index ded7dc11e5a6..68a2a69221ba 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,2 +1,2 @@
DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
-DIST breeze-icons-5.81.0.tar.xz 2035160 BLAKE2B 0e7f24a1921639afbad24d4f088b72a3178cc6ee66ebb9d85ec99e7e1c2b1e3cea63410e2c8fecd545f4c66002e124942c450168c0c6b3e87c0917cd79acad58 SHA512 edfc8f7390dc74a4916020f6370598d087594ae19231439a5570566a32b735e8530b0092c43bbeb122bd3b1049332b454be420002437f4d0e7583488ab32e575
+DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.81.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
similarity index 71%
rename from kde-frameworks/breeze-icons/breeze-icons-5.81.0.ebuild
rename to kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
index d51d10f7fac5..5665d1bc4822 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.81.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
@@ -4,21 +4,28 @@
EAPI=7
PVCUT=$(ver_cut 1-2)
-inherit cmake kde.org xdg-utils
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake kde.org python-any-r1 xdg-utils
DESCRIPTION="Breeze SVG icon theme"
+
LICENSE="LGPL-3"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT+=" !test? ( test )"
-BDEPEND="
+DEPEND="test? ( dev-qt/qttest:5 )"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
dev-qt/qtcore:5
>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
test? ( app-misc/fdupes )
"
-DEPEND="test? ( dev-qt/qttest:5 )"
+
+python_check_deps() {
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
src_prepare() {
cmake_src_prepare
@@ -27,6 +34,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DPython_EXECUTABLE="${PYTHON}"
-DBINARY_ICONS_RESOURCE=OFF
)
cmake_src_configure
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index c1ca637ebde9..a15cebdb635e 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,2 @@
DIST extra-cmake-modules-5.80.0.tar.xz 357412 BLAKE2B 1a564eac42bce7001b2840a052596456970e81810d07c091e47161933f906a66d20560a7d031f08660acd48c5db2d32c5512579b243dc4c0c803142cac4bb0bc SHA512 d07dcb31f8142c99270c234679cc0ab4dd13acd61e505a3623b7e2c811250acfb9f260cf355d8264bb1924a2aa61ed12fd3b5b431a4f619e33e3c7d53f2f7f68
-DIST extra-cmake-modules-5.81.0.tar.xz 357528 BLAKE2B 89e5e401dc31a9278977a91c4f253b17a5ac6d0863d66f47b820dd00ec70a507eab14d0b344a7a8147e2262c2576ae407c7a855574523b61a87bfcebb2d14d16 SHA512 b01d36c5d16ff2ad6ccbc55c58d95dc14880ff6d55d408d933eba55199c63e665856a93ccf441f9eb154e0a52837e1d78470ed876490ae2f0ae0a60e63f8dc2f
+DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.81.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.81.0.ebuild
rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index e931e709b4ee..6e03f665a526 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,2 @@
DIST frameworkintegration-5.80.0.tar.xz 1755248 BLAKE2B 55aecf28bc801ed72689bb340c28b1ee1374a913d98750a1380f91a36f6fcbe5f1e8690dffb74eb9fc642c578b5d6ca68937bfc95a52bdf7febaebe32d793ce9 SHA512 3e54729281d5fde4d18eaf7ebe18c6c17d1bb40e336ba0d91ac04aefd65800208efbcca4438a3be3f408860467c80bdf8b16b021c9892fec8f4ee55a13813ee2
-DIST frameworkintegration-5.81.0.tar.xz 1755808 BLAKE2B 991f1322d6c976b4e49458059dca4e735cb9756bba2a1fa37ad9e317cdb92fb3856ce5499c152006ae6cd12cebe8e1f87eb6e88898cc3129c959730c94f121c5 SHA512 f76036fc378b77225cd82ffa71d39f9b321a58ab3ebb1a523457cb320c87d157e2625389e259286c4a62c5b1def12b6c94c1d5b9cb5b6e983845ead9b1110245
+DIST frameworkintegration-5.82.0.tar.xz 1755828 BLAKE2B 18c056daf8db8e06995d3f0b6985f9aabb05e8a4e7323635faf92701f04dbf135cf63221fe739504d2ccd7718dd02a6718ab7fa7ba84b86cb37394ff878b6e3f SHA512 5865e560789c50829c5648365db58497d0da141d1699f396ca431740e6f919ef68c89e2cb98ac1f320cdb07fae098de683b17c920f79a2b459ffd874935b6e77
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.81.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/frameworkintegration/frameworkintegration-5.81.0.ebuild
rename to kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 84b4b9cea44e..b796e646a2b3 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,2 +1,2 @@
DIST kactivities-stats-5.80.0.tar.xz 81992 BLAKE2B 97998de9ce3ad101a2b565c22141ef777aa6758b42baea4138cfa34808c09147e1c0366c5e6ae046aca0d2327ff7e36d53b1eef9983a1d17d0f063a4ef6c4b02 SHA512 93ecac735b42509a7a186b43293f569e35d020dc9c152d4c89a096b77b194080db3fb9ecf0fbf4878f265b7893a3f18017fb3fc691e14cf76de256c93ebcdb22
-DIST kactivities-stats-5.81.0.tar.xz 81752 BLAKE2B cb63c40813eb879dcfc1429e8ea7dc695ef368d0797de62f42d6b51f97205abb1d204b5b14efbbebf0cf7759e8c2a843df85cd66e9e92f27f3d8b7d185e9f9b6 SHA512 c0145ba6f6a32acc7d6b4196e8ba8a978b1f50e760b431ecfd2e51654975e733e08eca9b7a84217f317c8a8e449b82830ad7c8e38690d27e8a58e96c1fc354e9
+DIST kactivities-stats-5.82.0.tar.xz 81740 BLAKE2B e9cccc36e88a743f7a9b47c8b03ca5be980075346820be8108ca8f0f612e2468d379729be063318a1c3edf15afd3bf56b691b65ad1492e6ba07f64cfc703a02e SHA512 0dd6bed082318a40afc94f0f525cb9c8cd6f9066a4bc38389d23f3dfcc8ed46929e4150660b3c2eaa37241fdbedd10e6b4d472e8d649664dc9acf68b002f206d
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.81.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kactivities-stats/kactivities-stats-5.81.0.ebuild
rename to kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 665167bb19b6..5a02d70aaf34 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,2 @@
DIST kactivities-5.80.0.tar.xz 71404 BLAKE2B 01f0cda51ee2cece075aebef195e1df006d02cecfb3d404e14a43f6108711c27e5f0c06e16be1ec3339d43e14c2f8a53e7e3c4ce95c3cab6221c45710530ad3e SHA512 8cd5cc69f72db198b97a33947f3c9d15d3798ef42478babe18013057c74e398b0e2b49177270155d410d80e2163da450aeb88a24027281395b0682f93a54f042
-DIST kactivities-5.81.0.tar.xz 71320 BLAKE2B 7aea666bf7f09044b6a8731de25ccd401217cb50ef16749b3fdf14873e3bdb2e1fcfb6ca6c15932300468d793558b353db7f200fb3ef0ee8c49409c6fb3467e0 SHA512 86d6768d86ad96508693acfd06e0f3d78ec192f15803878ceeec792cbed160f2a34841e41a1b73b9bb817bb33b6c6edf91a1cced302c8a5ae6ee06560bf53653
+DIST kactivities-5.82.0.tar.xz 71356 BLAKE2B c83b384f4aed32554dfd96951a9efc22cd8cd6c644a674b8d492e571ebf261201be78ac2834722f12fb43822ff17741054e7153c279a8ea7bdf6318cecef20bd SHA512 f1da5447405e53a4c7d11c0ff14ee80c725f07df929ba6b4380239675e2efef21bb2e6e0d028146ad621440b01f76314549779a3f7a79e639537fa7bb8e96729
diff --git a/kde-frameworks/kactivities/kactivities-5.81.0.ebuild b/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kactivities/kactivities-5.81.0.ebuild
rename to kde-frameworks/kactivities/kactivities-5.82.0.ebuild
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index d40b67fd3d83..7342f0262b85 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1,2 @@
DIST kapidox-5.80.0.tar.xz 194180 BLAKE2B 2952c4f0064721a599648d498cc5815ea40270bd311e6d030390d0b160941cd59d58d86eb167974635938aeeac70f775f86fc9e4d3edbcc9e37d668ab8035b1a SHA512 71940b713e5686165091871e051f327a439494cf0d361f0db5ce765f38512a1b36895b9db3f81829efb7d56e0d589b6269ca6d820da196a6a712f06e1945b14c
-DIST kapidox-5.81.0.tar.xz 194620 BLAKE2B e0cddfe76e3b79518c1f766480c6200ab3a899ee672ebb689e2dbb19831bda5cf35409aa95e53e154c18f126b419a2a45f0d6e167396d30fa7300402405ebc67 SHA512 3c1bc22df14174a397f90ef79f39380529b43fd51ac0ff067d60638de4a10c006971ee2dde2d04b676c3780015c22f26065fa5db8a9f00d07f02501c44b07ca1
+DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
diff --git a/kde-frameworks/kapidox/kapidox-5.81.0.ebuild b/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kapidox/kapidox-5.81.0.ebuild
rename to kde-frameworks/kapidox/kapidox-5.82.0.ebuild
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 2462cc3d3943..ddb0ae61acb8 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,2 @@
DIST karchive-5.80.0.tar.xz 983724 BLAKE2B f4b6a61e3e910ca5f7978c355ca1827d5c27ebe7223cdd3563d19c7f07d8887530bb36040f0c9883a3961a2989a71497364c6c9225db0e00bd289e0fbd21ee6a SHA512 84a679a9515b2df989d4331307eb52a236d6e33ecc029e0c76732abcd709d7d4d026bde77b2b22a624b7e5fbd54d202574b858e37a3f7fbb0605830f812a61b8
-DIST karchive-5.81.0.tar.xz 983732 BLAKE2B ecf19ffc90130638aa8d4d305be02b2ea63b61b0ee55637cfa2ec6086e92baa54bc7f7abffa3e9f98280c17db0052c86e92ea21eb322ebf468c2cccef03a6930 SHA512 08fff63e08c7312f0fe49c2823ba7d5ab6944b196a7bb7ae871ceb4d4307fc327a89e51429cf895a95ac46a2c79e03a2f123b52cf84e2abb8fad507ed91a7483
+DIST karchive-5.82.0.tar.xz 984872 BLAKE2B 1a8e6b758479a4ff5f1be774b6deede551d9a306bf8a3fef845ff6a1532fc84d36aa9697f6de7455746410f233c70072ec49d729e20eae2baab529cc1d3ea9af SHA512 7b735b3f1c325bf8dc9044fc9644fdaa3442baeae16831ea79cf84f7da0d5cb7757e2201d8cb73f18a831c49f079b87c75c8387a53c236386e4da47437884183
diff --git a/kde-frameworks/karchive/karchive-5.81.0.ebuild b/kde-frameworks/karchive/karchive-5.82.0.ebuild
similarity index 59%
rename from kde-frameworks/karchive/karchive-5.81.0.ebuild
rename to kde-frameworks/karchive/karchive-5.82.0.ebuild
index 4fb5bffbb713..77a707c97948 100644
--- a/kde-frameworks/karchive/karchive-5.81.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.82.0.ebuild
@@ -8,11 +8,22 @@ inherit ecm kde.org
DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
LICENSE="GPL-2 LGPL-2.1"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
+IUSE="+zstd"
DEPEND="
app-arch/bzip2
app-arch/xz-utils
sys-libs/zlib
+ zstd? ( app-arch/zstd:= )
"
RDEPEND="${DEPEND}"
+BDEPEND="zstd? ( virtual/pkgconfig )"
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use zstd; then
+ sed -e "s/^pkg_check_modules.*LibZstd/#&/" -i CMakeLists.txt || die
+ fi
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 8a85da3eebb9..ff11ac206d32 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,2 @@
DIST kauth-5.80.0.tar.xz 87928 BLAKE2B 9383f10901223ab983c1ec7ef63d75447ad15a159694b9c333efe7911fea472c58aec93d123ac65f029b839bfafe8d559162aef8bfb6707cfc2f2397879b4cb0 SHA512 17ab01527a3204b32b1e628ca3882e27c4d4deb988381f8857ca4b51e80d136fa39faaf90cc28ca670ab8174bf757a961b6cbe6e87cc70a141968a1d1d94e983
-DIST kauth-5.81.0.tar.xz 88412 BLAKE2B 479c780c884adfd63b1c84ce58bdea1336699f381e2c0be7d064ecd48778cf1fc030436c155bc095f73f9dbadd902123e94e6d4d5d4bdfe350f882b219b3bfdb SHA512 c8aeddd31feaa6ef74ba7415ee74eed388b58856933e5faf4238d3ee28cff6603018d1a20f7f4716c5ba9b50f4e207227abee83d63640a919d7acda221776618
+DIST kauth-5.82.0.tar.xz 88396 BLAKE2B 1c99917b26f9738b876385276251b7bb616a35bdc82bf581aabba693a0846b8fd615e960dc95829e6a19b158299117988aef10ba965ca16135cbd51c2f4891a5 SHA512 ff69853dbdfee9b22431ee495c07875430015ee706357acdcdfc93b3deca7a373eecf40d30977de97253f044a4dad7548b2ad55c84583b92587a77be285e3ed8
diff --git a/kde-frameworks/kauth/kauth-5.81.0.ebuild b/kde-frameworks/kauth/kauth-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kauth/kauth-5.81.0.ebuild
rename to kde-frameworks/kauth/kauth-5.82.0.ebuild
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 431f2a60bb4d..0e674bacca78 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,2 @@
DIST kbookmarks-5.80.0.tar.xz 126264 BLAKE2B bf6ac0571293bdb5814395df7ab7ab9bca15f44978de045fff2d6af551d68e1715b1b44ecc4c183b5a7ae319bc44c06f9beb13570a4128fa23b29e9457f29b9a SHA512 c555fffaf850d93779b00aa9b5398e3286d02fe7a93844cb7b89cfce5ca8e5a694a6619daee734104bebbbb8ac5f5ceb97f2e778e476d3b0a4cdf030cd35f40b
-DIST kbookmarks-5.81.0.tar.xz 126832 BLAKE2B b67eef23ee24316ad572a8015a7845ff7dc5d5056ce10228c717435484eaf1a275fee52cc7d8a11813c3b75d15f253282f89c99bee5615ce71b4b7d7e7c5a803 SHA512 4ce762e6f6a34d658c010f1c7165f6786e6ae98e62b903d424de1634d069c40c29e11ef6d0e24e534ed0a8dd9c4b146e915ae91246fa064f05ffc956e5d67065
+DIST kbookmarks-5.82.0.tar.xz 126800 BLAKE2B df1aa0b34b1fcc21a481995001ab563ebafdca67d307d1f610033aa364899bfb9dbf5a9aad4d4eea4bc5a8a4e93c5afcc45dc1efb78dbd79d7cd4125ec8749af SHA512 aa1ad09e63eee22eb5aeb094b9d2986f6a700038c790023878d7a6a6fd6e9e2f0af0092f576d1e1e6b2413219c3461f1bbe3347afb19e3be8e9a081443aa5872
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.81.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kbookmarks/kbookmarks-5.81.0.ebuild
rename to kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 8e426661bbe5..a058119f2c59 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,2 +1,2 @@
DIST kcalendarcore-5.80.0.tar.xz 259748 BLAKE2B 7eb9e5f6c20e42c1cbe0de675c95585a0af0c0c7b5f6e75fe153db3daf14110bad29ddfea8efc594841d7782fbe19ae896dd3b0a5e58f4ec0eb0c00608e3c6fd SHA512 701167bd708a817f6478fc7059c46b1c5138903effc7925248c108484e5f66f72fb1f2088cb82ef94d4c13671b7a8dfbfba5b2006f89d338a8ba22f95f10be0b
-DIST kcalendarcore-5.81.0.tar.xz 257536 BLAKE2B 8efa4d46e3120e6173544fed3bd5ea4bf803082f8e4d2d5becce958c655751edf83c65d12713f895dc2b95392515f3d6c6f3dfb477493b01742cdd2c135b6bdf SHA512 03fd295501feafcb902cfa6e24e789ae8cfdc9b94abfd1191b4adc7834e67f8c6bc712e8bb13bb0cf79507b4b07b7cd82941d56cdc2a852f24de01d6bee4358d
+DIST kcalendarcore-5.82.0.tar.xz 254996 BLAKE2B 255728d2ce6036bbb35a2acb077a1cca23420d3d60584179a27ea2d801b9191d7696b4322fb41023420993a69dac5649f43fb4a52c708f9b48aa732719297c5a SHA512 26d76b20faebe36b9e5a9e234364fb5e8cda1c3c519ce5e3fbd0d9e36657348010dfc7ef4865fcc3326978aa88847f5d5304d3dcccbfd0d728c568b2e149214b
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.81.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcalendarcore/kcalendarcore-5.81.0.ebuild
rename to kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 8ca906d9be83..605e9ae58718 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,2 @@
DIST kcmutils-5.80.0.tar.xz 258676 BLAKE2B fff7d18db29d1344e8ee522f27b474ee97c42b926aab841e8f4dddd3ea6ea2002f5347bd9841177fd053167aa4d20f40b083b70550567782c955fcd4d056767f SHA512 eed69f85032bd0e9c3211b0aca82932586ca443801cca268afa7dc3a27f703803ea9dd356f60107ca2b83daac36046752470092739837c9aa2c40c02335a8ee3
-DIST kcmutils-5.81.0.tar.xz 259532 BLAKE2B d023d9d252c26a8fc24cf9349122c290cdb3736f1a88d91e9482969d885cd0cbe8be14f55df75f075b9c50f60df6989a4e106d0a924f842a40adc82e86f895c6 SHA512 2d81bf2a1657c39bc18dd7791f4fc5684974d78a0c000addf857518d2ee0cf4fb6d7921b09ff899f1c8931a8bfd77e23cb679ea0802716bcfe121f5ddefe5d22
+DIST kcmutils-5.82.0.tar.xz 160816 BLAKE2B fd75c8e42c7df2c05048ece51e19d4a27358871c56b6df3c086b4ea2fd83e3be758a9e370bd9b4956da18ffe9025044bea91da3a1a3fc4a9e65894d976a3585f SHA512 709294fbbbaabf31384753651a320069e6779d101dbbec94ba09ae95146344989e854cab5fdd39510c300e026f113a156fe43d3b2fa57191851c95709a1997e4
diff --git a/kde-frameworks/kcmutils/kcmutils-5.81.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcmutils/kcmutils-5.81.0.ebuild
rename to kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 0aaffd370792..999698d2e293 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,2 @@
DIST kcodecs-5.80.0.tar.xz 229456 BLAKE2B a4221041df4e544376c17707f0e8fc3d0a6437b5efdf54c345af5bd9bba3a2ace2500594127ef851ad1330bfbbeafb533a8f6045132a0e184918cf230176db5d SHA512 27e367d12c995d96908ab0e956a6fba766374dc26c720ea97303cfa5a1e1b644076c5d68487a35ec8300204e556460d74a55be78239a073e1b3b72cebd153919
-DIST kcodecs-5.81.0.tar.xz 230460 BLAKE2B 3b584772eb39afb62e04f82016db52243cf83916d3f1683116b2ca0e248975572e7429f2762803c7d53f7f39513aea49d9b5d1dbbcd3407f9485c807cd85268f SHA512 7c247201231ac0d4393779a28ab8c12e7f4eaedd2fa43ac48f23a96593f7c9635aaeb811a340c5a13607e9942ebff288875ca746faf054b00f53b93d6c14dd68
+DIST kcodecs-5.82.0.tar.xz 230560 BLAKE2B 53494862c07e1df594c0c2f2e7ec295c763635c6e1203111d797195a0cd0a7d4f76d152945971051a136971c3b072744cc08b913e40534fd64d568e6748c95f9 SHA512 fd331cd1ead5dba016f1c94429bc4fbfc5268563341e93d418e856340c63fc7b7e72fb6aeac6ade0de209235c52e8d16118351825000e9d8b47491a55124ecfc
diff --git a/kde-frameworks/kcodecs/kcodecs-5.81.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcodecs/kcodecs-5.81.0.ebuild
rename to kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 11df4efb0577..ec3f59ac1725 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,2 @@
DIST kcompletion-5.80.0.tar.xz 121488 BLAKE2B 8ab2146ab0d76e54cd348297091826d6ecd2622a08595784d4c8fef6d3f4f8d676a49decd0f7a59bfdd9e714eea6be5675003d71652809a82e5d30e54b261885 SHA512 7e0d9764c646f2b68b18d122a20a36c1d67aa4cda80f6c2e7091727ac328ec9c62d9851fcf93f2d80336b7dbe886b7087a5a0c1e3fb9a71c348e4e03c2345897
-DIST kcompletion-5.81.0.tar.xz 121996 BLAKE2B 998397f4c10f965d34d9fa0f44b38dd02b5a276c81a1a917b6604b09479e84e7c1806f57ed2a22fe4bd848bf75a9eb4d7d8f48a4645dea2be551c7a84666047f SHA512 ee12c7bc0deb9e3a3bdd0e138c4ffb7c5d04360581b8cf0e3741d2d7e6a60ae840918c0488d5ee50ec3c01f55963ee2c943e17b24ecec89649100bac7ffb2ce9
+DIST kcompletion-5.82.0.tar.xz 122088 BLAKE2B ce534393489d6ab980d3c093ef39b3d2341734e147231e6f22c5316091bafd40ef343432128926ec18e25ec8d3843018fa582bd2dc7475bb3c260e42452cc949 SHA512 19b76a46d09005ed5ab5b66ca48403f4bb0baade2b2f937ad6afdf5ef92adf7c94330502adc3aae29bb88fc5848469580319cbf4bba4bfa128537f4541fd9d24
diff --git a/kde-frameworks/kcompletion/kcompletion-5.81.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcompletion/kcompletion-5.81.0.ebuild
rename to kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index dbb0bd275cd2..d95b3d9ac894 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,2 @@
DIST kconfig-5.80.0.tar.xz 267500 BLAKE2B 007b6256fecf5dccb9aac51433e6af90390da515c57d999e349e6633c270b7d7420eedf944d7862537701cc22cc08cb656adde2bd8659b425970b82ca5caa396 SHA512 5836dded113c0e4365e9e48d56cb745e9de57dc025c0376b692151dccbe6c864f2e4a60bee02b8a171e2fbd4816adf18b6eb1b611125c379a91b0b7dc7d7e115
-DIST kconfig-5.81.0.tar.xz 268140 BLAKE2B 9caeea67c4dd6b0f352ab056ffb20e71786ce9cbfa9ed7c221e98190b6c51a1eba5f27c9b0df9c4ff6653970eb7f509f2f90c74060620e3fdc9d0114d670896d SHA512 d5574ea88856f5788fdc179569b8ea7cdad092b5ff807ec8bc2eca5f0dd17ecd6ab5e232708dde8e402dc0c3d81a58d0931cb1786bd9519e3e8d2ec61d2a5a01
+DIST kconfig-5.82.0.tar.xz 268416 BLAKE2B c59d435f2e562f218b0b6080c862758c6c271aad4ae76ad000e722b7f2edd0b40cdc4e9f64d5128c6f7f2c0028fcb5d4ae35c696b511a7593651a34c4b1528a6 SHA512 8989bcd1dabc2ad795aa464a7bf7ff2e4e2a4c56a5e7828906e00852eb5fc2946e89a4fa7df691f8c5e1940d0b171c02729bdab5ce9f7d6ecc0d3d1880e2ee4a
diff --git a/kde-frameworks/kconfig/kconfig-5.81.0.ebuild b/kde-frameworks/kconfig/kconfig-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kconfig/kconfig-5.81.0.ebuild
rename to kde-frameworks/kconfig/kconfig-5.82.0.ebuild
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index cb6b55362c96..3f3b18aa3d98 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,2 @@
DIST kconfigwidgets-5.80.0.tar.xz 389484 BLAKE2B 0e1a442d2c5499fa88e20c0da451f28eeaf6121d8c93a7573583937542b4361ab8096bc2edfa187c0c89f2942e134cecf2814579803332508398e2d252b7f93a SHA512 f482d86ce3b893c4c0dce6fb6db005759bdfbb794114e636ff63a2a7db762e2ddaf2f53c0363561a4581967a6177b0ae077febd020d46bfc32211fab5725fa3d
-DIST kconfigwidgets-5.81.0.tar.xz 400884 BLAKE2B 454e5f4758cd066a8373eb7664650ed61b677c510a8e477e02b64c1aed0e1c00a8b0fdc08ba383e4c7aa06fcdebeaea0143fe6df53c32aa18eed30b5bd8031f1 SHA512 fc9f73550725198b16a4fa7c5962bd64801da400dd2b516b94f0ee180ef2e63d42ecc58562d63bc7324667db90a352fda1a2d4e4c4297fa5303b286272999764
+DIST kconfigwidgets-5.82.0.tar.xz 401320 BLAKE2B c117777cef4ff0627577b6b7b3fe4b18b8a0ded1b233888953f56beca6c7bf2675382e1d5f6e05e64a4eabb793dbe2e0b3f1b56296606da76a0d54e15cf2e530 SHA512 309b6e2591ae88a454bd6dee4cff5e1eca3dbb36ca4b7b02081602fbd6b4bfe06a99d2afa6eb931fa927759f2c32e315b3c548746207673751e9753de651a6cf
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.81.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kconfigwidgets/kconfigwidgets-5.81.0.ebuild
rename to kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 90ddc61ec835..a0021f9c0774 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,2 +1,2 @@
DIST kcontacts-5.80.0.tar.xz 542984 BLAKE2B 7a6e8b818f072299d06069f3126076af262822268625b73bff1cf1a384991e62f801e1cc504087f37a9062d6ce6a348420d05476a625d180f6b084e1ceeaf332 SHA512 d68c4f04bc2e642689ea8076819d4844c2d1c5ac086c3d785717b33ae659354cf6351760f3f00605f945f471a426222af54f525c094d9a6da79f49ce09dfff0d
-DIST kcontacts-5.81.0.tar.xz 543848 BLAKE2B cfb61880362510bea00545b5de30fc2b66174eb71152033f064b53c46e4228cf08341d4b0b4ef400afb2d5bdb6b14eb916f5101ffb3310396ab06592935d1fbc SHA512 07342c9d6d043e9aea4c6fd2733c788695d3facd44240da64006b43ba732f3b0eddda0366285aac931d0521021963db07e6473887a486e61a45c94b193cbf9df
+DIST kcontacts-5.82.0.tar.xz 543960 BLAKE2B 48deb0a593825fafbd850f0345ff052d4809970706b18355388c077cdbd0f66d63f951bc8d063df82495822a6754b02531dfc676c100217f882d29f837045a75 SHA512 05cde28d3b9c83054d004fe6fa9d439358fd95ae3b739089a08b37a3b44e1b3119242de64c5e5155bda9df9ad5736a2629385c1b1c39326fbd9e3fa6a1984e6f
diff --git a/kde-frameworks/kcontacts/kcontacts-5.81.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcontacts/kcontacts-5.81.0.ebuild
rename to kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 43578d8d9a12..a4080ef7de98 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,2 @@
DIST kcoreaddons-5.80.0.tar.xz 410980 BLAKE2B 2af44b2b99120a7875aafb22acbcdbfd8b377c99ebea5e50053efcc9a736eda98684ea610f38180eca3e1ed3404e50779ad5ecba02d3b2cb79a9d4f05d1d896f SHA512 38e4784eb344402d31cd0be0af4f3d514d5b4b2713e781abce5896f3fef35852dad6a59e3965a25639d042ad90ca527a6e79a312ffc210594d501b5c52ee7d1c
-DIST kcoreaddons-5.81.0.tar.xz 413344 BLAKE2B 4a3fd8678f32c399a0279e81c7fea4f474ddab1cd906a4c1a8d7b8ffa487075323d4ee457e96edd9e783be545d892e1242d0bc48416f6b1233e3bedd60b48db8 SHA512 e19b4e9bb2c5310f0885f9b5039a68ae9786d9f7f6408b4af416999355b6304da282de63c917dff230484d8a8bfc04873c5e8a5fdb8c83551800ba0d91b3fa97
+DIST kcoreaddons-5.82.0.tar.xz 414272 BLAKE2B a24534a5f3ba900c6e77afcbb6218fa02f093c58283f228f8b41272ab82eca214f2b080356facaa2a800f63ee80f048c7e20d9e22bc2d7d2604a7fe9d2c93d3b SHA512 25e320e6d9a436091491572cf8623a0abaf3abc7d5edde44403701471fc0315b6ad5d09a44b93de023298ffeb9c14366de23c08f43abc51c87c87f9258a652a7
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.81.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcoreaddons/kcoreaddons-5.81.0.ebuild
rename to kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index ac79a64e7e68..767a07174734 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,2 @@
DIST kcrash-5.80.0.tar.xz 22320 BLAKE2B d7c5ce91c1a99c34624b7af6686a388813f7769ea28f25ca067bc3c91f0c1ae2727e308095ac6a0ac00b7579543c46fd96b81cec9d5cdd6b4b73efc424c4b0e8 SHA512 e56219a3d9f8beddb992e61c9f01160b9f71f692856840674577f11fb262d335b2f622b0a8463b95e1e72295a3ec81f4b590f0b54219fd9689676a1dca4eb807
-DIST kcrash-5.81.0.tar.xz 24776 BLAKE2B d134f03ec21d1a0e446f249b14a3f547bab5fdef8460250abd523882b493592cfcb5076a496a65e2297cc5d9b53e3863d8c71ae23b544a66dd72f6fe6fb7b31f SHA512 eb582e9697e8e8d1578971a2337f3709df6d3634cf7d6fd2e7a8c1f962d6d6c3150b39cde79109015ae9c9556a1e1352b9680d754f7aca97ad632855b5899fa6
+DIST kcrash-5.82.0.tar.xz 24696 BLAKE2B e13388661d3661216df8900875e86d7ad71352c229e9cc4be78d11469cefcecc51cc11aa95badb12e2dcba22eba22533b959ca3ab8317c205a06e3f5e906b203 SHA512 9cec96ef82f9628fbbbe0fd4e0687c094f7a1b1385e6ba6807f1dd49c9f8d19a29497b29b31bd9a86c59f498d76d54bdcbfafa86a480ccfb29dcd488eee22340
diff --git a/kde-frameworks/kcrash/kcrash-5.81.0.ebuild b/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kcrash/kcrash-5.81.0.ebuild
rename to kde-frameworks/kcrash/kcrash-5.82.0.ebuild
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 1bcc30ea30b1..da902a3226bd 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,2 +1,2 @@
DIST kdav-5.80.0.tar.xz 59824 BLAKE2B 7e24d3b15ed973042b995acb2308f38d69820dcc86b22e2d277b561b38a3d1ca705865d6471a0b5d6c53db7752726458e9487d1fb83ec65df52f03624ca32e90 SHA512 9f572d40b8a71e588c6a9773ca5615250e6517477c33594ca8ccc78a177d2fca8eaca6224dfcdc2f972d0205b50093d238d3c6f55ea39a7d823bf797d21a8e80
-DIST kdav-5.81.0.tar.xz 60172 BLAKE2B 6034ada61ff17abce8a4e71f2eae0877adefd14c6975ff7f5266432877578eb85612a0ab9e74207b17a3753aeac5493e0c40a6b9404ff8f98eaa5e889378f1a6 SHA512 e01f250d63d07839fc0816561dadf35befd92b6c9a997b2d2dcc333adc26833d9507d42e02dddeafeb2027e033faa82af0c20534ebc91816d7cbf1583e24d95a
+DIST kdav-5.82.0.tar.xz 60180 BLAKE2B f4860970f75588ea69f032912d9f105fa8f204b36a0ba48e7cf57246c48ce612d66f7f1bcf0cc773dd699e6cc475c139ed450767a79afdea92e6f4de9036419a SHA512 84882e4c4debc2cecd7c206e84b7534bd23fcbd28abf8e1438c8ed06faacdd3312e955dcb5233cb38f1cba4d4fa88cdec9f2ba0e7bc13af3bb07ac999efcfeb2
diff --git a/kde-frameworks/kdav/kdav-5.81.0.ebuild b/kde-frameworks/kdav/kdav-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdav/kdav-5.81.0.ebuild
rename to kde-frameworks/kdav/kdav-5.82.0.ebuild
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 24ed3df57856..caf37715d2c4 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,2 @@
DIST kdbusaddons-5.80.0.tar.xz 42596 BLAKE2B c9511ba386cb803ff9dc09e4474500eac4c31d3625d00fedcd8473eac19e7669e7c670e8dd9b421b855b550f6ddc224defb5822836d2f8fa5bbd94f8cdd2ef05 SHA512 87d3a75cde0ff9f759654bb8ec99762ae18f0d5d3dbd941987a871583811b141d9020dd0c5b25ea2f05c2b9ef521edc8423548c0587aea69c2e4fab9d423160b
-DIST kdbusaddons-5.81.0.tar.xz 42816 BLAKE2B 93178eaed105ae820abdf58edda96f0a3b221397594dd88c5c70dbbced2a96f6e39ef6b39e93ece03ebe9c6ef19ad158996b2e542f6ac905cb64252a28d56b27 SHA512 475ceaf971d4ad423d072d9a376c4c9bb4b60384114877bace724183d4900b9bef16e8c06baca782fceee21790066ec12755b659a038252da76fcd03f1e27778
+DIST kdbusaddons-5.82.0.tar.xz 42792 BLAKE2B 7b20072c93b1149d31f3bbc020de124a05ae96bdd6affa6a77d46ea69f5ac1b458851f97115dbd6ce18e12773e39c240daa2035056496a431849a51a096383e9 SHA512 a0ece70b7f79a5d391244d145d8167c0bbeba5f99db48b513f187638aff6af3f150a75b84d8534ea7b381d858dd743bf73884286bb2ab951d4f6e1675d319fa4
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.81.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdbusaddons/kdbusaddons-5.81.0.ebuild
rename to kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 27ce9769e062..a0cdc50a8d34 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,2 @@
DIST kdeclarative-5.80.0.tar.xz 185132 BLAKE2B 049e696d2387db07fa496ae35050d6a1448f4a9b20bf3ef9e5a040068838376545202a777c993fc93c8fa91081cc9ced89d73d16ee113f498e0d818464abb8f8 SHA512 e3db516267474acab8967464eb7ec7ff0ce93614efd708d76d9df5273d31cc104e6ec3a4dd8115d86ffc357e85a27afb797c5842d489ae93636d9a1f16d9915a
-DIST kdeclarative-5.81.0.tar.xz 185232 BLAKE2B 2bd92b07951e10cecdf922c04b69fec436e56120a8c4c50ca84f831a7d92e0e91812a27ec545b5eda17d36d3c41d08d19e0da181258b25c63fea0c2667a6867a SHA512 b3050dc06f87ba3d9a78315ba2a542c81f2c0d8b47ec03e69dee13c90193b839a0c8cab5ccf29eb4afbf2c28bf4a89020ff7dfa52c85fb4a596b42416f798900
+DIST kdeclarative-5.82.0.tar.xz 186252 BLAKE2B e5b4c22e14cca01614d1bc5556bda00e1ffbcf2b1b1b3277d96a12b380b627a5df4151ad443b5301eeed568bbe1852ef29e3a47f2dc4bc3c037b449441cf8542 SHA512 48ea28aac41cb6d5d15488b80e5cf7abc18b774fe35d22dc14d030b22e56b3b9bd116a44a0e7c44adf9fd26d0d4cd73782a6aa187f35375ffbbbf08374cb5658
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.81.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdeclarative/kdeclarative-5.81.0.ebuild
rename to kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 1745454ee4e8..5d268779331b 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
DIST kded-5.80.0.tar.xz 36860 BLAKE2B f72d05825a8615bc85d1c8a87b0e9eb5a69d91b491b1c9a5445f6ccec9e3a1f064e1415b6aee582564140c352b1e6db0d36249d993ea657ab3128465e63089b0 SHA512 f900ce58172930e3cf6ddbb842312737140f17ce3548d49c8181370c0e3932440e23fcaf4a08068b818e6e1d61f5519a2cc1bd5967f5cf46a10ba6d7ee5d8e30
-DIST kded-5.81.0.tar.xz 36944 BLAKE2B 33fe8ad6b09fb8d7ce3346998bc3f6d4472f770151023fc5e4b8aa0cbd3cfb294fd1d5ea5bdddc8e027f7ba071164649f75994fc68246924be7e7688e322218c SHA512 525ee674e2f20851d319e53a8119c8b248db22c72f7ad5ce6efaad1b352182f3a884633e33a7370225978057aff4ee4cb633580f2f54ae7cfc30da5f9b187007
+DIST kded-5.82.0.tar.xz 36964 BLAKE2B bbc92bde53caaca442808c154bf7bb88c3edca9b979c597ea08a0a0901b40d67004e2f45acec663b22e318e547c86397a99c8c895a374b73d066c2ff67b3f868 SHA512 10ef292186d652a519aae01681934f70f820ff4c480f9ed9868f7dfaf9dba016e035b565b220fb5d3ef89dae5180088ed3a93d0682c54ba27978b53df00c2755
diff --git a/kde-frameworks/kded/kded-5.81.0.ebuild b/kde-frameworks/kded/kded-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kded/kded-5.81.0.ebuild
rename to kde-frameworks/kded/kded-5.82.0.ebuild
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 488cb5702dd3..d254da0ebb17 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,2 @@
DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
-DIST kdelibs4support-5.81.0.tar.xz 3552860 BLAKE2B 9322860fb7abdca317b34f51c6ed2d89ea55597391e4547c10ae365e1553dffbbe35366e3fefc0679fe72d29a1c43d47a077cf7b3d0580e16079090a9760ccc4 SHA512 4c86d28df61268ce174947b3f203001b20c91d155f1476ca3210ffe25a9f28a9ca39a5de5b21e6522d6c89eea956a4c1b285c963d5ae07234e8b6f8637847c7e
+DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
similarity index 95%
rename from kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
rename to kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
index 254009127697..8cf2a1aa39dd 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
@@ -77,11 +77,9 @@ RDEPEND="${COMMON_DEPEND}
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
-
PATCHES=(
"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
- "${FILESDIR}/${PN}-5.80.0-unused-dep.patch"
+ "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
)
src_prepare() {
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index b3ed7c404c88..1447c3433bbf 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,2 @@
DIST kdesu-5.80.0.tar.xz 52188 BLAKE2B 25369db6566eafa917b5eedd9e74f54aee294f6f366c44c59684acda14194703db5fdd0abbe251beff9815a428a41ab183a9f2a9d28589fbb40a731332d02707 SHA512 b5ccbb6827a18c2f8b370d64405825a4c533fac120e56a99a6d90bd01d563606ae625f2048e27fd19756d51175ecf163468349f7587540401abd5d002a7c8a6e
-DIST kdesu-5.81.0.tar.xz 52228 BLAKE2B 551a535870271cd2b96533c8e60ebf34900a6dcd4acab53053acce210cb41f25fdbbab19eff598d88404dad3323eb029bfdf6f6e18c6a29a33a3844172794080 SHA512 e08b89112b5fb357d7aeb58da2098cc015d624aa913c5515c4b8d8fd4fd98c776e37e330d7018b83ee5ef3f6217ee21bd8d8b240bbac5e975c64e88b5044b6c2
+DIST kdesu-5.82.0.tar.xz 52236 BLAKE2B e674b6e7779cbe858828d17a8e72e14570007776461d3da99cd86adf92380fa5a95bfc394436f8e900e2fd90052b35c6a68b91c2e12e9c8cd835483c7f2b6262 SHA512 6d4cbbc783959d093f59221dc0cf7862f30444878a32475976519b443713e8ea1f154c8a62f7cf4468e807ebd983afb037211d5641335822037bad04501552ae
diff --git a/kde-frameworks/kdesu/kdesu-5.81.0.ebuild b/kde-frameworks/kdesu/kdesu-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdesu/kdesu-5.81.0.ebuild
rename to kde-frameworks/kdesu/kdesu-5.82.0.ebuild
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 0193a8aa258e..e0c973161596 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,2 @@
DIST kdnssd-5.80.0.tar.xz 57968 BLAKE2B 311270d202946c06ba505baa831141c841f7169f8622233e9004bc83aadfe8e5148681d8b05e8561b7ba42f3c3bb6ef90772a57191d9cb6eb40d861d73495862 SHA512 8f458a7a0e7c9fd7d7b55a79b5ecfa4484cb442564985e0c4a660b2d551d772bd177dbba7999f71a1401ab58b9ce4922090afadd31347a1282419f90a78a41d9
-DIST kdnssd-5.81.0.tar.xz 58364 BLAKE2B d14091fd1be51ea96dff05dbb645ea3cec8c644b00dd6dd1c64080a93bc3de232112db3b50b1a4f781ce0bd0161fab28e513faa4c0142c64301b15a388365d60 SHA512 c152e3bce5eb0bdf1e1d41afd9f6fe92fe02d2ea1c3172443391ac307eafddc3d0cbdef2637c9b1219454b5e9d3b1c9858fec12fefac1e3358acbd4625d4519c
+DIST kdnssd-5.82.0.tar.xz 58296 BLAKE2B 3a7b2d48724fd9982ab74f9bbfcf48dc465082753fa1375d73fae3b53121dcc994ef45777ff01bf27b4f691c0e84d40cf7715ef5d5fc4cb511f6a6983b400cce SHA512 fb365bcf77f81f75a8a2fc62154fec9ef16df30e0efc40d89936532b197d43fe9708f889caef9297946f9c2dc4e44ecef0d8cc30f2e1a847d2b745b2b5dd0e9e
diff --git a/kde-frameworks/kdnssd/kdnssd-5.81.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdnssd/kdnssd-5.81.0.ebuild
rename to kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 044e20423308..c7dc37131bb5 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,2 @@
DIST kdoctools-5.80.0.tar.xz 438652 BLAKE2B bf470a436d279bd19e90ba5482be8a16dad2cfcedbe8a8e967cea38eeeabb1c36beda03f40cbf9967cba60021fd7d5915a44c1581e424179d57c869990e07103 SHA512 17448f08528af1537987f336b8a00249f631909bb7060d31639ec8937a4cd105d3d35c8872d37651d628ce55484d87dff188e365e290fa1321f869d0ef4f2ee7
-DIST kdoctools-5.81.0.tar.xz 436976 BLAKE2B 3363203c0a43cb2cad89fc0b688779e951404142f2ecab95f1f0676886dcea6ca35a3837313c3963e7f23d6efe8619b304e523407adcfa8bee877ca27cd7cdef SHA512 accaf9b461bd23e99ed89cebadf7ae5f01d68ee00e7e0b80594d0a7a86185101c0d8f083694a1c63edbe7e725405db43c51ae9247fbe5583a6d421270cbb8f6a
+DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.81.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kdoctools/kdoctools-5.81.0.ebuild
rename to kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index a1cafa08adf8..d9fe2e0e99e2 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1,2 @@
DIST kemoticons-5.80.0.tar.xz 1697816 BLAKE2B 744e890baf4ce5339ca29a932e23ba7b8933fd626c8e7dc4a14a703f8e83e9db64f5db8e26aefadc2eb5217cc6ae4e429be853b49b0e087df1a9e1ed6f941696 SHA512 1fe07740d3869748c3fa384fbfe480b6ecdbf9ca5e9c089b6fd11b14cea854eec677f0aece9f15fc4e96bc4b90e7a7bb9fa5b80bf938c009ef2b7f0267d03b37
-DIST kemoticons-5.81.0.tar.xz 1698532 BLAKE2B 429a090b1c92111ba39ddc0daae880510fe42cc5253f7b6014afa06857c1dcb3c2bb05182352fbff910c5eb62bdf12445291d1743a77c198385a8735ee730a9f SHA512 5e4498912b13bdc97f2cd5af154247b884f9d30452ff748f6f0366b60096e9035df525e05930a9660f52431b430dbbc4b6e04d4352ef35643a5fc2507b5aced5
+DIST kemoticons-5.82.0.tar.xz 1698472 BLAKE2B fc5f8401a4b5482126a9b054f1fe6107c2da759df0a4ea960cc4a139d9ce8dcc22e6b94aff64780d7b7cf049d68b67b799011f3d999b07ce2f1e065e6d6612e3 SHA512 c3c3813613891e23db9b5605de6dcfdf3e5f973e162d27d37e907b60d49bfc3ba99743534d3749dad6a67217e44220fcf52c880563da82dc465eb10536ea40d7
diff --git a/kde-frameworks/kemoticons/kemoticons-5.81.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kemoticons/kemoticons-5.81.0.ebuild
rename to kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 6da12efc132a..c2683af07642 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,2 @@
DIST kfilemetadata-5.80.0.tar.xz 425304 BLAKE2B ac759d5643243639aacd2be0aa3ef4f35c3e1d6f4ae993a4868e3369445a8a3a597e6266f8a75ae83c489261bae26a2dc8eec622595fd197052cebf3e2896b49 SHA512 968bdc8e367d257c8352f7154721bea3c2102aac7f2e238384f44fcb4922aa40035352067a273f0473f8b119b813a771f04e7f494f6f955d2d988c202dcc9ae9
-DIST kfilemetadata-5.81.0.tar.xz 425408 BLAKE2B b2ed1d2c3414e37e553520f42fdd967796a331806c95b37c0ba21c51dc9efc4f74beaac8f2679a441336e7f37007f283e2d83d9a1b6c0579c17baaaecc29007d SHA512 c9eb40aa2c2ff70d5c9a6fc6463633f4c9f16675b787d1cd19c5b4d81acf195bcd8570f50acacf12318317989f88c15847222b1370c5b933794e20e54fff1b55
+DIST kfilemetadata-5.82.0.tar.xz 425540 BLAKE2B d9102aaca3c49fb81bdbef517ba1a6040d0653ce1fd517ce61854b221b8abffbc49c69ad38b98cfc47877f02d7885b9560834cc55b5e03ae2d05eaee51906a12 SHA512 7bd70ae0c2d49d2a9d312dd79dc9268862efefeb48042d0fd8a8e11daf75cc67b6dbeb28fcee7c3f87517476f6eabbd3d4e9a1c61440f62cee0ef93c165cfae5
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.81.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
similarity index 97%
rename from kde-frameworks/kfilemetadata/kfilemetadata-5.81.0.ebuild
rename to kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
index 562ec5f453ed..d1c43269f1fa 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.81.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
inherit ecm kde.org optfeature python-any-r1
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 3e91550ad18d..095d365ff07c 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,2 @@
DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
-DIST kglobalaccel-5.81.0.tar.xz 87748 BLAKE2B 6043423a6af0125ebd0b45aa0372204b7ae5746a1f93d21b4db154198b659b53f1fa46e160ff6705e9c88d3d62c2ea6d880f1e1fc618df23034535830ac5cc5b SHA512 e9523878d1c9bbc526428e22211c04d9b87e9e6f804f6b58bf939f1757205f9f9b69b26b54d726195dfb9df5d142a9ed849cc91c94f5c9b9762c6ca8bdf1aeb7
+DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.81.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kglobalaccel/kglobalaccel-5.81.0.ebuild
rename to kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 39c1b534a510..c1c27e3f3fe2 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,2 @@
DIST kguiaddons-5.80.0.tar.xz 58832 BLAKE2B d22aa03b84a199d9eb6f05aece22916aa0a020b6c98cc9862cfe57e4ce2dd87abc39b3e92d32f55d6b654e07083ed5186e8f3835a2566de27e52f6253cb5318b SHA512 97e4311afcdc5af6ea8dcdcce40d4c0a5c2e4a767556a7e2fac671d7691472873f526539f3c0c754da6d04987c0e180e1c0461ab747c3f0e486a5f613fa11d7b
-DIST kguiaddons-5.81.0.tar.xz 58688 BLAKE2B f471a85cc3ff157785a4844758e29af9709d553c6c94036b2831acb85fd2ea478018e648eb7e927cf5f6a7d47cc669d527115127bb1958cbf0ad5c8a4f9643b4 SHA512 9151febb2d0acaa7a7559e67bafde0434c45265abcef9892d107e776b7cdcb31e4347f51d0cb65b16836dfb6d70132b8b1a9fe7624b61530c5bb9d378d9cebe7
+DIST kguiaddons-5.82.0.tar.xz 59020 BLAKE2B 7954f85a013b0ea5a69f524a7a8e4f715aae3a6e526c9f574e8d185bb3d840fc16a7556424c9183b51782007f39df2470d2f511ab9fb486ac61da245b7df1970 SHA512 8713b2036371240e92503e4be51bdd16a354bc08f1831fe242f64841945ce99e1c1e3a62d367f1c07c4769768d724341733c6f1360985e215bfd3a85d2574ca6
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.81.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kguiaddons/kguiaddons-5.81.0.ebuild
rename to kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 94991735b86f..7a2a66c23358 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,2 +1,2 @@
DIST kholidays-5.80.0.tar.xz 225916 BLAKE2B 8f839f9ac529325707ae35090a593ccca524e37ae21067a59e30f00593f8ece89293de7e67b0e70a14ecee37fb05b444d21782ac7d298bb7096cfd17e4686622 SHA512 aa7665fe4d64255cb06835f7867e70978bd14ceed7c0ecd21375e889584eb5794d85af08d4756b25ca9cd8c9a7f4ab50c20ecdcbfc8200290796bc8248d7cdc2
-DIST kholidays-5.81.0.tar.xz 226504 BLAKE2B 9dc495d7b115df291fdb16dcc382888d302590273f9f94cc421de30cabaf0d56b04a5cdbc81c67902224eb6643950ba3204da97a649579931f59ca28ca381cc0 SHA512 57b1fe02fdaf312cf8f781dc6fa50bb0430d1cf77586c43982d5918a42581c7797ed273ea3aa055750b9526b67206c38ce86c13d4b41ce98f3977d7120cd1278
+DIST kholidays-5.82.0.tar.xz 226732 BLAKE2B 76a1f0adbe3a558b2cf6aac7782795fad869423cb42e70fe5f8dabbc1d5aa0b5a6e5036d7fd68b8bbf6fffc63e095a471a72afd9501c328f2a7878e20e53996e SHA512 902065bc4d1ea733d24adf349bc895020eb49ec1d3f98c3e8ef4a59e3d0c968e998081c7ff1a18466201372c6f51fa9ae251e747da1b959f696975c886a42306
diff --git a/kde-frameworks/kholidays/kholidays-5.81.0.ebuild b/kde-frameworks/kholidays/kholidays-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kholidays/kholidays-5.81.0.ebuild
rename to kde-frameworks/kholidays/kholidays-5.82.0.ebuild
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 9597efc7e943..d205ea1ee7d2 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1,2 @@
DIST khtml-5.80.0.tar.xz 2089848 BLAKE2B 7d049fa81cd8c3a155d8a8f8a18926e857e583867a6258bb3f46d75ffe4c2894b6291988ae95afac93d2a4bc3e7469a687db7633daba7652b3a9b397417dc5c6 SHA512 3d3881376e03cc21306f13178e6aad3458460f87b61747eb2abb2d94a58b28fd5c52bc10b33a8bcf0c2ad02d62ea464c4c88ed0ffeb0ecb7df59b77c8fd2aba3
-DIST khtml-5.81.0.tar.xz 2092968 BLAKE2B e597da96b9dfe92c7487484e8109d105eee69c6e9815813b349b679d3feeb6a686d4f12e07c558c553189bfbb699169d7795c8e583f617def1aaaacf8be611ab SHA512 33197c1207a9b7d86ce97ebf311c6921da29a86c4ad3fae760e0d89605e2ee09ac5903e9d583e53d7ce6d8c34b6ff84476848a618f604d30f97fc64cf87e6cb3
+DIST khtml-5.82.0.tar.xz 2093168 BLAKE2B e4cbcd5e187d8ba563090097d362ed6138575da93ce3c25796e1112b3a39c135ffd53d4dbd7302a9482069111bdc01291027a9ea6253ace972b19983db5b6386 SHA512 8aa3c615cc13deee3e4859f84636fd1cd18190b0a99849a6782b0a106a1a8808061258e055158cbd3dc15d5842ce3cc82fca8eff2fbd1634807744a0f7288cc0
diff --git a/kde-frameworks/khtml/khtml-5.81.0.ebuild b/kde-frameworks/khtml/khtml-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/khtml/khtml-5.81.0.ebuild
rename to kde-frameworks/khtml/khtml-5.82.0.ebuild
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 209f8fdacae2..0b5b89c2f8a2 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,2 @@
DIST ki18n-5.80.0.tar.xz 591016 BLAKE2B 9b116740c592c37c2f50e26e8912fd046c0909524e6ed38a754c5b4e689feb9a7796aad6d9f1949d54a98a0f4ffcff2ad64a4f60d2fee7b2203c42f6a69b5a3c SHA512 0ba5b71c40f98c77792d73fd15a97e59cfb3d7f33da5d49a48621dbeed36a893c914b61e179c6f457ac552a91ebead55f59d70266ed02e6cac270e9936cd2494
-DIST ki18n-5.81.0.tar.xz 590604 BLAKE2B 0312e57317dfae4e82446d4eadd623547d1933cc7b8bdf98fb890d47050ffef1f7024715660e08a26855fb3c886f7ace979a81a033aa65a80048f5ca2b446567 SHA512 5caffe9c3181881a12587de218e183cbd9e4221d39dd9b699ce1a40dae9a69edcb8e768d5c4ed896be09f18c161fe119a4736ae8b473b5d678f988520bda1a1d
+DIST ki18n-5.82.0.tar.xz 590552 BLAKE2B 628acb64959fa4b38ddc44c586218d1841b03dca2ed11d72ba235bd9868b50f63f95e46847783af14ff465f9f89fa8c63526631dc648b1f9baa6a02130ae9e28 SHA512 a0f84494897d5c614923581bb3df016ba8801b7404b933c7cf85b158be96baa0cc87199a4798a694654fa80ad8204085a2fb6da8e6f930156071261b213894eb
diff --git a/kde-frameworks/ki18n/ki18n-5.81.0.ebuild b/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
similarity index 95%
rename from kde-frameworks/ki18n/ki18n-5.81.0.ebuild
rename to kde-frameworks/ki18n/ki18n-5.82.0.ebuild
index eb63da6f4581..c163b404f540 100644
--- a/kde-frameworks/ki18n/ki18n-5.81.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
QTMIN=5.15.2
inherit ecm kde.org python-single-r1
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 4f7262b4fd77..ea111380c34c 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,2 @@
DIST kiconthemes-5.80.0.tar.xz 222692 BLAKE2B 6728b4f32298ee256059fc52df0581dad434bca292c5cbdc50099a0b7d1671a9409722592cd55bcc2a1fef91412fce729a8dcf1b931db04f7ab0c10a3867b03a SHA512 bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8
-DIST kiconthemes-5.81.0.tar.xz 222696 BLAKE2B 4aaa378f737937427512f1e90e4ca3492403c5634009bc6b65c7d603b40d736d4a4fe7306bd36ade4aa1907d961d7aecb2ad8a335558343ef69f56f7224705a8 SHA512 bbf35951996104086639684ae013f634963e17b82df6061fb0c06b29304d46f85ee2df1fd223985ba9be785bc8872e29b1791ca40cb00c1c5eaf5ba0e290ee30
+DIST kiconthemes-5.82.0.tar.xz 222884 BLAKE2B fd7404f50ec503e853d25fff6b61d55a133a26f7fec9a2a4b50da15d721ef9a2ca116b2307a6eeed7316693a68ca053f0d955d0417b19e0aa79bc6a6eaf64c25 SHA512 b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild
rename to kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index b9b2eaf322be..237f41791852 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,2 @@
DIST kidletime-5.80.0.tar.xz 26152 BLAKE2B 486250ac2b6c7582eb454b5ac402f3e8df114beae1b7b3d63d4541b68561693745881046add16d8bfa3fa6c7161b3e1b701508a0e89e1f509fd41bcff60ae19d SHA512 0725747f3012d73ac1b0196a31723393b77b3655bd214ee96cb6e350a81c9c68c418deb3632c159eb29c06b2a0ecf4a7c3f172975637d503f9f7dc576423615f
-DIST kidletime-5.81.0.tar.xz 26096 BLAKE2B 9aa408844c0047a1d4b8a09b567c101a259869fbfad5a0d5054a07dffd015b88be19845018438479ca74ec6da07097cb09f4054848bc9d8f1fd1025a307a0de4 SHA512 67f15bc2fed79c5d33f33ed6aee869aeb0646f0c98d0194b92fd27e6cede078ea7c5f132df760f50465e209cb8bc8805af984065a9610296a682ba48106f1f99
+DIST kidletime-5.82.0.tar.xz 26040 BLAKE2B b5e7ee686c9ffaefc0f321bfff15f0ee633b04ba07753702d2f76ebb069704fd9c5042904e726e617754432df6caacd305b0c4095178b71077801089a76f29dc SHA512 35cb528aeaf0d28ace354eff8f65812bbc8fc7f0b8b01ac93b8317de6267d93d1e1808ddb5b136c0ec9980544f27518cea2c3c577dd8252be05b8fdecb396f39
diff --git a/kde-frameworks/kidletime/kidletime-5.81.0.ebuild b/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
similarity index 96%
rename from kde-frameworks/kidletime/kidletime-5.81.0.ebuild
rename to kde-frameworks/kidletime/kidletime-5.82.0.ebuild
index 725d78a709f2..cd9479b80aab 100644
--- a/kde-frameworks/kidletime/kidletime-5.81.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
@@ -16,7 +16,6 @@ REQUIRED_USE="xscreensaver? ( X )"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 2c7087d0c4ca..7ee9717822a2 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,2 @@
DIST kimageformats-5.80.0.tar.xz 590368 BLAKE2B 18e9783bf8ed1c6171efda273cc0d05d7b7a60a38933a7c003d4155f36a13eb1ed53ec3b8923a9560c597545940108542aa13ec7d5fc13b02c6088a837097215 SHA512 07669deb80af6ed3055f34ca5ef82583deeafde4a7d2591dd479fa10db48e39007e82cf70645363b742c7f90c73d6d3f5cfcfed7e5cd80ca8856e4d0aa9e9d39
-DIST kimageformats-5.81.0.tar.xz 590004 BLAKE2B d64ef5b2a69908ea69fd0893b3e654085bf80eaccff3eb16807dc00bb1c61f1262757b15e564ce5d394292a462288d70cffb14e130222366d46b560c39932a64 SHA512 efb1d1a7383c9582867599281cf260fcb18c05cfd0eea80fadbd8160e548299bfb65d42e4c3d02eb0b87758a743ba22d10b86337f9683c17aa09de8c59169a17
+DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
diff --git a/kde-frameworks/kimageformats/kimageformats-5.81.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kimageformats/kimageformats-5.81.0.ebuild
rename to kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 9fff29cc8745..56e2fd8099eb 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1,2 @@
DIST kinit-5.80.0.tar.xz 121088 BLAKE2B 5a130f604ff55301672ad35c205ea044d379648b46c03e4440b7756996df327217065af0fdfc85bee23e2b4d9f75f3fd4c3e08aa49459662cdd09b1d7c2a538f SHA512 27f1bd4ef231a70acb8e32ff1cb9133c522fbcf960890cfbcd0c35ff41978a320c48236ca755b1c603f091e98596486fb37748f4109697b58315aabe1572733c
-DIST kinit-5.81.0.tar.xz 121460 BLAKE2B 04d6583f7a18aaa5818946362b33edbfa5fc85111c564ffff1616e65be921bffcd9faf0718a8380fae661d8288e5df0501ddc0ec8469d98fd50b09d17a91cb60 SHA512 98c7a2d19870ecd33b37ecb3a545e78d68cba64b570f4fb468cfec004f9ee460fa06e99980284b6ad34c11463ad7a964f1f063ea0cd9d3b34320d740f6453fff
+DIST kinit-5.82.0.tar.xz 121448 BLAKE2B 1c38e31d9ab2231a808edbb713629d91d1068263a56426303428e20b066256381030278cebc30fb45234df92bcf30fef40ad2a3a2e4066f643ce172f6c701862 SHA512 7c6dc83d1ea10a8271fe23a45a7e5bfc7e67a7f9c25914386d65157f253c98fc518aba4a4cd7d724d1684097e3e94e866e18165debe0717e7917572436fe3af2
diff --git a/kde-frameworks/kinit/kinit-5.81.0.ebuild b/kde-frameworks/kinit/kinit-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kinit/kinit-5.81.0.ebuild
rename to kde-frameworks/kinit/kinit-5.82.0.ebuild
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 1c3ff9164cb6..f9876336187f 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
-DIST kio-5.81.0.tar.xz 3319696 BLAKE2B 9ce742ecc5f00223b6dd2b4adc2a8591796c0553f027414112c5bf2bc67c4a93708d2710c822697fbe38eb17b2a154a026bcb05a8914fb7bdd33f7479268544b SHA512 e2466412eb6360dc93eace9f44c161c7ac44ce1339688e4b64cba8f716733552610374627dd3e99205aeea735f0144beb0468f429f238a6be05f91827ff9ee3b
+DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
new file mode 100644
index 000000000000..9cc0379b6998
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
@@ -0,0 +1,79 @@
+From 581fab08ff4d5539e4684adcffc74ec3517ce29d Mon Sep 17 00:00:00 2001
+From: Nicolas Fella
+Date: Thu, 6 May 2021 21:26:31 +0200
+Subject: [PATCH] Remove the cache KCM
+
+Same reasoning as for
+https://invent.kde.org/frameworks/kio/-/merge_requests/438.
+
+It is very targeted towards KIO-based browsers which don't really exist
+any more.
+
+The setting is also global to everything that uses KIO and it's a bit
+questionable whether for example webdav browsing in Dolphin should
+automatically have the same cache settings as network access in Choqok.
+
+It being part of system settings is also confusing for users since it
+gives the false impression of true globality. They might expect it to
+affect Firefox or Webengine-based Konqueror which it does not.
+---
+ docs/kcontrol5/CMakeLists.txt | 1 -
+ src/kcms/kio/CMakeLists.txt | 4 +-
+ src/kcms/kio/main.cpp | 4 +-
+ 3 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 2dd1ae16a..6c2f21b07 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cache)
+ add_subdirectory(cookies)
+ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index 11cd239f2..5281fc7dc 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
+ smbrodlg.cpp
+ kproxydlg.cpp
+ netpref.cpp
+- cache.cpp
+ ksaveioconfig.cpp)
+
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+- cache.ui
+ kproxydlg.ui
+ kcookiespolicies.ui
+ kcookiesmanagement.ui
+@@ -41,5 +39,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+
+ ########### install files ###############
+
+-install( FILES smb.desktop cookies.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop
+ netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index 8bacb10ca..2c0ebc29b 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -13,7 +13,6 @@
+ #include
+
+ // Local
+-#include "cache.h"
+ #include "kcookiesmain.h"
+ #include "kproxydlg.h"
+ #include "netpref.h"
+@@ -21,7 +20,6 @@
+
+ K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin(QStringLiteral("smb")); registerPlugin(QStringLiteral("netpref"));
+ registerPlugin(QStringLiteral("proxy"));
+- registerPlugin(QStringLiteral("cookie"));
+- registerPlugin(QStringLiteral("cache"));)
++ registerPlugin(QStringLiteral("cookie"));)
+
+ #include "main.moc"
+--
+GitLab
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
new file mode 100644
index 000000000000..ce0e891e9164
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
@@ -0,0 +1,105 @@
+From 1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella
+Date: Wed, 5 May 2021 22:27:25 +0200
+Subject: [PATCH] Remove the Browser Identification KCM
+
+It's purpose is to control the user agent used by kio-http.
+
+Very few things use kio-http these days, not even Konqueror with the
+webengine part.
+
+For the remaining use cases (kioclient, webdav kio worker, etc.) this
+kind of configurability is overkill.
+
+Moreover being part of systemsettings this gives a false impression of
+globality. A user might change something in there and wonder why it does
+not apply to Firefox or Falkon.
+
+Given the questionable usefulness and the potential for confusion I
+propose to remove it entirely.
+---
+ docs/kcontrol5/CMakeLists.txt | 1 -
+ src/kcms/kio/CMakeLists.txt | 18 +-
+ src/kcms/kio/main.cpp | 4 +-
+ 3 files changed, 2 insertions(+), 21 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 1b19e5e7b..2dd1ae16a 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -4,5 +4,4 @@ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+ add_subdirectory(smb)
+ add_subdirectory(trash)
+-add_subdirectory(useragent)
+ add_subdirectory(webshortcuts)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index a354651b0..11cd239f2 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -1,6 +1,4 @@
+
+-add_subdirectory( uasproviders )
+-
+ find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
+
+ ########### next target ###############
+@@ -12,31 +10,18 @@ set(kcm_kio_PART_SRCS
+ kcookiesmanagement.cpp
+ kcookiespolicyselectiondlg.cpp
+ smbrodlg.cpp
+- useragentdlg.cpp
+ kproxydlg.cpp
+- useragentinfo.cpp
+- useragentselectordlg.cpp
+ netpref.cpp
+ cache.cpp
+ ksaveioconfig.cpp)
+
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+ cache.ui
+- useragentselectordlg.ui
+- useragentdlg.ui
+ kproxydlg.ui
+ kcookiespolicies.ui
+ kcookiesmanagement.ui
+ kcookiespolicyselectiondlg.ui)
+
+-ecm_qt_export_logging_category(
+- IDENTIFIER KIO_USERAGENTDLG
+- CATEGORY_NAME kf.configwidgets.cms.kf.kio.useragentdlg
+- OLD_CATEGORY_NAMES kf5.kio.useragentdlg
+- DESCRIPTION "kio useragentdialog (KIO)"
+- EXPORT KIO
+-)
+-
+ add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS})
+
+ target_link_libraries(kcm_kio
+@@ -56,6 +41,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+
+ ########### install files ###############
+
+-install( FILES smb.desktop cookies.desktop useragent.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop cache.desktop
+ netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+-install( FILES uasprovider.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index f1b065f46..8bacb10ca 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -18,10 +18,8 @@
+ #include "kproxydlg.h"
+ #include "netpref.h"
+ #include "smbrodlg.h"
+-#include "useragentdlg.h"
+
+-K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin(QStringLiteral("useragent")); registerPlugin(QStringLiteral("smb"));
+- registerPlugin(QStringLiteral("netpref"));
++K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin(QStringLiteral("smb")); registerPlugin(QStringLiteral("netpref"));
+ registerPlugin(QStringLiteral("proxy"));
+ registerPlugin(QStringLiteral("cookie"));
+ registerPlugin(QStringLiteral("cache"));)
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.81.0-r1.ebuild b/kde-frameworks/kio/kio-5.82.0.ebuild
similarity index 87%
rename from kde-frameworks/kio/kio-5.81.0-r1.ebuild
rename to kde-frameworks/kio/kio-5.82.0.ebuild
index 8a640363ec96..4f99cc9cee3d 100644
--- a/kde-frameworks/kio/kio-5.81.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kcrash-${PVCUT}*:5
=kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kiconthemes-${PVCUT}*:5
=kde-frameworks/kitemviews-${PVCUT}*:5
@@ -73,9 +74,17 @@ PDEPEND="
PATCHES=(
# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
- "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+ # git master/KIO 5.83:
+ "${FILESDIR}"/${P}-no-useragent-kcm.patch
+ "${FILESDIR}"/${P}-no-cache-kcm.patch
)
+src_prepare() {
+ ecm_src_prepare
+ rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
+}
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package acl ACL)
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 654f8f40ab77..f24321772408 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,2 +1,2 @@
DIST kirigami2-5.80.0.tar.xz 310608 BLAKE2B 3e3ad3190306ffc955c17ed783d6d231f7b5d37314bbc6a8a215c22d2cd0a13564b914ca7c482ad60dd1e54336f1af5833a6af7881d94cf584753007d7052ac5 SHA512 d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
-DIST kirigami2-5.81.0.tar.xz 314848 BLAKE2B c2ea95d5e3595eb849222e324d276366e558d813a5df4ad1260f00c12604b4084806db3d75f696321c6557620601076049ea677b8a444b20dc35327b8b5628ee SHA512 b3511c69ec315a3a78502d19f89067c61fabc381b3d26589ffe44e8070f86d0c4432699a182ebed8dfa19db38bfed06874629b425266af39a8b93ef6c9a31a6d
+DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
diff --git a/kde-frameworks/kirigami/kirigami-5.81.0.ebuild b/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kirigami/kirigami-5.81.0.ebuild
rename to kde-frameworks/kirigami/kirigami-5.82.0.ebuild
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index b1a5823981a2..896ea9105cab 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,2 @@
DIST kitemmodels-5.80.0.tar.xz 402920 BLAKE2B 05e8cc29f4f7214c24f8bc8de38499eaa95cb806b81eb0aea1fbbb8aedb433607c3af725c526bfc80deb5461264eca35fd3a08f618c7d3179121e319883c777d SHA512 5cbbe75c977cbb8be78175bd51eb5f770309ce833e941fc6f217f9782be6c61255f340b2c4a0d89035522d280b54fc1b1b913e9cb0101cc17bbd37bd4e012a22
-DIST kitemmodels-5.81.0.tar.xz 402956 BLAKE2B a59c05d77591779857664475b027949e2b765361f6557c775adbdae6a1188efddfcc349c61bfa3fc703afdce62f42e09462ff98a8e0dcab2be508deb6330fbcb SHA512 e18b3dc6600f15acfc27970c0056d016d168eaabfef3fde8905bfc5bcd96ae603dd40fe4b1ea5ec0d1bbd943b9a8edfea137ecd1096c56dd8d2638a9a1e3bdf3
+DIST kitemmodels-5.82.0.tar.xz 403080 BLAKE2B 722bb9df4bc8743d1f64c99735b9b97a7326dd4fb8ed51d1e220f8b584cc211ee5f7d75c7735156e8223450acc1f78e5ef10b87f295947b7130fdd861510bf62 SHA512 a28862e46658be6d3f7b8115151088fc5febcb804e115d541a0514f12cfe0019ce4b5108643290db817a06b19e613c99ce68cbc32ee7ea90c906dcac8b392d6c
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.81.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kitemmodels/kitemmodels-5.81.0.ebuild
rename to kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 7c149c894dd4..a2d50750397e 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,2 @@
DIST kitemviews-5.80.0.tar.xz 74884 BLAKE2B 5be886c8a9d7c90ca9726ed035deb5d5cc235bc4c27d998083e3da882aed22ec345f1e33a0d895ac9989966baa7849452f05db1acf848ab207b5c44b2dd2d67c SHA512 8fbee9fdb37bb3647420e73cb609c57614c8515423b098e70060d5a0a6d7744b0e78df802540fcd0bc0b676b3304a36b988ac2a60931b7f42703243499917785
-DIST kitemviews-5.81.0.tar.xz 74960 BLAKE2B 8aeaa3783eed73432ac0946aa3132f9e37f470cee24882bf78265f3c74d5340191745512b283bc502d1b589dfe2d6a99145041fb23eaae266df6528839a6e24b SHA512 71bc8bba4b13c2b282f8dcc3d11a227594644092dabc4b1f7b0c0eec059453bd1e72a85d9ee7a3b7d8a3180a017c842ab3e0dec514543ddca21b385595e86ade
+DIST kitemviews-5.82.0.tar.xz 74908 BLAKE2B 0419be4239e07260606a8592a55bb16d4477d2a4f7b53aed5c50a872c6e32c35d62a550de5664cbd332f2d3be7b7f11dc6f50d983294b50649c8d5c9704e0054 SHA512 5b2d343331a99418e3f6030d5732d998149670c7d7075de3c0c7431b1855ef75ecd192838a8d2d5d10119eb4cfc397b0bcefff48dd11974cbd332d05bbb5799b
diff --git a/kde-frameworks/kitemviews/kitemviews-5.81.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kitemviews/kitemviews-5.81.0.ebuild
rename to kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 86484d49740e..115c74ec1fa1 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,2 @@
DIST kjobwidgets-5.80.0.tar.xz 93100 BLAKE2B c821b04b142265fe0b76d21c19b0191aa279ec4323bc65b4b0d2602398e68c52c7b4430f527aff19f636c20b8084f44cdef45b1a5994f64ea737a550d7186195 SHA512 93cf5931acbc9eb8ed39323b9fd2e01ed46aa8c89ffb4468935434ef1ee3b62713fb3f2a599baf2d2b88c0a128f5b99070f17e722d2c678e4e29b7e1df888a3c
-DIST kjobwidgets-5.81.0.tar.xz 95520 BLAKE2B df656a33128a2519bae554f48ea061e1b593edcfc99bd6c86da5cca19959c068b5ebefe4de5a14b0664a9343ed6a1564858044605e2e8f1b1740bf6a9c81afea SHA512 bc184ee3987c3b9bc454b8380cff2305a422c2c700d422c5197906f15e0023c40546a06e52573ed97b6597d1b242f441cca36c28f51b8791f8ead110136fb446
+DIST kjobwidgets-5.82.0.tar.xz 95628 BLAKE2B dc4cc0332f54c3f44034ac0534dfb60c655e4a089cac9cba97472cb3c345bd0617b13ebe0f152ecfdcd438965088fe45cbbe8e83d2c6017c90fca0181e052e96 SHA512 9fb0d2ababee7824772748e6755641910fe0fcbf0ab91ceb5cc326af12b0b9a5d853c84ca226ca0ce476132acaaf5cacc626ffa820ed04fc1a05ea4f68f0f454
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.81.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kjobwidgets/kjobwidgets-5.81.0.ebuild
rename to kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 80b90220d433..91fa4d9ea3f1 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1,2 @@
DIST kjs-5.80.0.tar.xz 337980 BLAKE2B aa0a721e088746d45baa42492bc876fe415aa829f92d0402d9c3db48859d4415efa3dd61629e0703d6b033833b0c4195007fc34446cd5028abac5d61b663a7a3 SHA512 faf419dc9209d4ff7e15d9c807c7d4c9ae1b877d8d4ff9b32a0ceec7fa55438ce25e8758f84d934d368f1101b09bd5fcc3ecc1b19e50df3211be5c5bb9f81915
-DIST kjs-5.81.0.tar.xz 337928 BLAKE2B 98222408409210e0821c7bedfd8ba032101f5f90f54d7b859a88977fd541f3b48dc4581b4863a5017330d5bef1dd5ee3af996d211d7d66ec2b8418ea301ff366 SHA512 d70e935cdf4423eb242fdd5e2a51ffdb6a30ee3963bfe8ef8548f4a88f45caa50ddf9e1d5af70912961a94545435167529a5a2e38d26b86aa2054cdd33b32fd3
+DIST kjs-5.82.0.tar.xz 337880 BLAKE2B 304acd60f22c3ee3cacabe1794369540dd43473464fe42c7cb3c2e498a3ed6780eab1f75823393efbc9658a06d3b19e718e0ea3d39463acec9b778162c56d214 SHA512 9ac3f70b09d309fe11026964607aa102d1b6264ad19c8618993fc533ad13dd367772886c56da26d980cef1aa1b80d228a8822340be582cb2a150352d64efaef8
diff --git a/kde-frameworks/kjs/kjs-5.81.0.ebuild b/kde-frameworks/kjs/kjs-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kjs/kjs-5.81.0.ebuild
rename to kde-frameworks/kjs/kjs-5.82.0.ebuild
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9cb17ac798f8..7cb8e6cec2a0 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,2 @@
DIST knewstuff-5.80.0.tar.xz 1162316 BLAKE2B b6ceb6106577b52c49ac34f87a8443dd899460e32bcdcd4cc56c5f786c0e7bdfd871e1157da215cc9b7b0dfca8bb29abab6fa212e6ff30b29dc930b5a4c4b4fc SHA512 bd0c601bcfda8f4674392010c863871e511abd97c1e2971ac93bb902e2bf2e5eb925d2b64119473a182944fe91fee3d1e5a7ebe23edc58aad20e2d04a190bc3c
-DIST knewstuff-5.81.0.tar.xz 1167932 BLAKE2B 30e214c23455bbfd37e580c266ffbcbf9e54cd6dd36abb1521c1e50cb452252a175e6d802ad62bfa0168b7adccbbd91ff752543b5db78337e38a822df89feec7 SHA512 e00b502b3bbfca177929ec9b7b6108188cc3c3ab5201dfde5af3c5bbca59818430099dd0ff59d450de22bd029081b4f6f7ab2c9366dbb9c3f9485b03235c03a8
+DIST knewstuff-5.82.0.tar.xz 1167420 BLAKE2B d35ad76c4780b79cb40b7920febfcab665bb071e26fde98710435ff7cac92454c0f07a76d7b42d2c786aa793be97ecb3f92954052a1f3e43e34d316c021d6b10 SHA512 50377c16447dac2f55e025a320c51b86142dec7109c33a9e46415c5acc4d8d234ad49f7cc25f3f29f65d37408a6a780df1dfe279b151d109d601f9504d9f7408
diff --git a/kde-frameworks/knewstuff/knewstuff-5.81.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/knewstuff/knewstuff-5.81.0.ebuild
rename to kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 928e5e502451..2b0c8ee6fc84 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,2 @@
DIST knotifications-5.80.0.tar.xz 121360 BLAKE2B fdbd56642d51d670af17b54e59d264fd687940d2788ebf88ac9718917ae947c89a8a41fd412f4426afcd5d386b5cbaf9a5ef93c6bb1b14824f112da83edab0c9 SHA512 b3130de9b2eee251dc56e9814e4deb7f9cd6d166e234e3f4f6d1328024152a961776d18b20d9e9bc20af3ed590a2673c5de4b8fa3c2f6d0cb91259c96c1c0a16
-DIST knotifications-5.81.0.tar.xz 123600 BLAKE2B 9b561ca9ce2ece37e71282a4b02aac48afc4816a364c2d07477a5f67ab78debccf1cf22fc0dc67e84ad6ed4774a1dadb063eaeaa0d24145e506f910effc2244e SHA512 e830a337d87e0dacf09461b556f9d90288a47a985d99ee53a10aacdb58df82c4f3effc3b6afc608cd35079519dfefe0cd2e2c2acb95c4e5e1746ced97196e56d
+DIST knotifications-5.82.0.tar.xz 123864 BLAKE2B b798fcd8c7f493b518a2a5d405c18ae028fa187e4a744de087bc3087e2491007e93c1e814b2e0491e0d0996aa06e3fcb239b1646baa77d3a5003afe9ba33594d SHA512 5b90e641adbadfd31ee44344361d964cb35deb93cccd2de1199c633986c08ce7e8321cfb73a50d99a954c2652a9a78c9c07d0026fcea115bc5dbe4e5898aaa12
diff --git a/kde-frameworks/knotifications/knotifications-5.81.0.ebuild b/kde-frameworks/knotifications/knotifications-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/knotifications/knotifications-5.81.0.ebuild
rename to kde-frameworks/knotifications/knotifications-5.82.0.ebuild
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index aee1c557b1a4..cd1f3787474b 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,2 @@
DIST knotifyconfig-5.80.0.tar.xz 84444 BLAKE2B fdfb0d5687601bac7c97b56d648bb4e32d0d1b556d62069bbbf0e08833a6f1c2bb6e1b4b79484f2088038d7d5df2533dbbe01941d12f102c25de4a48385f2236 SHA512 405feb77947ed27376f72221c89ec153e95798367e2e10774501109e4eaf2fcb40402f49435b9781c992cd6e562097f20840c9f30d36d32f84367499fcd32d5f
-DIST knotifyconfig-5.81.0.tar.xz 84656 BLAKE2B 2444eea482642861624d3e10fe85371181f39bafc15f3f09670cde3167f56b965ac10ce6f6af8ba72fde2898fc0faf49a9a89a258accbde64004c47e9a3205e5 SHA512 a7751edae7ddd2d43e585b3790fdeef4da612afd6c689bc96f65ee2dc6686ddd2078a4421fa16e4d130699c079aaa49de4b94f7bfe8e69520fcfe741de8c205a
+DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29baebf4ca595576a81e01e24a2141b6077ca938a6d00252701d813f10b2aaa4ccbd9e4600ed9448e8a18a628cce84966 SHA512 d214d8019179c079a22f4076bb985f1528292c467cce36a18e2457a4051264f915f48a35ea2b508b900fded020bf20c8d3e784149e9be7993a80a027a70871e3
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.81.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/knotifyconfig/knotifyconfig-5.81.0.ebuild
rename to kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 9965b12e307f..8be72fa71a73 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,2 @@
DIST kpackage-5.80.0.tar.xz 141148 BLAKE2B ce51bb6e0f06d081b2331b7e451fb51197d1a9f969c441e68f44e65a18d0aba938aa3fa9454f834343a885907695f4779b1b63045bd2bf961c792787daff8a45 SHA512 f8768f4b8d037166e7fd4a6e7bc171d23a82b63b26f391e1cb37b259b5090d1a6b1b0b96662d61a5ec374117f575bce6808a9da77b54c9971dd9259bf7c7c5b1
-DIST kpackage-5.81.0.tar.xz 141336 BLAKE2B 64320894b844f7835ab94a812a5389022f26fa1fcaf6219e3182666bf8e2e7df60a682f0d35b7f028fd35baa2033f69c4c8817e57c8c04fe7207150c90366ee4 SHA512 a61efabe63fb7163b078334f00422cd51012306b220ee0b86694b1297ca82b544f6a55a94c42361dca9cdf5e19a6ddd32a0347ab2f093fde92bcfaccbca07953
+DIST kpackage-5.82.0.tar.xz 137892 BLAKE2B 292ffdaa8271f63b178304e85ce53f8dd35ff2f46bd5c2b9828a6610c2939918d51d02d29cd2dd799c7fd77c02c3ac23ce7015c2d41b63cc3ed23833958643c8 SHA512 9d8a168b48903d4b5c68ffa0709fd0cfea1e08376c1c0b1ef820ad13f6399a1792be724eeef18a27402f18c62494c864fe4dac17e9932a1ee3a5bb4de50f5fed
diff --git a/kde-frameworks/kpackage/kpackage-5.81.0.ebuild b/kde-frameworks/kpackage/kpackage-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kpackage/kpackage-5.81.0.ebuild
rename to kde-frameworks/kpackage/kpackage-5.82.0.ebuild
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 99c028470279..35299d4efd6c 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,2 @@
DIST kparts-5.80.0.tar.xz 191824 BLAKE2B 18fd22fa61db1eba98d74959ffcb99aab26a581c38cb4e5d696575bc31a3e5a7ed3c8a46ea16c17b3ad29a846b334ce7ce196dd86e70adc78db1bcdb193f44e2 SHA512 5954636d179062948a02659b6baea8ce7f47122c9b07420a4bed495867167ddddc642fccd985375c5fa846432a98872ad2fca6b90db162e277c76559aa1cc8a8
-DIST kparts-5.81.0.tar.xz 192048 BLAKE2B e2c1e37ee644f90689ce999421a2dba4b66157ffa3c83ddc403e6e08e041b3194e3d5fd0c75467f76a933bcf817af7dafe6d2aa6def3fd2c7e788a6d683f9b3d SHA512 ca2e6b6351322fa547c486798a8bea0864645351e2be46d14674c283187fb77fec4011035d78a5249d3ff3e410acde5402ad25c1f35fd9bd528eed52467780fc
+DIST kparts-5.82.0.tar.xz 192240 BLAKE2B d46b407479c4e3a11a91bf990da14e914008ee6cd51d9fc3f67a89a33811af6201226a1f8971129cf0d3fa5189a8bf45810c2e24bdb6cca3c261465afc0380b7 SHA512 865cb26623b8e3dbf2fff7bff7e7dd0334d5cac487635a4aa88a69fbbb1a4eda2fa67208f6cd4bd3496188af4fe256558b737604202fe30a749a06671c078eba
diff --git a/kde-frameworks/kparts/kparts-5.81.0.ebuild b/kde-frameworks/kparts/kparts-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kparts/kparts-5.81.0.ebuild
rename to kde-frameworks/kparts/kparts-5.82.0.ebuild
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 9afed399d60d..4feca938f0d8 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,2 @@
DIST kpeople-5.80.0.tar.xz 61664 BLAKE2B 1e32e011e460a38d0948877e98d2304388faef4e463cbf51fea4b2b1987fbd1e6b68a0881f0f86af14298bab973c625ddf35017d510c5acaa70e496f13e40467 SHA512 d5ffc7bf5ac2028a3f53fdd92b164e6203a3529f5bf5f867a63eb39dc583559f9acf7c75b1d01f3b67f3719f8f0b5ca3cb1a2299c5d5a9cadd844e86b46c08d1
-DIST kpeople-5.81.0.tar.xz 61660 BLAKE2B ec2b3c5ddfa4546da7fb12a29759c741f3abaf4e26d734c52e136a85854bf2b45d58903aecd21d0d099e0fb30c9a59d3f66e46160a1ee165ce7f32ca29176696 SHA512 39b3103033c0be034b00beb357bbbcf4b7dafd934d3869685ba66fca32476eb7eb92286b903f26253c768b7031aed3ee3511381a00a64f371eb8fc9f1ed1e5f4
+DIST kpeople-5.82.0.tar.xz 61728 BLAKE2B 5e5abc67b4d918696ce274327b23674d018958cf9eea0e2489918c052891aacc9265172bfb18a88ebb34f6a0b653f6659ba4bf4c27548e1ccf6b99d9c63c2b49 SHA512 3437ae1685427f5b9ca98f75fa2822b68d1ce5cc902810530844e5cdc01fcf3a027d495a5457f31d8b3838622c425fd835df1b4293fdf53ebc0fc34f869bc44a
diff --git a/kde-frameworks/kpeople/kpeople-5.81.0.ebuild b/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kpeople/kpeople-5.81.0.ebuild
rename to kde-frameworks/kpeople/kpeople-5.82.0.ebuild
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index a7dd9c3f5814..622e29be0914 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,2 @@
DIST kplotting-5.80.0.tar.xz 31100 BLAKE2B 34e24ffbd2cffe8074e834923ecd304c5873ce79f436dad8a31f66cbc59e201c35982103751dd8fc351c6133c6dbd03e8987a5daf96b8b8aa6a453360bf7a345 SHA512 d04d35c44439da9df37e046f09b75908bd9f965fba18941b803543dbe3111f6884cf4a7377461016ec60d1f47c08e84fa994e2784fc135867d74e0b0d3edd2cf
-DIST kplotting-5.81.0.tar.xz 31184 BLAKE2B f991f16858f06b3ae7ff8f5f3902da93258b7d3c7f6ca37ab504c013fabe46eaf7b11b1119cc69c3733eddaf90f1a410c44ab85d292f38b4c7e52b7cf532ae20 SHA512 b4c80978dc31c1256219c450bc97aeaf478734bac2025592b4ac87bb7893b0a5990d80f0e81ba8bcb6db5ee112a793546e557fefe504235e1bd9f0f3b320dad6
+DIST kplotting-5.82.0.tar.xz 31220 BLAKE2B c7eb39d8a8846c6c230a98cba83613d4468b9a62fe1014fa240fb56021d6cef0122d1bf7df5cfd727f5693f495d0942d04ca0e43bc609283a9da1ca94cb63d55 SHA512 8e33b37e61708e637d4064187ab4acf7f8dda846eaf970efc78138590c600c0a7fa320110138e396dc91c6134ce4a1675aa6d4b199a2a385596fb1185d428a75
diff --git a/kde-frameworks/kplotting/kplotting-5.81.0.ebuild b/kde-frameworks/kplotting/kplotting-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kplotting/kplotting-5.81.0.ebuild
rename to kde-frameworks/kplotting/kplotting-5.82.0.ebuild
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 8c6d9b134da1..6a6c3efad300 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,2 @@
DIST kpty-5.80.0.tar.xz 56224 BLAKE2B 0e0e6a2a56154b8d59f88503e0a0b7e091c4f9e89a6464726a0f12890c6faa981bc32e2377d4a6eb2c70aa6bcdc0dc310738649670857ff7d122d479bd2f4eef SHA512 406b3170d80bb7a3213e8ed940c517eb97227ea442bfc4175886f0c90c031b2593695973411dc993174d1af0719c3a4365c0f74f2dcede538433dc3081ff3af1
-DIST kpty-5.81.0.tar.xz 56332 BLAKE2B 3c4a2d9d4a7ca2726c53d81c029147bdba635208743d74cf3379b216989b300b33709a6de3b7e87a01c46a1b0e9bdd54d0ad3b1bfb9397fd0deef6deed3c0aa1 SHA512 ab05121fad13330bf0e0ce22145246a1e0c426878a6cb80049ca587946794561784e2690e3b39d67167a34bf44bdaea9c25083161dc10c84286a44fd4a27724b
+DIST kpty-5.82.0.tar.xz 56348 BLAKE2B 954dbb443c9f7eb43abb9aa414c77867dbb831b767eb2c8d985cdd4eb0dc003ab3338282bca5ce547e2b84e5a714cb27aa8771653b27111cc303bada78bebcc8 SHA512 9515443671c2030646dfa628555b3e131ad8ff018aa73fe7e0168e352968cbab6111f8e00a47cb7c26ca3807da2e502de19505d44da84750ca46a834bb7a3193
diff --git a/kde-frameworks/kpty/kpty-5.81.0.ebuild b/kde-frameworks/kpty/kpty-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kpty/kpty-5.81.0.ebuild
rename to kde-frameworks/kpty/kpty-5.82.0.ebuild
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index bc039c51187e..182c7016d58b 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,2 +1,2 @@
DIST kquickcharts-5.80.0.tar.xz 101224 BLAKE2B 1efd17ad8ab283497a294e3403ad4b929cce94fa1d7e6055cf00a3081a42eecfbe44b064f2a44db52e42df7332cdc033da51d4437030646f816763d3f79fa000 SHA512 d4183b29e031a03bd7a42a0b97f78995be60340a841b7900f3839dcb375d48801cd61ef534d3bedc27081ff925467b8881a09caf3f66994a3737da74e4393831
-DIST kquickcharts-5.81.0.tar.xz 100532 BLAKE2B 2f0d0dcc89a0bc23ca9026716406da7f9e588891cd4eac2f65b64c4123fa8c56bccb05233239bcac397726b9898db91a5a0c5a796498928e77f8907703c200ee SHA512 49c628619a713388e642278d2c7c7d5278ec15a763b16721f5779d95a309f57c6c70576ce46c3a7cd147fc14f912f7a663740f0610b68054385e5c9f84b2197b
+DIST kquickcharts-5.82.0.tar.xz 105832 BLAKE2B 00bd1f5ff89e11758607a9b6c2705d4c670107b18eb5ac67522b1f5a6ba5f4b5897b86582ad6ea5f2a1e9245efdf52614a6ee418ff0c2ff8a0499de5211bfe49 SHA512 978e9644d62a3bc7c9e5fddbc7ce67551941a2429804d93a5745584c28555a748f7804287162e31217082bb9e9391d2d86bb50eda209f93da15cb4b5c93ed583
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.81.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kquickcharts/kquickcharts-5.81.0.ebuild
rename to kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 0734f32156b0..1f7e99e26629 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1,2 @@
DIST kross-5.80.0.tar.xz 128768 BLAKE2B ac906bca9eac1899f77d70a39920b22007d5da08719f47f0a242f2cc0d2b0e9fe48c6a43b45ddcdf4e053126b6392df9013f3ef6734f0a5418e86fe6edc3bbe1 SHA512 73afba0c159f93e6ff231075e4c43e077cf37bc74b2e7eb451a038f3767a3436ac649eb5df7e86c65d4c10d2a6c31b417506384bdf2ee479640f31923539bf84
-DIST kross-5.81.0.tar.xz 128940 BLAKE2B 05d4ce0d99eb7c7de4e1b49e0feddaca8232a27c90fe4b421fbb4e90e1d3cde9f6cf762446beb222cee866ac750e9f4ac933e57933a7d100dff25ec70e0b156b SHA512 b6081aa3ea4b50ef971e9b1c048366e252fefc376ac35ad27a96bfb4fbf63f4aca92f92dd45f92c5568c91093514f48e7c47599c5bee36c0081c9ab043418f0f
+DIST kross-5.82.0.tar.xz 128940 BLAKE2B 38006266d918ea9800c91e3a5149d97850d3b7d2b3b31f272c88400b8973442db3a84f0637fda13dd4086df9b7abaf5e3443c6dcc1da31d23e5ecbec7ec55e41 SHA512 ac3b30bc49e4be321c2171dc8229df7df2f7980d4eb47af11141bf51ced4602c1ab81a8150612f02d09c33226bb98cc278451b5c1d4c10f465035f1fceb12ebe
diff --git a/kde-frameworks/kross/kross-5.81.0.ebuild b/kde-frameworks/kross/kross-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kross/kross-5.81.0.ebuild
rename to kde-frameworks/kross/kross-5.82.0.ebuild
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 15da42620953..d129bab1cbb8 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,2 @@
DIST krunner-5.80.0.tar.xz 74620 BLAKE2B 9c82f676300fa6bcb85ae2b14055f82b1f06c1c80f11a78fb01085989263992e44fb8c743e14991d94653d0df956239ce77eeb51c81734d391de93bea8c165fb SHA512 71cc43ec6f52993c9a9d5fb6d736734af45b141fef50675a7825a1d03edadc4edfeecd52b5e229aa387a6bd28078cb887d63ecfc259f7b44c1aca1ecfd929d28
-DIST krunner-5.81.0.tar.xz 75660 BLAKE2B eaa32e6d2b8cdfc5889d7d176a80e646788658101a7773c7c6d95bf0a0df47581cdd0d266a7d28980899b2c44cdbe058e743f67c18f900e4cd1dd386c223d75f SHA512 d012c8557b345e6f23b5f1559ad17ac9b08299ff8bb4e013e3a7de4c00373fdf18710e04929138a309466f4d293e8b6247fdc0e62aad747e641fcc74432b250f
+DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
diff --git a/kde-frameworks/krunner/krunner-5.81.0.ebuild b/kde-frameworks/krunner/krunner-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/krunner/krunner-5.81.0.ebuild
rename to kde-frameworks/krunner/krunner-5.82.0.ebuild
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index a4be2c0487cb..995e8051852f 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,2 @@
DIST kservice-5.80.0.tar.xz 260900 BLAKE2B f1092669f6b7402eec71db9038ec57ab39d68d950165e6e7d60b009602bef357bae866f49cd98b644f9c81afada00ef5f7f758300179d4c8ddfe0e7fd7e55680 SHA512 28f612d1bbaefa15a7241395aed249fbb6b9c467e8aa3ae8ca8691463fc93b10a83da45056ef3057c2eaece01b10d14a56b6c1fd6842162ac32fd1f8c85331d0
-DIST kservice-5.81.0.tar.xz 261636 BLAKE2B 4c34f0bf057232097196a7bd8a5ba92a28949e7d8c78e49c59e76d20e5243d2e15aeab681a4ab8ba7f8ac6969b1f2a3b7bb5cc2510ff174cbeea50674098acee SHA512 42aa65d316918dd8f1399edc2bcc45974c47450eff02404cacf51abde3d7e581f1556339e9517bb3c9c210d9587ddcb8eff604db85caa714abea5d8022dfff04
+DIST kservice-5.82.0.tar.xz 261932 BLAKE2B 42b95ecca3c5a4f14578491fb1460dbeab4b866b94ab6b26d53aadd059b9190642e5914a926d2faa559a95a50e03751c5717be813254e839a27b4310adff63fd SHA512 6294beeb19773d7b58a23f01e9c9c281c4b2cf8eade19d0de6537ea295ad595ec79a22cb1d3049cb79bfa5eb43fc1e80037227217a6dae212b9e5234b3c9aa5f
diff --git a/kde-frameworks/kservice/kservice-5.81.0.ebuild b/kde-frameworks/kservice/kservice-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kservice/kservice-5.81.0.ebuild
rename to kde-frameworks/kservice/kservice-5.82.0.ebuild
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 11f9e871ec72..f09200da7e0d 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,2 @@
DIST ktexteditor-5.80.0.tar.xz 2375112 BLAKE2B d052677f8a3b81b39f95958f48b7fc899a1c6591c327a852dfbe40269062a2876cf199f7679712ce1d612b2bc13f8e79f0379ca0600c1d5e2ecf12ed3d03620b SHA512 c6065e3e4c0f2bb59dd043109b3fbc2282e82b3d023011fe726693728257e6d9061cbd07fc23e97de5a73bfac9832b5065c0bbdd8be3f5d187788f6957753820
-DIST ktexteditor-5.81.0.tar.xz 2381340 BLAKE2B 92b787807e2c85b4c5f8dc5e7bc262a11f6c8bd57cfd26e00cfe9606395603d4b9ddf6d6cec94eec760f377c2198752677ce0c2b90513f03ff4eae48144a38a2 SHA512 6e9fd7a8114d54fb16d50078d5f27e6769c18acbd5e7a63dd88d4fa20f02339129356d5b2bac102aec18fd64a0015dc23bdb1af2b715ee8083d5ede3bdf77c06
+DIST ktexteditor-5.82.0.tar.xz 2341712 BLAKE2B cab63977dd8d2e8e9c2b766a9b0563cc98f0b25e2f39f2b598f9b8162ce2e12a3ac41cb74cd6f9cd9509f5987d47d27c9ee3114579ce260837d84bb06b7ae683 SHA512 1459ba61ed4a4b603cd984449a217230914818e32c318a92232957cc83d5e70f2a55bf150ca946252c696e019c24dee5b852ca5046c9914f3fff1c6906487bdf
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.81.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/ktexteditor/ktexteditor-5.81.0.ebuild
rename to kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 5be657bce604..31d400e4caa4 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,2 @@
DIST ktextwidgets-5.80.0.tar.xz 325772 BLAKE2B 59723c843df16c555d9897651622cb4117f1b070da98a53ca47684cda5e494a2ffe5d21b7fd87f867298453d56c3661beab294cf0a3763db4a6f8e6a540a9dbe SHA512 38ffbf83eb40b9756e2393ec30670d524462f212fc15b0615b2ef9cdc046ca17f30cefa904bda2fa630fe94fd1e771a76e50abd9bbb5c84ace171544520e5266
-DIST ktextwidgets-5.81.0.tar.xz 326136 BLAKE2B bf7591670234a0e096ec48b7981ce3d50617336be12cdf58b599fa2978d7596b89d6b8fe34c4fccbacc9d3ef7871b8cdde6e9b1952f095c562cc7945ecdde338 SHA512 bee8e311ca4050953023fd5d27d460b25381ac7187ea7e788d7e0545e6053ae3358daf9bf85a979f0b53559fcc3eebf15e4181049d0dc253002c5b9e7fc1f5ea
+DIST ktextwidgets-5.82.0.tar.xz 326288 BLAKE2B 917b1c91a29462dce779b1ae569731ba1c9f810d01009608f71149e13523ec0f1d94582a03cd9fbdaeb159be8abc002193240bba34ee67614e9572578cfa69b9 SHA512 7156ef721c9d9eadd66aa72a2f0da4538a009e14f0058169a95c1ad1c9c19f4120975e2cefc2fb0e20e435ee46dc59cbeb83231fd29bbc7bb815aa59a929e9bb
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.81.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/ktextwidgets/ktextwidgets-5.81.0.ebuild
rename to kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 94ba543ef0ee..a75387e1224a 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,2 @@
DIST kunitconversion-5.80.0.tar.xz 860568 BLAKE2B 5d7136fbfe18a6e500460b1f62a6c93c0048a7fadaddd80700c5d46c6be18ed86ccffcebfdab65056d6448fb3ab2d82d2aebe9ba21ac9cc7489f9f25f35972d0 SHA512 ad2509c262a6f60f0eaec9c2d77105302623dc602cb44b2c3d15b0cf3186c37a24d65e18def72857d69b26eb6684f7a6d033e0e87adfd05b0a4ebc7dd0b58a81
-DIST kunitconversion-5.81.0.tar.xz 868600 BLAKE2B af49e7140734b7136861ffd2a5a1f3abfc2a1dd6c4b414509297a45d71c25cd755fa2b254156cce9cbd3fd7258744a976037a4c661564be7618da444ec751635 SHA512 1880ee2802962a057b62bbdfff202cd18c05ff70c89a8cc7d675e3a8aca031eb7c7c2c50cb0e4fc323ff9615ac4b2aac27450c031640250d7a9998e1e5663287
+DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13cba0d36d55c0046898ceebb4dbbce6a8244824bf4453a240661cda83e87e60630268c723abc57d6e86b960eea8ceda83255 SHA512 735684240372b9dc7a37205af92172be164a71537b96c810bf64dd46123748901a079202aef394b2624ccfe5aff2ac69e9380e5715c57089739eb59fbd48a527
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.81.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kunitconversion/kunitconversion-5.81.0.ebuild
rename to kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 391e75702f2a..af2c26d25269 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,2 @@
DIST kwallet-5.80.0.tar.xz 300100 BLAKE2B 3f192acc7c432cb426dbfe9d83a409ca7da5974451ce185ec583761695b104f6a95414e43fe56d69fcbaf0d3f777b46b9700b1678fe72d509d0116064a49e3b6 SHA512 e815210f7c0911e849b0242ba239e4f5a2c95dc39af5a03cfb68abea1b2be26c81aa474678749064179cf6311f2710cc94c634e3acfc1ca6661789bd6ba4d33f
-DIST kwallet-5.81.0.tar.xz 300876 BLAKE2B 615bccbdb9a4a258b6d9111d213f64d0a97cc54388401e6b2509298ee1d3a94a951d7d7507b064e32fe18bedd7e16267db9f38fb2c4e675fb94a51c9edb56f23 SHA512 6f967526e3bbc48109dc175d6d95115a09319358a77a0fa4b4398ce9f3582f0dacfa94237bd0d64e5975d6b1aa195204532eb619bd07c985af0595253c6caedc
+DIST kwallet-5.82.0.tar.xz 300944 BLAKE2B d15119772389a2b422bdc5564d5dd14012eab47ea1767dab0f439db842debd26632a6eb764a33ceb68f0851bbd3ff8bf5101729b8fea1eba6be675608b9cd769 SHA512 b23d0d9229df9060dd71d9ac81247f70bf246f00f6bc0026074be4964532f5e0986c49414d11affbcd88d89de761486e2f3ea2fcb6d023723285e14af85a06cb
diff --git a/kde-frameworks/kwallet/kwallet-5.81.0.ebuild b/kde-frameworks/kwallet/kwallet-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kwallet/kwallet-5.81.0.ebuild
rename to kde-frameworks/kwallet/kwallet-5.82.0.ebuild
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 5953f363ac40..d2f4f3b6358e 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,2 +1,2 @@
DIST kwayland-5.80.0.tar.xz 344740 BLAKE2B b373b27c696f6a0d13ab466f6281322b9d6e12982ffd321f055b2be2a6ae8b48807b7fb20171688ce32d93653762801e1e5169acfd438c228c022e12d903e84d SHA512 d681e7910a27c76925745dd508cc553a2ddb0b7cda9af150dbd59de3b69a19082e672c586b9e4de1da3fd8027f3aa8d85f36444a20db2604c76d7e407f269789
-DIST kwayland-5.81.0.tar.xz 345188 BLAKE2B 647b0e6862aa6c8bad1008fdff2eee84164fa683d5ccdaa4d90ca530d3583fd6eac78d0f976e12dcadb8b66cbb0b25415ac873851f9a5db35edcd1b63dcd3a03 SHA512 e73fb87826ba113b97f68bd9d6f89f0422a94a4191574e5fe8f3a20d90ee54e1202e90939564c8ee0fb4ed7984858225aad0ee92aec2bee28e47721b5352b77c
+DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
diff --git a/kde-frameworks/kwayland/kwayland-5.81.0.ebuild b/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kwayland/kwayland-5.81.0.ebuild
rename to kde-frameworks/kwayland/kwayland-5.82.0.ebuild
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index e0b11fd6522c..4a746eb89c66 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,2 @@
DIST kwidgetsaddons-5.80.0.tar.xz 2367736 BLAKE2B 3c1d41223bfccded39068665fd45743df6c93f3d28f1524620005a1c3f60842fd0c592abc248054d199808f26b18ba16ffb7706ec536e9860877fef6c8cb0712 SHA512 b89ffcb86f791684e2e0ad06901cec5b235d639e423ad7b43b32fe59fd3a808ba2b6afeff2a7009bd9e03d9297b3fe8e4c04794048ff2da4539baccdbfddb8b4
-DIST kwidgetsaddons-5.81.0.tar.xz 2371588 BLAKE2B fdb394f879adbba424908db4bc89673899acef528c6c7708a61c2d20277d563a0140dffbbc0096cf11773406e1a83d083ba2312bad546f8649aafa3ce3eccd36 SHA512 75816b1c4504d49fc1b27e75ef4c1e71cb1583fc92317f46dca70b1d6daf817e5566cfaa2bb3a25e5d959633686e0ed7c9dcda57a60d5fa29a01de6d481933b0
+DIST kwidgetsaddons-5.82.0.tar.xz 2375140 BLAKE2B 044a1af35ce5f756c49b849f0b56e024e709643967142f1d9634ccaed882e1973c5f41c2794470563cbaceae8f7b6a72fb9c89a85005dc723e09a668af0c2fa9 SHA512 6535353c931edd6b0d8bae70fb67e3f6b2bf365d143424a7df4b63de9e174e9b9da705ed17e64f497923909a9d7eba0282d934a9c7abe2b80675b3652d1bf9fd
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.81.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.81.0.ebuild
rename to kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 22966126c41a..c5a2e6da408c 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,2 @@
DIST kwindowsystem-5.80.0.tar.xz 177340 BLAKE2B 9f659368706e0b849285758f103478078f15057170397bde3aa6ab0bc27390e4eee5d7e94900302be204c5e672618b48197581cf8459b0796a2dd92ee17e8e91 SHA512 a2e928568ca4ba7e5ae904888e273c8f3e7c57661b8a32246e22330426fa2db55535b96ec7b4e74681090f15f227586d282f3f077e44bdc3e0a86c9514f6151f
-DIST kwindowsystem-5.81.0.tar.xz 177724 BLAKE2B 9d22e4ca2f3aece2d85f694d381ae67db34e95794b54835dba3335237d5ce273dde2eb020038c560d0bbbd3c27e7bb92e8290976530bef7ef274451c694ac4e1 SHA512 05531784e51cf00d8f93e5fd87cd5f0b24cefd75f652ba2edac785343cf73c2e545d26ad039292a0c578a8d365346a8b6aaef9bf8e25402d341eb82ee9fcd1bd
+DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
new file mode 100644
index 000000000000..cfa7ab9a7988
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
@@ -0,0 +1,75 @@
+From 374a29075694f530d2d0673e33a166c836d02a84 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 2 May 2021 12:38:58 +0200
+Subject: [PATCH] Drop Qt5Widgets dependency if KWINDOWSYSTEM_NO_WIDGETS=ON
+
+Use existing option to do that. Dependency remains for autotests/tests.
+---
+ CMakeLists.txt | 5 ++++-
+ KF5WindowSystemConfig.cmake.in | 5 ++++-
+ autotests/CMakeLists.txt | 2 +-
+ tests/CMakeLists.txt | 2 +-
+ 4 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 49eb05a..ecf98a1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWINDOWSYSTEM
+
+ # Dependencies
+ set(REQUIRED_QT_VERSION 5.15.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
++find_package(Qt5Gui ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
++if(NOT KWINDOWSYSTEM_NO_WIDGETS)
++ find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
++endif()
+
+ if (APPLE)
+ cmake_find_frameworks(Carbon)
+diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in
+index 8267ef4..6c1b4c0 100644
+--- a/KF5WindowSystemConfig.cmake.in
++++ b/KF5WindowSystemConfig.cmake.in
+@@ -1,8 +1,11 @@
+ @PACKAGE_INIT@
+
+ include(CMakeFindDependencyMacro)
+-find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
++find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+
++if(NOT @KWINDOWSYSTEM_NO_WIDGETS@)
++find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
++endif()
+
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake")
+ @PACKAGE_INCLUDE_QCHTARGETS@
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index c1121a7..c964947 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -6,7 +6,7 @@ add_definitions(-DAUTOTEST_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+ include(ECMMarkAsTest)
+ include(ECMAddTests)
+
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
+
+ add_subdirectory(helper)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index c0865d9..c72eb1f 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,7 +3,7 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII)
+
+ include(ECMMarkAsTest)
+
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
+
+ macro(kwindowsystem_executable_tests)
+ foreach(_testname ${ARGN})
+--
+GitLab
+
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.81.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
similarity index 84%
rename from kde-frameworks/kwindowsystem/kwindowsystem-5.81.0.ebuild
rename to kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
index 2cac1d55d6ef..c75dbd19a52f 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.81.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
@@ -14,12 +14,8 @@ IUSE="nls X"
RESTRICT+=" test"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -30,12 +26,19 @@ RDEPEND="
"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
+ test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
"
DOCS=( docs/README.kstartupinfo )
+PATCHES=( "${FILESDIR}/${P}-no-qtwidgets.patch" ) # git master/5.83.0
+
src_configure() {
local mycmakeargs=(
+ -DKWINDOWSYSTEM_NO_WIDGETS=ON
$(cmake_use_find_package X X11)
)
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 7d72a4f7fad5..4214bc533486 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,2 @@
DIST kxmlgui-5.80.0.tar.xz 861784 BLAKE2B e2a3673594806100e416206cf108fe1cab5c0647f2b68eede7608dc0fb886852587f4e6aed8d25f7ccd97fcbe5eaf9ad313a52a36ace5eace7f6a0df0fb7ac82 SHA512 ae19b33329c3c371d1cc94c83ebdae5f02b95e0e3562fed915a4f7185c7d9c639b0a0d8afaef8cb06598d1c44c48595b3f7d7a0a10c8a0c555a8d5d923361a16
-DIST kxmlgui-5.81.0.tar.xz 862492 BLAKE2B f9ba5ae603986a53f3f8675a56018d5ffe75be9df936f0d410145ebb1ab6958d9c2b9ab53fab7de4e662a634ed7978753706c33ac23f892fa900f10b4af7d7af SHA512 950c03601b6ab0f83d79d3fd958ec050d98779619143ef4969213e9ead016cf8c6693ee4da5136533c9793ab73336a1c49678b189028e3fab140fc69ff166dd8
+DIST kxmlgui-5.82.0.tar.xz 863880 BLAKE2B 045ed589d52ac901aa128d4f3e8eb2bd2f9b09ce22e6a7e28dbc34d208a6c00167c94e5514f47acce640d18f86f37adeeac79a25dc148eb58c038fddc9fcd59a SHA512 2ed59fa53876005f326e323e153d44d3144c9d49bcccf5aea68f5d743a79b505526286b6307e193878541c5cc8260220ca0a9a169b18d0b0df4720aa8541d0f4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.81.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/kxmlgui/kxmlgui-5.81.0.ebuild
rename to kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index addc14d7f930..d6c404db53df 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,2 @@
DIST modemmanager-qt-5.80.0.tar.xz 112348 BLAKE2B a6101bc598dd6ac9ba71022658444c80c69d042c77455cc4513d1aea11c0219b3b26b398ac249d35964f06074283d31948aae864b2d762b796ad38a3a88cc635 SHA512 a3cef63558040995ac80dfab7bb6714f03c8aa66c1b4c011333a67d35d9e969ad43c09f97bb522b859313ab4cbae3415da91cf9505bdd6ebac4357aa4369c671
-DIST modemmanager-qt-5.81.0.tar.xz 112440 BLAKE2B fd48648683ef93ab380cc0f07131b32134ada63b5d3256351fcbfa5aa5adda6fc228e5ec34808487034145479a8e76867ed80f60c02a6afc80be3a07f0339105 SHA512 730591294f2f4bbd42d766c3bfe32533821895e4067f50e7a69ae3c8ad09056573beec31cfd588519848cac630ba4ed5be11f1add8640d85713a1f499eec136f
+DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.81.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/modemmanager-qt/modemmanager-qt-5.81.0.ebuild
rename to kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 9e2ebbded65f..5ad54f38e124 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,2 @@
DIST networkmanager-qt-5.80.0.tar.xz 195064 BLAKE2B 553a62fdea48c1d11b0a12174cf901d4dbf5441efc9138d1a0b93645934b14fd134922d60a3f95aa9c6019306627c2b8bca1ae8a7b2063b6d394e5a1412844ef SHA512 df36c15cf19a3a77785ac5c231de91f64b1380df2f84b3553bd0869f245a22c1bff0418485a1b1e22aabd19c7dd2e73e193530d60950d599a08762abf9f22e2d
-DIST networkmanager-qt-5.81.0.tar.xz 195600 BLAKE2B dd102a97e8acf5788e09eba053d96491266db62233d617696ae8070605cd810f285c778a77dc9847f5b644b907109c79edade48c0d8f8f241a57f335c6e622af SHA512 0a26d7551f8c2cc1fcfb353ef30176ff27f0768e0af41a1246aaa294c247674d8d6d7f9557c74011bf912fcd49dcb3099e2c1c97750c2f62db260f037511d542
+DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.81.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/networkmanager-qt/networkmanager-qt-5.81.0.ebuild
rename to kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index d83d80a066d4..ed10a4cfe42d 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,2 +1,2 @@
DIST oxygen-icons5-5.80.0.tar.xz 236044748 BLAKE2B 1efe1890e207726e1b85c17e1c6815df9d444d027d7729b57e0da2dfe15565015c7f5fe806253541c0c07f142e85578217122c4ff2ea285a0a6a8d64226585c1 SHA512 00b88c76e7c9627011a6971dade33aade5ad3ff2aa6c4298ff52221307da90d47aaabf8360a1bfd178d6016d5fc7ee69cbe1f10f4392bd14ffd075ab6dccfbe6
-DIST oxygen-icons5-5.81.0.tar.xz 234609156 BLAKE2B 40a2eebdd880265a924f970a7b0592ca9c72961151219bf25a0db41ad87f90713c2afc436c2a25cd7de174ad86ffaea8820885488d3b25842e5b4da7d440c4ad SHA512 94c314a7799ad4134ce169052de6955bdda3663e93944916429cdd5920b52cde8a481557ea6bf9c3129bc8116ee71e13401cb36c7882b0d93be172b1d570ddd8
+DIST oxygen-icons5-5.82.0.tar.xz 234613000 BLAKE2B 49c25988ccfa1a00a68c55a51b20d3052f1206a74f9ea12534243d106326471ce8219a7bb1c7abb30f1c8994bbd098753107570beb8e7f1f058eba91fabfb609 SHA512 b35ba0bea0fe88f8ef65b7ed7e56157ff4d34ebc516e0009a2bd9969bfe477a6150484f5a8987a9ee5866d27c21f92efd0eaf9673b537a6b92732b3af8133bb9
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.81.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/oxygen-icons/oxygen-icons-5.81.0.ebuild
rename to kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index c47c9486e56b..ed1a7b7dc123 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1,3 @@
+DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
DIST plasma-framework-5.80.0.tar.xz 3157460 BLAKE2B 46042d7f0809f866d867aae9ebc7590c1ce04c30a3396c81913a5c890aea96d0766b48018799a77a546ab3b3b96baa8b0eb80e86032dabdf67d686814e312e91 SHA512 6a0920a3a0e97b3775dbd3d5fe4ffa32bd978db73fc52008f3effebbdb54d27b048ff758140238d25823864111aef404d1604854d204b54440bd4c52c14df7c2
-DIST plasma-framework-5.81.0.tar.xz 3159028 BLAKE2B e6439848881809039845a85fe52d41953d00c675bd2afd11f30930f0002eb573c5b4fccd152fe79be5fcaa62736f9385129dfedb0f1f8728c5faf6fa0b6c3b05 SHA512 27eae869af97153aaef9d09e456c3cf067e1adee97ab4c5998a45d5fdfaeac369e31f51f63a25700619eb684823d176f400c78dc015b71703932975e3f558097
+DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
diff --git a/kde-frameworks/plasma/plasma-5.81.0.ebuild b/kde-frameworks/plasma/plasma-5.82.0.ebuild
similarity index 92%
rename from kde-frameworks/plasma/plasma-5.81.0.ebuild
rename to kde-frameworks/plasma/plasma-5.82.0.ebuild
index 30849cdadab1..a97ed52537bc 100644
--- a/kde-frameworks/plasma/plasma-5.81.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.82.0.ebuild
@@ -10,6 +10,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Plasma framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-${PN}-transparency.patch.xz"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -61,6 +62,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=( "${WORKDIR}/${P}-plasma-transparency.patch" ) # KDE-bug 434202
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 73748bc62c0e..7c0b708510b5 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,2 +1,2 @@
DIST prison-5.80.0.tar.xz 41088 BLAKE2B 210b52cc49cb218d5cf76fd5b50622a100eb3b05eb0025468abf5e473a64393514a50c84f397ef08a32c2e069eedd062af0e7432be3817a6c46828190c5c379e SHA512 2b82dda139612f7db56219b3798528ed1a9a85ce9d459d979f5b2e8e5367c8d52f913e2f806ccdc7188f70dc8b2d07d235c81e950e648c4d371f0bba40fb74ae
-DIST prison-5.81.0.tar.xz 41052 BLAKE2B 2a0723e259aec93bce9c49f7988e69ec04eca6cb675ef6ab35586aac6a9bbef7c65eabc6a153f59a5c07ae366c94e5c76782f75f1aabdca18c990cb52e7064d9 SHA512 557ebcfcf31bc658e70332b6e2fe73b3c8d481055980744907a774c77d9cc7555db6e9c9cabc0dcc8a947ec49effd7ac7b496e527d706bbba72d8b9de8f06bcd
+DIST prison-5.82.0.tar.xz 41044 BLAKE2B 869d41631f1c41260144cf43d043bb868f3c9cf1443e544ad2a084852fa58d2a2b08a1abcd8182ba1bc2cadec229fd870ff10f483f3a9a92bc3e8b49c4138d87 SHA512 bfed4293bc3bc0c39d8cecf37a33693af59831ccb9aefc32ea717d363cfe6e0769f0f90296dd09ce5ea24016e25f352c0be400e9eacb80f813221ffce02bbb82
diff --git a/kde-frameworks/prison/prison-5.81.0.ebuild b/kde-frameworks/prison/prison-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/prison/prison-5.81.0.ebuild
rename to kde-frameworks/prison/prison-5.82.0.ebuild
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 022d3a062e62..50b435c03963 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,2 +1,2 @@
DIST purpose-5.80.0.tar.xz 159308 BLAKE2B e7467c3ca5a39c2482c470aa55debbb29b3e0457271a9f126e4b68dc1c48db245bb1d7adb73fdff6f3bdd044fb99557bc08cf2a72de5cab998dd7a9485002641 SHA512 3746e66f0587ad0b7f62f0c262879a6f2f8a58af3753f6c4a1f28ca4996fa40ad63accb5d024fbef1269b137b45c38234cde0bfc5a046cf1c66b61064a7809b4
-DIST purpose-5.81.0.tar.xz 159704 BLAKE2B 58893667a268012df7448d0fb5fc1928d5b3aeb61f9839b98a72243b35f1cf9e4f70a6f7db351db3be2bc1b097519fc488caa340b55847bf3536b50bde187b59 SHA512 55ae8014313d8fba6980ee02bc1ba729eb2155e824f333df5b06aeb31320b424db4d79feb0bdbc0a513a7ec59dee6a126ed1234059756d213124fbe1c5245a95
+DIST purpose-5.82.0.tar.xz 159860 BLAKE2B f29c436239b13c5c025b990a0bdda00107f947dda44b56546049a6e1341f5ca35592c5a4626d62c9ce15b914e566b9a4c96852f0ff9b22d6a22b07b744e1e5f6 SHA512 bccb2cb1ceec619eb61d27cfd027ed20e824a2ba627120581dd928bb331cc1dfc416b5f8067aa31b2a9166dca937a180efc094107a4585e590a5bd9eceec21a5
diff --git a/kde-frameworks/purpose/purpose-5.81.0.ebuild b/kde-frameworks/purpose/purpose-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/purpose/purpose-5.81.0.ebuild
rename to kde-frameworks/purpose/purpose-5.82.0.ebuild
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 3a4e2a7bf0bf..461dd0adc09c 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,2 +1,2 @@
DIST qqc2-desktop-style-5.80.0.tar.xz 60092 BLAKE2B 9f3cf0859aa0f40ae3bccb8c762d2ddac244d197c06a4caf22a22cb824173061fb922f0f098410dc94edafbddc03784e0cda695ab1f7be550014fea9a0a391a8 SHA512 c5c3be2f8f1257a978136e8a3ae9942bbb5389411338a8d50cde34ec1a007d5c16acb8e0ce755265b0ba088bd71cdc0966ffab44a541c3bc7895ce2f56ce33c0
-DIST qqc2-desktop-style-5.81.0.tar.xz 59960 BLAKE2B ba7bb1a4a256f28b4711ca5ace12f35ff21e00ae0d1f39875b31dcfab96c18d8043767eaa384f21eddc6b7ddd227297d494843848679745aa6c680ca3e99f5be SHA512 052a95385eae617a07d511b4d4a925b03b28fb3c5a773b0295cb06e4f92708045ad6ba9094c11a28d96e8a8addaf40338345c64ac42a142ff37508c90ebc8172
+DIST qqc2-desktop-style-5.82.0.tar.xz 60076 BLAKE2B 1d743ff60c5862740bd2ef9c0dcadacca3f63f239a78dbd12e459f929f323b695ddd9c03323146b7ac34772ff76f2137e8dad826e04abef6a1f4ed514163e305 SHA512 ce4db38f835971d6f63dced360db8a320e06e3a6f808bd017d56548041f6d0332b119dc0f6d4e160c7847d9d47e6818d2a867e0f243e58fd6c56843643d55a52
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.81.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.81.0.ebuild
rename to kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 7def50543c46..9697641cc308 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,2 @@
DIST solid-5.80.0.tar.xz 274232 BLAKE2B 0c080aa9b63c86465dae8fb101ec5548d00b9f207e1aacf1e384071072f143fed7b46e5f280ab816afe80844c7c2e4b4bc97594f3da18f1f8bb38293d86fa599 SHA512 8826187f729d435a64bd6b18888d48a87a9c2e910a2b91dbe081212a3bb0be5ff956190a6fb1337d0e8544d54923a0dafb4971f5dec68c2fa9adf66939a22cdf
-DIST solid-5.81.0.tar.xz 274076 BLAKE2B 84b7cc6f1386923dbbd9a343103e5d799313e17633bae591b24fd56974a1f42ba689f619edf5114a0525c5c1d4b2782febb6a2dcd1a64b7b864e464645435f8e SHA512 b4fdd64deca063421945f2de739d88963b093c167275e7466910de8657266c9e53c5f8010608b903c10cdf9d49e9ef7ca7962701c8dda7f806f4ad6c08af85f1
+DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
diff --git a/kde-frameworks/solid/solid-5.81.0.ebuild b/kde-frameworks/solid/solid-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/solid/solid-5.81.0.ebuild
rename to kde-frameworks/solid/solid-5.82.0.ebuild
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 8b2fce4c3469..e1bd2782e60d 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,2 @@
DIST sonnet-5.80.0.tar.xz 293860 BLAKE2B 64d800fa0740cfa65772ebecaf033a275be7a0b9d9e9e94a38647e44f17166836788995b64f0b11b2aa9fe319155437cfd0e905071ddbf5b52270bb5b8030c3e SHA512 703f43e6498927c781126ca556cde6034314501dca7443466bc86f78f06736ef01cf1846d888e490c88d38ccf449cb4e759207a66f8a09300ae7b4e7ac6a9f88
-DIST sonnet-5.81.0.tar.xz 293948 BLAKE2B 7d6d421a64afac47375c12fb9dc2b61a437150dba10543c6bab4bfbfd40f87dfa4aa0c812d3b443fa14fe4bb1ef1f107172e385d66c57d669ef46779e4f2f35d SHA512 42a7273b10cac8924551d833ef5c0d3eaef8b146cbfd1e978868b6a3857a1746dc4374a354c4eadb5e35141870942f0419ca256b2f4cc049c1ef8d85e7787fd5
+DIST sonnet-5.82.0.tar.xz 293844 BLAKE2B 6e2c4558957d845a281955c63de7dd87fc21634a4cb3e89af47345da070b1dc15e91c558a865e0c7ac5e2adb2454d36b6b8f2f521112b4fd07ad1b2ad02f6c04 SHA512 3bc876b1e06ba5c08c05ce74530a2584b9853e8c9742f66b19529e7f78f3aad89d3a72e0a615e912d1cfd7a24b3de3a9068d0f72dce3c51ca03b896eeedde817
diff --git a/kde-frameworks/sonnet/sonnet-5.81.0.ebuild b/kde-frameworks/sonnet/sonnet-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/sonnet/sonnet-5.81.0.ebuild
rename to kde-frameworks/sonnet/sonnet-5.82.0.ebuild
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 000a365031f9..f11246ed9118 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,2 +1,2 @@
DIST syndication-5.80.0.tar.xz 508592 BLAKE2B fb6127514ae15ec952374b066035b26cf48323949a99ef6b66fba8165b435688251bccd38c5283dc683806d610dff812fc8c125221b74968176a911c517f132c SHA512 913631280479682dd23118b4a1f464930a00546c12f283b2dc9fb1ab96b33b576b6d5fbbb82477d26189ee8fd376842104269fb5a05ff54b16447c7ae3ed651f
-DIST syndication-5.81.0.tar.xz 508312 BLAKE2B 3e7a943b031da4c4a6f4d214c14f13140b1ca88d16224488c561b0722b54c5261eb87ff82cc66c2c2ae7dd7e858e32bce43d81917298d450612cc35177b92071 SHA512 73ba73dabebcd5bbecd7fafe2b03fed83d7d8f3324cbb4f4317750709a953d67cc805cf0059aaef46035dfe3e9d4adcfa2e7cfa78d46ddf333b83797f6ddd574
+DIST syndication-5.82.0.tar.xz 508368 BLAKE2B 5bae3d80f818670cad1a08f3e085fff45116067f811b34390e4cb64c2f4aaf6c171abdc462e7075ce43b1208ad25cf15f088d8d06f3e922222cac94eb9108d80 SHA512 59e8f88138d6d18d7b4c4f2e5596606bdd13aa7425e55dadf24cf4a1592cda0c547b077d303dce514a0e20d5cca0740e6e6879ffda6470c0fa9302cd11eedbc0
diff --git a/kde-frameworks/syndication/syndication-5.81.0.ebuild b/kde-frameworks/syndication/syndication-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/syndication/syndication-5.81.0.ebuild
rename to kde-frameworks/syndication/syndication-5.82.0.ebuild
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index dcdf808a9364..dff7654e64ac 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,3 +1,3 @@
DIST syntax-highlighting-5.80.0-fix-path-style-w-alt-value.patch.xz 6880 BLAKE2B 036a4a680fc52533b1bc3fe798b622b0a98a1142fd33e0f8f187d55e62a420cbc2d8e301fe873f6af33409d37fe155654cab09051b93054f281acf33acd581ce SHA512 19163f297f1f41cda1a95c4fc532055954a3bb59eda8d4a684a8fdd22b2a595e2cf48eafb5688fd7b8e8c5790ed6c3ab93a52340d2929ffa214ee7698103af11
DIST syntax-highlighting-5.80.0.tar.xz 2272788 BLAKE2B 45a116be75f998cb9a9cbf378418d030135eff1d1d3eb21932b202f22495fcbaa67f133dc1ae55bbcac24725cca847a2dbd880a5f5c1e39aa318a5b342365c22 SHA512 f24fb943f095b44092f62eca2a52f4b0f9ad0ce705bb0b0f8a17a9e3cda7a9892794218119e77cbc376d48ebb336904f862dbdd2715d932e7bc1c197dcbfba29
-DIST syntax-highlighting-5.81.0.tar.xz 2281616 BLAKE2B 415ccb8602a9c46b26da2a0273581b8e742f79eb48d10fb604e87cbe24f3f7466c5da1bd00d6d7bd03a7a953c1d338d826908e17ed6d7fa3e54b86889174ecfc SHA512 ae8a0a75fffab6e050df298fab8c403c8b55885750177fa5e6c316091b927436b89f8385b7904420dbfbc8915d3dae89d290b01a5bd089d682dbcf10b4cbd7b5
+DIST syntax-highlighting-5.82.0.tar.xz 2290880 BLAKE2B 14a98534b4e0ec85bd3bb3603c6330f665b5d2a3958f1b9034e48fdc542aca0c0eca80a1bc5c75179c480ffb40189dd94a847093e81ab4af91442a9e323f7d32 SHA512 4487fece4b144fcdc3b03bc0c11573dcdb0bb073218f25a98a7d08fe55db0fde027f32b5614fa5083097136310cae46d7d28288f7f874eaa2fbd930af2d9fb16
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.81.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/syntax-highlighting/syntax-highlighting-5.81.0.ebuild
rename to kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 4866098e41df..90df61364e2c 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,2 @@
DIST threadweaver-5.80.0.tar.xz 1410660 BLAKE2B 1d64ed2d9c8ecdd5e3e3da650e512cad7c183007da0f785db0ca92ac81e62eeabfb50b929a0f318052b855636da72a05325fd9e6507482bddddd9418a58f280d SHA512 e7b30f2fdee4b1d4ec5153afe83bcbc238d7075214fb6623639ee5700ee62cea5b51ca335b1b08b1fc7ca471e55dda6b87e5a1b9d4660c299d6dfacfa5573e73
-DIST threadweaver-5.81.0.tar.xz 1410484 BLAKE2B 1d260a45630ad3838bc532b4cdc927f2395f84c2a01f8e3bb3a900222e6676509436c0f1412ba649a8ffee38046f059c979656f1a7a615e4ad90c9549ed8a3b0 SHA512 8b5e1eab7353f822a407a8eada38778660ff89af3ea3080ae2c0fa7b337a9bc1ca5896543136f300d98d30d5b2d3f585063394757e775fe58b58f3c204fdd170
+DIST threadweaver-5.82.0.tar.xz 1410496 BLAKE2B 2723b05277c1f8baa35ca0b759d21c75016a93912eb99600002cc4d5c816971fbefa41330fb1d2861d9d1a71ea9e4b8c5e938f87c5f61f450b93a18dd365b2b0 SHA512 11814680c7209ac29751e4b1411ea2d177e71306e06a9f01635f579147efa75641d6d3dfe84c0c52950069b415edb67965fc899427d69e896028510676af0e6c
diff --git a/kde-frameworks/threadweaver/threadweaver-5.81.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
similarity index 100%
rename from kde-frameworks/threadweaver/threadweaver-5.81.0.ebuild
rename to kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a5fdabb4b4ad..9e52a04310eb 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 0be03e278e0a..3992ba7c9f80 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
-DIST bluedevil-5.21.4.tar.xz 162016 BLAKE2B 3cd4e3d971c278579fae554b08a39feff4896e663260c4a38fa3cfb739c2602952d669bc95151e734ef4b974cea6b8adc022c01ea744925064c81f8bc8746822 SHA512 8d9dc765fc3f1be4be6c6e5a3049c330a7cd4cbff6570a75d3a9b9a25f44c0125fb91f4e5dc733ae983b5b0d659046524fc9dbe36225705fa1bba13fc94bbfce
+DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/bluedevil/bluedevil-5.21.4.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.21.5.ebuild
index 058498af5f02..f8edeef6567c 100644
--- a/kde-plasma/bluedevil/bluedevil-5.21.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 4817c50e31a2..1384416c0a59 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,2 @@
DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
-DIST breeze-grub-5.21.4.tar.xz 3131192 BLAKE2B 7acc7099f3b6563645041a6224763dde160f70bcc91b0f09f47c8d1142c5a64d8b4e6cbd890b60d0ca430bc715278b0c86dbd8c01416c7c89d89bb97cd5d36eb SHA512 a92f15ce8808306aafbc5e237a34e6f6d7ac14cd8f7f3830374d9e88cdb851e45813fa7226735829389f3df2c52577dfdf05a840ee71b1ed89fa3bb0ed16d792
+DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.21.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.21.4.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 6c8109457126..97a12b3c4dc1 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,2 @@
DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
-DIST breeze-gtk-5.21.4.tar.xz 47160 BLAKE2B 470449ceb732415f1fcf04e2483866bf1867900144cbc9d12acd02b936765995d1c0527b41f08df37296d4b9e4a8b5f5db2767d34aab5287c5f24b442c204c10 SHA512 8b0b2dfcc54615fd23c76f8d5f43cd604a449b1be02a9c8e5b89d10d050eb4f8550c68e7d2781d050762c5a2493010a4e0efd943f531204ec0fb355476b96aaa
+DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.21.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.21.4.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
index 536330cf9187..4865bfe4a9fa 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.21.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
PVCUT=$(ver_cut 1-3)
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit ecm kde.org python-any-r1
DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
@@ -17,8 +17,8 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
dev-lang/sassc
- >=dev-util/cmake-3.16
$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+ >=dev-util/cmake-3.16
>=kde-plasma/breeze-${PVCUT}:5
"
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 6561141aa832..881e884afa54 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,2 @@
DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
-DIST breeze-plymouth-5.21.4.tar.xz 108872 BLAKE2B aed25bd2a895fb2315678bbb5ff84c46ec5b85affc852f37dbabb1ee03d3c5941efa9fdfed35afaf5e25a0b9be7173b8cc86f6df2e2edaa45705b32008544dc8 SHA512 40fd9da5c4c78c07dac1431dc01e332f86cc16ee7578a01a0461e5fa249a94be694497f794c2e6969a6170c02f7f71ef67cc56a7a200f4a3ca49b68eedae7ab1
+DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
similarity index 97%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.21.4.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
index ff8cb798041b..b9ecc8176c56 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
inherit cmake kde.org
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 5651c354976e..702964d7ef2c 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
-DIST breeze-5.21.4.tar.xz 26283596 BLAKE2B e22294f4bf659e54f911c51ae6be516123d1c23a03bef7556cc5397784a122db84c0b29aac90f3dbbe0a330f132d1e0d7afcaf82d3d604da4a568ae26a6f590a SHA512 ed5fd82817c76c619db466f2eccb5a9158070d7d9221a81fc11c5ec4326e64c4ea40cd0325c848f3d7dd5161e2ff99cb08ae6055ace6ce22355b04a25274a7bf
+DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
diff --git a/kde-plasma/breeze/breeze-5.21.4.ebuild b/kde-plasma/breeze/breeze-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/breeze/breeze-5.21.4.ebuild
rename to kde-plasma/breeze/breeze-5.21.5.ebuild
index aed61f7b0ae1..d1a274a975e7 100644
--- a/kde-plasma/breeze/breeze-5.21.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index a07d70e3c81a..98b287b605ef 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,2 @@
DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
-DIST discover-5.21.4.tar.xz 8425820 BLAKE2B ebaa1742e2f4571530aa47f1c82f56f53992fb1ee1b96467cae2a71c5ec43e2ad344c0157d8ea664e8d9d3727a2b61407a904e28935dbe47f70a72514f854645 SHA512 8389cc2328935fc6556e47d4221ee2c2a7122dd4d9bb78cb61073832304438be7598f122d6838964ac5b01c9f33d8bd94809087c3b64381a2c83099a641a346e
+DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
diff --git a/kde-plasma/discover/discover-5.21.4.ebuild b/kde-plasma/discover/discover-5.21.5.ebuild
similarity index 94%
rename from kde-plasma/discover/discover-5.21.4.ebuild
rename to kde-plasma/discover/discover-5.21.5.ebuild
index e32fb61e4cdb..d7ff1db71470 100644
--- a/kde-plasma/discover/discover-5.21.4.ebuild
+++ b/kde-plasma/discover/discover-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -56,11 +56,6 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=(
- "${FILESDIR}/${P}-missing-link.patch" # bug 785457
- "${FILESDIR}/${P}-glib-2.68.patch" # bug 787155
-)
-
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch b/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch
deleted file mode 100644
index 903b4b8ff30c..000000000000
--- a/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 12f83062b01d5ba946e6f98503b72d4e58721aa4 Mon Sep 17 00:00:00 2001
-From: Aleix Pol Gonzalez
-Date: Tue, 6 Apr 2021 23:54:52 +0000
-Subject: [PATCH] Only wrap flatpak.h includes in extern "C" with older
- versions
-
-Seems to be the only way to be compatible backwards and forwards.
----
- CMakeLists.txt | 1 -
- .../backends/FlatpakBackend/CMakeLists.txt | 6 ++++++
- .../backends/FlatpakBackend/FlatpakBackend.h | 4 +---
- .../FlatpakBackend/FlatpakFetchDataJob.h | 4 +---
- .../FlatpakBackend/FlatpakJobTransaction.cpp | 3 ---
- .../FlatpakBackend/FlatpakJobTransaction.h | 4 +---
- .../backends/FlatpakBackend/FlatpakNotifier.h | 4 +---
- .../backends/FlatpakBackend/FlatpakResource.h | 4 +---
- .../FlatpakBackend/FlatpakSourcesBackend.h | 4 +---
- .../FlatpakBackend/FlatpakTransactionThread.h | 4 +---
- .../backends/FlatpakBackend/flatpak-helper.h | 18 ++++++++++++++++++
- .../backends/FwupdBackend/CMakeLists.txt | 3 +++
- .../backends/FwupdBackend/FwupdBackend.h | 5 +++++
- 13 files changed, 39 insertions(+), 25 deletions(-)
- create mode 100644 libdiscover/backends/FlatpakBackend/flatpak-helper.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 889ded6c..a531d4de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ pkg_check_modules(Fwupd IMPORTED_TARGET fwupd>=1.5.0)
- pkg_check_modules(Markdown IMPORTED_TARGET libmarkdown)
- find_package(KUserFeedback)
-
--
- if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
- # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
- # 3.10+ lets us provide more macro names that require automoc.
-diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-index 49ac1085..65ba622a 100644
---- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-+++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-@@ -23,8 +23,14 @@ add_library(FlatpakNotifier MODULE FlatpakNotifier.cpp)
- target_link_libraries(FlatpakNotifier Discover::Notifiers Qt5::Concurrent PkgConfig::Flatpak)
- set_target_properties(FlatpakNotifier PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
-
-+if (Flatpak_VERSION VERSION_LESS 1.10.2)
-+ target_compile_definitions(flatpak-backend PRIVATE -DFLATPAK_EXTERNC_REQUIRED)
-+ target_compile_definitions(FlatpakNotifier PRIVATE -DFLATPAK_EXTERNC_REQUIRED)
-+endif()
-+
- install(TARGETS FlatpakNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
- install(PROGRAMS org.kde.discover-flatpak.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-+
- install(FILES org.kde.discover.flatpak.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
-
- ecm_install_icons(
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-index 3b71344f..f0234cc7 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-@@ -18,9 +18,7 @@
-
- #include
-
--extern "C" {
--#include
--}
-+#include "flatpak-helper.h"
-
- class FlatpakSourcesBackend;
- class StandardBackendUpdater;
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-index b9aaf80e..d63fd1bc 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-@@ -8,10 +8,8 @@
- #define FLATPAKFETCHDATAJOB_H
-
- #include
--extern "C" {
--#include
-+#include "flatpak-helper.h"
- #include
--}
-
- class FlatpakResource;
-
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-index 9499c566..37adb046 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-@@ -13,9 +13,6 @@
- #include
- #include
-
--extern "C" {
--}
--
- FlatpakJobTransaction::FlatpakJobTransaction(FlatpakResource *app, Role role, bool delayStart)
- : Transaction(app->backend(), app, role, {})
- , m_app(app)
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-index ea2aafaa..0e4423ef 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-@@ -10,12 +10,10 @@
-
- #include
- #include
-+#include "flatpak-helper.h"
-
--extern "C" {
--#include
- #include
- #include
--}
-
- class FlatpakResource;
- class FlatpakTransactionThread;
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-index fa358802..a0deb83a 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-@@ -10,9 +10,7 @@
- #include
- #include
-
--extern "C" {
--#include
--}
-+#include "flatpak-helper.h"
-
- class FlatpakNotifier : public BackendNotifierModule
- {
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.h b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-index 880b494b..253062db 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-@@ -11,9 +11,7 @@
-
- #include
-
--extern "C" {
--#include
--}
-+#include "flatpak-helper.h"
-
- #include
-
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-index b2a6c7c2..df356337 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-@@ -13,9 +13,7 @@
- #include
- #include
-
--extern "C" {
--#include
--}
-+#include "flatpak-helper.h"
-
- class FlatpakResource;
- class FlatpakSourcesBackend : public AbstractSourcesBackend
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-index b8eef827..24718f9a 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-@@ -7,11 +7,9 @@
- #ifndef FLATPAKTRANSACTIONTHREAD_H
- #define FLATPAKTRANSACTIONTHREAD_H
-
--extern "C" {
--#include
-+#include "flatpak-helper.h"
- #include
- #include
--}
-
- #include
- #include
-diff --git a/libdiscover/backends/FlatpakBackend/flatpak-helper.h b/libdiscover/backends/FlatpakBackend/flatpak-helper.h
-new file mode 100644
-index 00000000..f42eee46
---- /dev/null
-+++ b/libdiscover/backends/FlatpakBackend/flatpak-helper.h
-@@ -0,0 +1,18 @@
-+/*
-+ * SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez
-+ *
-+ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-+ */
-+
-+#ifndef FLATPAK_HELPER
-+#define FLATPAK_HELPER
-+
-+#ifdef FLATPAK_EXTERNC_REQUIRED
-+extern "C" {
-+#endif
-+#include
-+#ifdef FLATPAK_EXTERNC_REQUIRED
-+}
-+#endif
-+
-+#endif
-diff --git a/libdiscover/backends/FwupdBackend/CMakeLists.txt b/libdiscover/backends/FwupdBackend/CMakeLists.txt
-index a018f175..59c36a8d 100644
---- a/libdiscover/backends/FwupdBackend/CMakeLists.txt
-+++ b/libdiscover/backends/FwupdBackend/CMakeLists.txt
-@@ -9,6 +9,9 @@ set(fwupd-backend_SRCS
-
- add_library(fwupd-backend MODULE ${fwupd-backend_SRCS})
- target_link_libraries(fwupd-backend Qt5::Core KF5::CoreAddons KF5::ConfigCore Discover::Common PkgConfig::Fwupd)
-+if (Fwupd_VERSION VERSION_LESS 1.5.8)
-+ target_compile_definitions(fwupd-backend PRIVATE -DFWUPD_EXTERNC_REQUIRED)
-+endif()
-
- install(TARGETS fwupd-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
-
-diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.h b/libdiscover/backends/FwupdBackend/FwupdBackend.h
-index c886384e..7b1ff180 100644
---- a/libdiscover/backends/FwupdBackend/FwupdBackend.h
-+++ b/libdiscover/backends/FwupdBackend/FwupdBackend.h
-@@ -25,9 +25,14 @@
- #include
- #include
-
-+#ifdef FWUPD_EXTERNC_REQUIRED
- extern "C" {
-+#endif
-+
- #include
-+#ifdef FWUPD_EXTERNC_REQUIRED
- }
-+#endif
- #include
-
- class QAction;
---
-GitLab
-
diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
deleted file mode 100644
index c8c8b152ea7c..000000000000
--- a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sun, 25 Apr 2021 00:26:12 +0200
-Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
-
-This was working as long as it was implicitly provided by KIO.
-Other backends are fine.
-
-Fixes:
-- DiscoverCommon w/ AppStreamQt
-- packagekit-backend
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner
----
- libdiscover/CMakeLists.txt | 2 +-
- libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index 1097ea84..3e2a6c9c 100644
---- a/libdiscover/CMakeLists.txt
-+++ b/libdiscover/CMakeLists.txt
-@@ -48,7 +48,7 @@ if(TARGET AppStreamQt)
- appstream/AppStreamIntegration.cpp
- appstream/AppStreamUtils.cpp
- )
-- target_link_libraries(DiscoverCommon PRIVATE AppStreamQt)
-+ target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt)
-
- if(AppStreamQt_VERSION VERSION_GREATER 0.12.4)
- target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1)
-diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-index cfeb38f1..466dbc49 100644
---- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-+++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
-
- add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
-
--target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
-+target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
- install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
-
- if(TARGET PkgConfig::Markdown)
---
-2.31.1
-
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index f285fb5e7ea7..8920182a2906 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,2 @@
DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
-DIST drkonqi-5.21.4.tar.xz 770164 BLAKE2B d903f724aa9748010dd321fe6375deb4b8a46af3caad1a8356563e724c2ade5d496e28cfc6125b05a8f6728ca896a73124613cf9bd095d502ce7467a50b9b04f SHA512 c699f38c2645139b7b19fce21f1d3bcc00e4953c12032d97e84f9911a7720fcf2b448ec8b09769dd4bdaaeb5197c79ee6729e8914f75bb574470339d2ae67eaf
+DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild
similarity index 84%
rename from kde-plasma/drkonqi/drkonqi-5.21.4.ebuild
rename to kde-plasma/drkonqi/drkonqi-5.21.5.ebuild
index eef51370febe..36714ea93ce8 100644
--- a/kde-plasma/drkonqi/drkonqi-5.21.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -15,7 +15,7 @@ SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="X"
-RDEPEND="
+COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -38,9 +38,12 @@ RDEPEND="
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
"
+RDEPEND="${COMMON_DEPEND}
+ sys-devel/gdb
+"
src_configure() {
local mycmakeargs=(
@@ -54,14 +57,5 @@ src_test() {
local myctestargs=(
-E "(connectiontest)"
)
-
ecm_src_test
}
-
-pkg_postinst() {
- ecm_pkg_postinst
- if ! has_version "sys-devel/gdb"; then
- elog "For more usability consider installing the following package:"
- elog " sys-devel/gdb - Easier debugging support"
- fi
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 82e5528aad57..bd8fd9cd5b62 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,2 @@
DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
-DIST kactivitymanagerd-5.21.4.tar.xz 99360 BLAKE2B 188f4d7c89c9b38acc1d6d52356122564d857f11b126651072013542bd8093d8b58ff9d80b2da060efed9dcc458b17b90548d3c8c9b47bb4521ca22c4b70e33c SHA512 80ca4cb42e7f4d9e02b9248623a263be655ff787e9e81bab1470a65c2a90761c1c9161ba6980a9a38b26cfc28796f0284b2b1816b8272c3ee759ea1f00dd51af
+DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.4.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
index 7d9be6d060a1..60354aa2c005 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 65d22197e774..d281667bc804 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
-DIST kde-cli-tools-5.21.4.tar.xz 610380 BLAKE2B 1b45d8ab0e6b354b5c83d21cbf491ac417b5ed98a2eb5e3350d4a82ef34a4de2b95aed4ef5d63e91e8f1dc074613696d1d2aff611007bc5da293fc52d9584720 SHA512 3803d592f37ef64431467022979bac411cef3a5180063e5bb22250320a69eb860254b9a0971a33552310dbae630ab7f940a3174c6b83b12293b085b06c3918d9
+DIST kde-cli-tools-5.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.21.4.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
index d7a9e6759567..7ad4920020ea 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 8e4e2e1f5ccb..fbede97b0c14 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
-DIST kde-gtk-config-5.21.4.tar.xz 68712 BLAKE2B 85bb9ab70a572fef86bb93e3fcdcb7f91507cb8a966be50d3e69083462bdbc089974695eda420d7b8c141b9d157d74404c55d037862681173d38426e91bca6c8 SHA512 bfd0e20f845bb5dc1d5ad9706528a658664c3159383b5ec0e08977a0b4e70ee0c3d210eda740f827ac71a5e84f60290f0563b27f92eaa7ce3b42205aa7c434c7
+DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.21.4.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
index beb08dab9bc0..c19ad83bd2c2 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 21ee412930a9..501df9049d74 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
-DIST kdecoration-5.21.4.tar.xz 45892 BLAKE2B 5a953ae583ad61cb1aa896e9792c806f61a4d670a992a84ea5340c6e7d93438f3306932fc68d0df6aa905e66a3683f9b74e174100e07a76e626a7b31def211f4 SHA512 93ad6f2db554f38a116dfc56f2d6c92b3d250b9b03ec0af7f2546a02c19c1247b851aa7455b620fa595ebb8c8420591dbd008bf8f5f10f5d59972e94e4135499
+DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb
diff --git a/kde-plasma/kdecoration/kdecoration-5.21.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
similarity index 97%
rename from kde-plasma/kdecoration/kdecoration-5.21.4.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
index 9af5da017be7..772726b619c5 100644
--- a/kde-plasma/kdecoration/kdecoration-5.21.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 5159763080a2..144944c7c4f7 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
-DIST kdeplasma-addons-5.21.4.tar.xz 626504 BLAKE2B 96d49927bbc90963fdf1f75fc7abfe09f1eee11dcd025bd3a10a714567d30f82f3b1ebe60dde5cb48bb00372deebb178f7c3824c59ca9aeb3a120590a470982e SHA512 ce01da18158c0ff10acef4d9e9fb0956604598d37fc720e52d5ac024575d0422738a2cb4645318ccdfe3da64e2254a4a2bc374f37c1f047a2e02fa588dc1b912
+DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.4.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
index 90916c9ada29..7d312067f3f2 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 0ed47bbba1d3..4c3e86293514 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
-DIST kgamma5-5.21.4.tar.xz 82676 BLAKE2B 93999ab873ab30550995184891f74234831eb35706e50dfd5edc76df429515eb889ada4c9e589e77d6ee4270ea4e9ee5550dbaae6d159ba0ef1345f2cf056c35 SHA512 c774f0782fd695c4411700fc4eed94594e4e25fe1032ed9e386f9a41282095e4123a1c8e8f0c8e2488fa8ade96405475332c515f5d1e11d7f0c5f585e205e6a3
+DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac
diff --git a/kde-plasma/kgamma/kgamma-5.21.4.ebuild b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kgamma/kgamma-5.21.4.ebuild
rename to kde-plasma/kgamma/kgamma-5.21.5.ebuild
index af7bf1c1798f..7b67115da52f 100644
--- a/kde-plasma/kgamma/kgamma-5.21.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
KDE_ORG_NAME="${PN}5"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index f00caaab641a..85e9a8f9f9f3 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
-DIST khotkeys-5.21.4.tar.xz 1860852 BLAKE2B 9605a26111882d5f62bfbc031ee7d2969db2c05e16046cdf84d65e05d129e8a80160696117f8129fdbed092e447cb52ae4095fc897e584a616f4776acc4b4729 SHA512 86192cffe3d09246509fcddf0d84eb68d4b5d947e0d7e3a244b0664cb8f341acc65ad6a8ee28e01beeda97d463480613b85cc9887894ed1ff93a7f89bdc09fea
+DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/khotkeys/khotkeys-5.21.4.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
index 489ce01502cf..c6e7519c239a 100644
--- a/kde-plasma/khotkeys/khotkeys-5.21.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index a719d9f7239d..4cbac135c234 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
-DIST kinfocenter-5.21.4.tar.xz 1301188 BLAKE2B 238d0d39e3c9843c118e8bdadfb07776fce54d0e4b02cb174f7b48fd3f964959a0e145eca827b0a29f42f6b07fad94745eff6f0bf932b6d60a237e0d6dd2137d SHA512 daf73cee8c6f73e38bf4b6b5b2e9701097dd594aa59b937795b5af5f5ba4b7aeef2d465c9752fcbc8a2662572105d2c71eaa78f1d79485395192deb934f017b9
+DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/kinfocenter/kinfocenter-5.21.4.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
index 5861a32f5109..2321b8e4c6db 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.21.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 9030b9cfaa54..c8cfd24e0b09 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
-DIST kmenuedit-5.21.4.tar.xz 899124 BLAKE2B faa75bd3a2721c69802a8f2f6a9ed5979b04fb2e97397aeb7fcfc27812d10a648b70907fc4bef8c1dbcbba1dbb4c1082a3201f9a79d85d25ef30c9406e4d50fb SHA512 d0bde0d44f0a3cfea90f20fdb19a6507bd5b6c60dde09af93e2f244f69606dbab60096483fa525964a170d55be8876861e2c7cfedd2fd8ebc8891bf95cd53743
+DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kmenuedit/kmenuedit-5.21.4.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
index 2bf8c1c49a8d..5a1b40c74930 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.21.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index d7f20ae01422..5212735d65b6 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
-DIST kscreen-5.21.4.tar.xz 114640 BLAKE2B bc234f7649e0440adf51cd673a4761a95d4b774a12891aa9e4c2ddab8c083f96727336be93806820ec109cfd53ddb89b419c7fc5e9a8392bfbacdcee999a487b SHA512 8b02c831322cc50cd046ff030a64f7e142114bd3bd45c3f193800163b198fdc052d0d0037071ab55bd5ba0f78bee3bd80bb444e1c88269cccf49c82414bbc4a6
+DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784
diff --git a/kde-plasma/kscreen/kscreen-5.21.4.ebuild b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kscreen/kscreen-5.21.4.ebuild
rename to kde-plasma/kscreen/kscreen-5.21.5.ebuild
index 6a5279a3d2f4..43e8527e51da 100644
--- a/kde-plasma/kscreen/kscreen-5.21.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index f46cf33fc5e2..4974beeba71f 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,2 @@
DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
-DIST kscreenlocker-5.21.4.tar.xz 117284 BLAKE2B 8e8c6ac5637c4c0a6953633c9ea257d07e892d3c3ee1b104354fe0caf47a1ed87a5f11b717e1913641340536408140fb1cbde039bd801e2fae6372aa11d3bf5a SHA512 6c47e074f7acd3b1de22c64eecf0659ec347ce9e37cc42487e7b6ae81470f06513492a5d9f6e09083830e486c274fec222e59e1a8a83fe97fa8ebdc156df0f37
+DIST kscreenlocker-5.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.21.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
similarity index 95%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.21.4.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
index b1c7212ccfc3..88cc23577b3a 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.21.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -56,9 +56,8 @@ RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+BDEPEND="dev-util/wayland-scanner"
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 9c54a1bc823c..b45b0b88d865 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
-DIST ksshaskpass-5.21.4.tar.xz 24060 BLAKE2B 01e9354fe20ee9ea4898ababba1f759d99a5a046cdd9467d54ae53494c523bc65e7e95adf7611cbbad7a9dea7aff248e148208831bd321800293c8684b77481b SHA512 4e03e30d210cc197d65c76754c602dbb723a7feaf14b196c329fee54d419fb34a06d9529b14fab3608e7ffbea19e26972eb8cd16fd2fb580ed7c239de39eac8d
+DIST ksshaskpass-5.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.21.4.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
index 264ce2581b93..696527628879 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.21.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index be2402bc05b4..286f713a0680 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,2 @@
DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
-DIST ksysguard-5.21.4.tar.xz 603960 BLAKE2B d803b30343fcf48a29b9598598c150bc402a97d7648bfd9f38be11f2da976c1e760ed31e9920a3e71a5784bf1c01da0b6cba8ca1e94e5a05ab27e4828b1ed9e2 SHA512 773d0483fe4fce2a9840fa6a71775131c30f2c706422177375fbda774b249710ee245e968f49cfce231756b0fdf5d97d6634b75c2f608dc6706affcfd355fddd
+DIST ksysguard-5.21.5.tar.xz 604624 BLAKE2B ac95499a75be6eb2a56d8e96a560271cbaa2618c0a21493d3226cff0aeeb05ebd2644a65567f9ddae2f07016a22e2c9dbfc3c42b14b504d13e788ff1312a18c0 SHA512 53e41ae1fb14d8e3393671e2d42ab7304b144f8938c821402c16c66aa09917e3dfc8ce766df43f1bb9c09e2934a6dcd48a4a4781d379026164b278aaed95858e
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/ksysguard/ksysguard-5.21.4.ebuild
rename to kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
index 1a0b5be86c4e..b6ba2ea44f62 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index fd7cd158b89e..e1759d6a051f 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
-DIST kwallet-pam-5.21.4.tar.xz 19904 BLAKE2B 0d85f8e23240bbd2feb68216ce85e51bd2e91195d77cd3f281dac6534f6cc7b13665ee2fdb078d2d89af063f467084b5a9881ecdc7adc2a0b3eb6fd1b917d790 SHA512 48e3d9d268ca60bca3058eea33e035641ef3fb43c0faa342c96281404f4a829efe49fd0ec75a0476039fd21e18bf66eda14dcc0c3575032d000632e2e9c26d37
+DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.21.4.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
index 8a587a1fcf29..852aef5a0d46 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
inherit ecm kde.org
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 4d21f47e5370..7af17d87aa21 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
-DIST kwayland-integration-5.21.4.tar.xz 23276 BLAKE2B 560f93826319e6d3913fee49c05d452902cca9e74f3e8e0d186b6bd1a408945760d2a76bc2ad130642311a75754705355d7acb51269a85cb3039b0984b979d04 SHA512 97cc33a61ab84148f7d24c8fe3e9be96608a751147e1ed5811d3377cae453bf2e8d407e06769ddbe97b7a5b8a80cf3114d51292999795561562c2f91cc9ccdaa
+DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/kwayland-integration/kwayland-integration-5.21.4.ebuild
rename to kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
index 42cfe4a36751..c999b25b427b 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.21.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index eaf2c292b368..7895f9a23fdb 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,2 +1,2 @@
DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
-DIST kwayland-server-5.21.4.tar.xz 219340 BLAKE2B 6d4a9bc4fca82021ad01860953508ce5ef435ac2c63df5485d0e2ea0d9ef7f3e38b1373db42ebe2fc71eddffa6d3cc568f5d1cd9100dd6d7606eed3dbf56dcfb SHA512 b9de39472546a58c27ca31c1642c4541959f2cc5e5330f7c562f404f1a9049f1445fdffbb617f6f532ea2aacbeeff96b07d1b75462dc46d5472b4033d250d678
+DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
similarity index 94%
rename from kde-plasma/kwayland-server/kwayland-server-5.21.4.ebuild
rename to kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
index 4850b06ad02e..1f6fa51fe042 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.21.4.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_QTHELP="true"
ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
inherit ecm kde.org
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND}
>=dev-libs/plasma-wayland-protocols-1.1.1
>=dev-libs/wayland-protocols-1.18
"
+BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 1f36b0ff7620..4cd5bf40d62c 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
-DIST kwin-5.21.4.tar.xz 6394596 BLAKE2B fde4276531b5d0deba9f0f40fba634eaa6521a5c4f72285aba45fcd7f06a06bf430a564c51d103cd154010957fe82156b75ea463571a1312bfb4d4573525b531 SHA512 b9e7912d90386ecca657546303aeb297e81ea93fab2e97f29f5a2d8c836b7898adca656dc669635aa09c06f032f4fc65572bdffd25fd201b61b10d6f704ddc9b
+DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
diff --git a/kde-plasma/kwin/kwin-5.21.4.ebuild b/kde-plasma/kwin/kwin-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/kwin/kwin-5.21.4.ebuild
rename to kde-plasma/kwin/kwin-5.21.5.ebuild
index 81001430eb45..ec85a4ca09f3 100644
--- a/kde-plasma/kwin/kwin-5.21.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_HANDBOOK="optional"
ECM_TEST="optional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 85f31e45f2bb..61d362a10f66 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
-DIST kwrited-5.21.4.tar.xz 20536 BLAKE2B 2e0bfc437099cbc86cd17f77399a6934d47d4c0055fe9e9aa95d74b9ad23ba29d0ee2239c2aead97919e95adaf96770d7bbfba816651cf07d5b1e47718f56949 SHA512 2fd3dcb53dbe241e6d123ee39764e4e8ba3ad38d9d04434a03a4368339b288c595f8d87e45dffc87d6238bb46ced95fe8b6d264ba99f69d572ebf1f47ff1aaa6
+DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe
diff --git a/kde-plasma/kwrited/kwrited-5.21.4.ebuild b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
similarity index 97%
rename from kde-plasma/kwrited/kwrited-5.21.4.ebuild
rename to kde-plasma/kwrited/kwrited-5.21.5.ebuild
index e2ebeb45a573..7e9879485783 100644
--- a/kde-plasma/kwrited/kwrited-5.21.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 5acc30b5b08f..d2bc63190cc2 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
-DIST libkscreen-5.21.4.tar.xz 84652 BLAKE2B 4dfc665cecbc3a07a7d2b45eed544605e84c7ef7b5b64dda23bba5bc4e2048b0009cab0372507db29f71a90827217fb53ee985906e6e9c9ff2ae9e9bd8147a3b SHA512 debc5b16242989ec289bfe6da3faec28f80d7274e902da76edc389bd34a1ba731ee8eaaaa7d4869793b5843aaa53b21e26009d8e55672964c66f3bef45b13bc8
+DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75
diff --git a/kde-plasma/libkscreen/libkscreen-5.21.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/libkscreen/libkscreen-5.21.4.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
index 41c0ba6395cb..9392a06c43e0 100644
--- a/kde-plasma/libkscreen/libkscreen-5.21.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_QTHELP="true"
ECM_TEST="forceoptional"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 6a313ab3b563..b89b51890e31 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
-DIST libksysguard-5.21.4.tar.xz 706288 BLAKE2B fcfba0da27ad4a2db25784aa3ae188aeae721e5fea22bdb3b7d9df7e6216812880e3eebfbee809544a20c26524b3b36a334b6417a0158ee83378a4b86630a842 SHA512 acb1a2310fb451ff3b650308ca96f75acecd45247e22a530e26fbffa3cb73ba41adc8b106dc2e875dc59a0f0b51d5a7826372f7ab86df511b4f87832b69aab10
+DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/libksysguard/libksysguard-5.21.4.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
index 8fe421d7b8db..cc9223d34656 100644
--- a/kde-plasma/libksysguard/libksysguard-5.21.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_DESIGNERPLUGIN="true"
ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 7ac176f13d26..c8d821785a7b 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,2 @@
DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
-DIST plasma-workspace-5.21.4.tar.xz 9714792 BLAKE2B 8ada47faf866c9ef2fd16a7925e393dbfcb15fa54e693b290ee61443846b1e11e110969408821b98edba570ced1168d786ec54e4e33d99221077dd24744aefb1 SHA512 80f4b55ce982c3e2d0761cba1d4f14659b2ef9ce9f6d362c4439c5ee404ea7bc9e458cfbfd7e37f9ff67b53cc02f1aa3c62c7b7ad9fcf57646ad59e9f60b94c5
+DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/libkworkspace/libkworkspace-5.21.4.ebuild
rename to kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild
index b11c824373f4..d5de9a8d1e73 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_TEST="true"
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 875f45b28d1d..393f06ee577e 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
-DIST milou-5.21.4.tar.xz 43840 BLAKE2B 2ea9e023701b7fa90c8982efb73ba635fba0de3cf9bf7b9ede2089b7e50c90e7178f1d4ac2169170ab23173bebc743e093ea8859c10b5185a81fe3b5638a3c48 SHA512 be56e55d2fd8ddd2c30a304cabd7e9842ae03019012453380f8aea81981840aa5026babe9f26740d7711a8372201c4ed0fe7545356b0c99ae10bbe429a54c523
+DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f
diff --git a/kde-plasma/milou/milou-5.21.4.ebuild b/kde-plasma/milou/milou-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/milou/milou-5.21.4.ebuild
rename to kde-plasma/milou/milou-5.21.5.ebuild
index 34bfd6694bc8..bf862da17f31 100644
--- a/kde-plasma/milou/milou-5.21.4.ebuild
+++ b/kde-plasma/milou/milou-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 614b60dfd166..8313946cebc9 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
-DIST oxygen-5.21.4.tar.xz 4475612 BLAKE2B b56dd9c0e59e397e45234448da1a67acb79380ddb0531f9f963bef54db77eb4141e3d83954cd02e8e025c1ccd3332e6e66e4941bfbbe07aa3548587ca85bcbf9 SHA512 d8050948ba28d5037afe31be34fa1c02b67420956f18a0e7901c0ac2d8c99b0255f88bb4291fca3648e3bdd1b3143e4b3da2590c8be1937ed8c18c3103a5c132
+DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
diff --git a/kde-plasma/oxygen/oxygen-5.21.4.ebuild b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
similarity index 99%
rename from kde-plasma/oxygen/oxygen-5.21.4.ebuild
rename to kde-plasma/oxygen/oxygen-5.21.5.ebuild
index 704b47383914..8ba5dd7c0f31 100644
--- a/kde-plasma/oxygen/oxygen-5.21.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 8db40deff1e4..adf072ee1603 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,2 @@
DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
-DIST plasma-browser-integration-5.21.4.tar.xz 203948 BLAKE2B 49473b61f7ec40266a6df12c6c128e799fe4fdb45ec5b264f1aa3f3051e50de6aeb1be8e80dee694cec5b9efdf8ab5f5285355400eee365bf1f6712ac25a95d4 SHA512 7297b1cad02fe899b19ed1546ae7daef9416807e9395a494c597822b98b3fa90ad03932cdb169988d1005ec6f2d8c5cf74a93fb2c1887d156a1349cc46f5ce17
+DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.4.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
index 770d65f8835a..febe0f1383cc 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 400a778bcae2..da175ef728f1 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
-DIST plasma-desktop-5.21.4.tar.xz 15914768 BLAKE2B e816775c1c6aba4d94db1c56f4298a43c488d720d0b84b7e1da63020a7f40e4cd9a034ce570f7b2f691194200bcccabed5b1ed029721787c238f2664968cb891 SHA512 91cce61b1c685266eb53a34f6533a95d092901280e48ed6ed8364a9b9f6d32594a1d5209fc52295e1c2ecdec40f39959dd332fa61cd914c0199d1e81b9596dd3
+DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
new file mode 100644
index 000000000000..3066d3a2747b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
@@ -0,0 +1,239 @@
+From 6fb37dc0260c298bc35ec5e39399aa1f31693e79 Mon Sep 17 00:00:00 2001
+From: Carson Black
+Date: Thu, 6 Aug 2020 11:58:23 +0200
+Subject: [PATCH] Implement adaptive opacity for panels
+
+---
+ .../contents/applet/CompactApplet.qml | 1 +
+ .../panelconfiguration/MoreSettingsMenu.qml | 35 +++++
+ desktoppackage/contents/views/Panel.qml | 144 +++++++++++++++++-
+ 3 files changed, 174 insertions(+), 6 deletions(-)
+
+diff --git a/desktoppackage/contents/applet/CompactApplet.qml b/desktoppackage/contents/applet/CompactApplet.qml
+index 0d4c85f52..65eb0468e 100644
+--- a/desktoppackage/contents/applet/CompactApplet.qml
++++ b/desktoppackage/contents/applet/CompactApplet.qml
+@@ -153,6 +153,7 @@ PlasmaCore.ToolTipArea {
+ visualParent: compactRepresentation ? compactRepresentation : null
+ location: plasmoid.location
+ hideOnWindowDeactivate: plasmoid.hideOnWindowDeactivate
++ backgroundHints: (plasmoid.containmentDisplayHints & PlasmaCore.Types.DesktopFullyCovered) ? PlasmaCore.Dialog.SolidBackground : PlasmaCore.Dialog.StandardBackground
+
+ property var oldStatus: PlasmaCore.Types.UnknownStatus
+
+diff --git a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+index 2e577fbcc..d668eb3c2 100644
+--- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
++++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+@@ -131,6 +131,41 @@ PlasmaCore.Dialog {
+ flat: false
+ }
+ }
++ PlasmaExtras.Heading {
++ level: 3
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opacity")
++ visible: panel.adaptiveOpacityEnabled
++ }
++ PlasmaComponents.ButtonColumn {
++ spacing: 0
++ visible: panel.adaptiveOpacityEnabled
++ Layout.fillWidth: true
++ Layout.minimumWidth: implicitWidth
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Adaptive")
++ checkable: true
++ checked: configDialog.opacityMode === 0
++ onClicked: configDialog.opacityMode = 0
++ flat: false
++ }
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opaque")
++ checkable: true
++ checked: configDialog.opacityMode === 1
++ onClicked: configDialog.opacityMode = 1
++ flat: false
++ }
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Translucent")
++ checkable: true
++ checked: configDialog.opacityMode === 2
++ onClicked: configDialog.opacityMode = 2
++ flat: false
++ }
++ }
+ PlasmaComponents.ToolButton {
+ Layout.fillWidth: true
+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Maximize Panel")
+diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml
+index 2fd6ac4d5..cf6c04328 100644
+--- a/desktoppackage/contents/views/Panel.qml
++++ b/desktoppackage/contents/views/Panel.qml
+@@ -21,17 +21,27 @@ import QtQuick.Layouts 1.1
+ import QtQml 2.15
+
+ import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.taskmanager 0.1 as TaskManager
+
+-PlasmaCore.FrameSvgItem {
++Item {
+ id: root
+
+- imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
+-
+- enabledBorders: panel.enabledBorders
+-
+ property Item containment
+
+- property alias panelMask: root.mask
++ property alias panelMask: privateSwapper.mask
++
++ QtObject {
++ id: privateSwapper
++ property string completedState: ""
++ // Work around the fact that we can't use a ternary if in an alias
++ readonly property var mask: {
++ if (completedState == "opaque") {
++ return opaqueItem.mask
++ } else {
++ return translucentItem.mask
++ }
++ }
++ }
+
+ readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical
+
+@@ -47,6 +57,128 @@ PlasmaCore.FrameSvgItem {
+ readonly property int leftPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.left, spacingAtMinSize));
+ readonly property int rightPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.right, spacingAtMinSize));
+
++ TaskManager.VirtualDesktopInfo {
++ id: virtualDesktopInfo
++ }
++
++ TaskManager.ActivityInfo {
++ id: activityInfo
++ }
++
++ PlasmaCore.SortFilterModel {
++ id: visibleWindowsModel
++ filterRole: 'IsMinimized'
++ filterRegExp: 'false'
++ sourceModel: TaskManager.TasksModel {
++ filterByVirtualDesktop: true
++ filterByActivity: true
++ filterNotMaximized: true
++ filterByScreen: true
++
++ screenGeometry: panel.screenGeometry
++ virtualDesktop: virtualDesktopInfo.currentDesktop
++ activity: activityInfo.currentActivity
++
++ id: tasksModel
++ groupMode: TaskManager.TasksModel.GroupDisabled
++ }
++ }
++
++ PlasmaCore.FrameSvgItem {
++ id: translucentItem
++ enabledBorders: panel.enabledBorders
++ anchors.fill: parent
++
++ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
++ }
++
++ PlasmaCore.FrameSvgItem {
++ id: opaqueItem
++ enabledBorders: panel.enabledBorders
++ anchors.fill: parent
++
++ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "solid/widgets/panel-background"
++ }
++
++ transitions: [
++ Transition {
++ from: "*"
++ to: "transparent"
++ SequentialAnimation {
++ ScriptAction {
++ script: {
++ translucentItem.visible = true
++ }
++ }
++ NumberAnimation {
++ target: opaqueItem
++ properties: "opacity"
++ from: 1
++ to: 0
++ duration: units.veryLongDuration
++ easing.type: Easing.InOutQuad
++ }
++ ScriptAction {
++ script: {
++ opaqueItem.visible = false
++ privateSwapper.completedState = "transparent"
++ root.panelMaskChanged()
++ }
++ }
++ }
++ },
++ Transition {
++ from: "*"
++ to: "opaque"
++ SequentialAnimation {
++ ScriptAction {
++ script: {
++ opaqueItem.visible = true
++ }
++ }
++ NumberAnimation {
++ target: opaqueItem
++ properties: "opacity"
++ from: 0
++ to: 1
++ duration: units.veryLongDuration
++ easing.type: Easing.InOutQuad
++ }
++ ScriptAction {
++ script: {
++ translucentItem.visible = false
++ privateSwapper.completedState = "opaque"
++ root.panelMaskChanged()
++ }
++ }
++ }
++ }
++ ]
++
++ Component.onCompleted: {
++ state = Qt.binding(function() {
++ let mstate = '';
++ if (panel.opacityMode == 0) {
++ mstate = visibleWindowsModel.count > 0 ? "opaque" : "transparent"
++ } else if (panel.opacityMode == 1) {
++ mstate = "opaque"
++ } else {
++ mstate = "transparent"
++ }
++ if (mstate == 'opaque') {
++ containment.containmentDisplayHints |= PlasmaCore.Types.DesktopFullyCovered;
++ } else {
++ containment.containmentDisplayHints &= ~PlasmaCore.Types.DesktopFullyCovered;
++ }
++ return mstate;
++ })
++ }
++ state: ""
++ states: [
++ State { name: "opaque" },
++ State { name: "transparent" }
++ ]
++
+ function adjustPrefix() {
+ if (!containment) {
+ return "";
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
similarity index 93%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.21.4.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 9c62103b0a89..68705edda325 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -5,11 +5,11 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
XORGHDRS="${PN}-override-include-dirs-0"
@@ -20,7 +20,6 @@ SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
-BDEPEND="virtual/pkgconfig"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
@@ -104,7 +103,6 @@ DEPEND="${COMMON_DEPEND}
x11-base/xorg-proto
"
RDEPEND="${COMMON_DEPEND}
- !=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -117,9 +115,11 @@ RDEPEND="${COMMON_DEPEND}
kaccounts? ( net-libs/signon-oauth2 )
policykit? ( sys-apps/accountsservice )
"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
)
src_prepare() {
@@ -134,6 +134,9 @@ src_prepare() {
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
fi
+
+ use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+ cmake_comment_add_subdirectory emojier
}
src_configure() {
@@ -166,3 +169,10 @@ src_test() {
ecm_src_test
}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "screen reader support" app-accessibility/orca
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index e0c378a2967d..3bb4b23c9dda 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,2 @@
DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd
-DIST plasma-disks-5.21.4.tar.xz 71000 BLAKE2B cdfa127fcbfaf5f5891970539f95b6c0c5f37dbaa71a7731ccecd920e8d415cccb966e77373fb665821a371d03a239ef95dd00817015fd3f84f25b9199e0d660 SHA512 2eb16f0098b12d5b1522c91083e55c90a1c759e819722334722032ea00007cb74f065fa7c83e83d92ba72d373a4203c51ec3be8bbcd90ae0eb591d45d0211692
+DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.21.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/plasma-disks/plasma-disks-5.21.4.ebuild
rename to kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
index c37f759db76c..a48f543b9225 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.21.4.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_HANDBOOK="true"
-KFMIN=5.78.0
+KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index ac5750ef0bcf..2585db8dfd6c 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1 +1 @@
-DIST plasma-firewall-5.21.4.tar.xz 330788 BLAKE2B fbdd1e871783d228dcf7010dcdb6622ffc4d56295ffd95547e79cdbb8aa49849fa51999852105f52870da9cee55cd670da4acc5785a4bd2198a7008c3a865a88 SHA512 421fb28586083c4dc694170720dad1a2176d844bf5e290b04e3bd14140186a02c3a2613bbeed110c849d53fde751f60efeb93badcd77b9795235117d95cd0fc6
+DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
similarity index 84%
rename from kde-plasma/plasma-firewall/plasma-firewall-5.21.4.ebuild
rename to kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
index 630397f206f2..a417fdd8672a 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.4.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.78.0
+KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org python-single-r1
@@ -35,7 +35,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
${PYTHON_DEPS}
- sys-apps/systemd
|| (
net-firewall/firewalld
net-firewall/ufw
@@ -48,3 +47,12 @@ src_prepare() {
sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ if ! has_version sys-apps/systemd; then
+ ewarn "${PN} is not functional without sys-apps/systemd at this point."
+ ewarn "See also: https://bugs.gentoo.org/778527"
+ fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 56e25a720f23..fe422cb33695 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,2 @@
DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
-DIST plasma-integration-5.21.4.tar.xz 60944 BLAKE2B c8ba267425e6617f8ac2fc46b716cd196eaf44671c37d79fd41a17e84c704767df245cc31bb9241ce9750e877fccf5d2cffea007afe58af22ce04d373c77bbc4 SHA512 49f34235863e331cef273037472c9b95fe865b1f353c1c070c03e9e0cdfd8ad9c3b555eb5b12d62b31c12de58d645d221cc3f6930bcd0a886991a689bb6b87cf
+DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
similarity index 98%
rename from kde-plasma/plasma-integration/plasma-integration-5.21.4.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
index 30c2bb013da9..02ab146b45d2 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.21.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KFMIN=5.78.0
+KFMIN=5.82.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 0f90ac488608..2681c26c0ebe 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -8,6 +8,7 @@
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index defab2c312ab..1fde03024a17 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index e400a7655821..cfd7a1449e40 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,5 +1,4 @@
DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec
DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e
-DIST puma-5.2.0.tar.gz 292173 BLAKE2B e09e524ef651a674373e0c5281832fef2e016f58e9623968e11c47135f7bcddb72c6458e74e85f4264c40f49222161d9749c3c29295d5470e47e7b0382e96bab SHA512 3e97f17be3926ff23b03def55dd1c9f015750a5aec74f0fa1551d20c9f386e0ec1a9e676dc0df49ae12129be6768a7d2f7df7a944dd2ec3d44f8243098dc7950
-DIST puma-5.2.1.tar.gz 292945 BLAKE2B 1590dd256953578330ffcb4b2e8745c20ea893f62f251813da5b2473694312a9daeccd7cd5f453dbad441619594210fbdac431a6459deea24e1656c4da0ba01c SHA512 8ec1a351badd68ce6559eb99592e3f4d836ca49406749a6c2cd9162c443eadf3b4cf24ceb6c92e0e27057217f6487ff9923888ff4a1590f8cf9061d06ec16e52
DIST puma-5.2.2.tar.gz 293551 BLAKE2B ba7ba9d8a2dcf9ea9716624f712d6b569472e8bfd8d7501a5807007ccdc6b6b36a8fc6f65f47f5898907adb3d3b85e2630194d5527c96ed655ce6a52192ec36a SHA512 b2d4f711cd1ad4f4557991ba26d7b940573b413e6a4c589d8447e78135d8d47e7222de4c865919981b677891cb2b57e3a3cf015d1f9a637b671f4f221c7ea77f
+DIST puma-5.3.0.tar.gz 297273 BLAKE2B c8377b32a0bcdc175f043327d09e107cc2bbc4fd8f38eaf7015da7b0f715cff304c0ee5b9913e19bbf63aa9e4319ee8bce19d01e3439b2a492fff69fea5f7b15 SHA512 00d41e2549911233d3c9744610bd557803ad049f85c180d0ddd88e6f01352d4f79e728b12cd335cb38f9c56e969644bccafa82b8cce0b8f91b677333e53d9584
diff --git a/www-servers/puma/puma-5.2.0.ebuild b/www-servers/puma/puma-5.2.0.ebuild
deleted file mode 100644
index 0d7b9f48b0c6..000000000000
--- a/www-servers/puma/puma-5.2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
- sed -e '/bundler/ s:^:#:' \
- -e '/prove/ s:^:#:' \
- -e '/stub_const/ s:^:#:' \
- -i test/helper.rb || die
-
- # Avoid tests failing inconsistently
- sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
- # Avoid launcher tests since they make assumptions about bundler use
- rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
- # Skip integration tests since they make a lot of assumptions about
- # the environment
- rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
- # Avoid test that uses unpackaged stub_const
- sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die
-
- sed -e 's/git ls-files --/find/' \
- -e 's:_relative ": "./:' \
- -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/puma_http11
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
- einfo "Running test suite"
- ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.2.1.ebuild b/www-servers/puma/puma-5.2.1.ebuild
deleted file mode 100644
index 0d7b9f48b0c6..000000000000
--- a/www-servers/puma/puma-5.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
- sed -e '/bundler/ s:^:#:' \
- -e '/prove/ s:^:#:' \
- -e '/stub_const/ s:^:#:' \
- -i test/helper.rb || die
-
- # Avoid tests failing inconsistently
- sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
- # Avoid launcher tests since they make assumptions about bundler use
- rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
- # Skip integration tests since they make a lot of assumptions about
- # the environment
- rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
- # Avoid test that uses unpackaged stub_const
- sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die
-
- sed -e 's/git ls-files --/find/' \
- -e 's:_relative ": "./:' \
- -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/puma_http11
- cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
- einfo "Running test suite"
- ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.2.1-r1.ebuild b/www-servers/puma/puma-5.3.0.ebuild
similarity index 100%
rename from www-servers/puma/puma-5.2.1-r1.ebuild
rename to www-servers/puma/puma-5.3.0.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2ac20a562454..5d2aa835c6ed 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
index c2d1776c2d61..84acd9408b56 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="+gtk nls"
RDEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b8199fe42926..20800e009668 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 17e39822aad5..1045f1037db7 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1 +1,2 @@
DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
+DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768
diff --git a/x11-misc/idesk/idesk-1.ebuild b/x11-misc/idesk/idesk-1.ebuild
new file mode 100644
index 000000000000..f9ed02875606
--- /dev/null
+++ b/x11-misc/idesk/idesk-1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="https://github.com/antonialoytorrens/idesk/"
+SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+ dev-libs/glib
+ dev-libs/libxml2
+ media-libs/freetype
+ media-libs/imlib2[X]
+ media-libs/libart_lgpl
+ x11-libs/gtk+:3
+ x11-libs/pango
+ x11-libs/startup-notification
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
+}
+
+src_configure() {
+ econf --enable-libsn
+}
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index 857674af5437..289c83aa4cff 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/metadata.xml
@@ -3,6 +3,6 @@
- idesk
+ antonialoytorrens/idesk
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index abd2962bb376..fd3656658546 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="vbe-mode"
DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 86ec68d7529b..66692b517767 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index e3035595166c..57fe83b7c861 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -10,4 +10,7 @@
Enable sixel graphics support
Enable the xterm toolbar to be built
+
+ https://invisible-island.net/xterm/xterm.log.html
+