Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2024-02-12 10:48:49 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2024-02-12 10:48:49 +0000
commit84cc7f6358c03657824e0470c6b9dd07ea768df4 (patch)
treee89b6c6f7ba90a545d6c2d1b07b1e11e1d03e47e
parent2024-02-12 10:33:35 UTC (diff)
parentsys-kernel/dkms: add compatibility symlinks for installkernel[-systemd] (diff)
downloadgentoo-84cc7f6358c03657824e0470c6b9dd07ea768df4.tar.gz
gentoo-84cc7f6358c03657824e0470c6b9dd07ea768df4.tar.bz2
gentoo-84cc7f6358c03657824e0470c6b9dd07ea768df4.zip
Merge updates from master
Diffstat
-rw-r--r--app-crypt/gpgme/gpgme-1.23.2.ebuild2
-rw-r--r--app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild2
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild2
-rw-r--r--app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild2
-rw-r--r--app-office/libreoffice/libreoffice-7.6.4.1.ebuild2
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10-r2.ebuild2
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.7.ebuild2
-rw-r--r--app-text/poppler/poppler-24.02.0.ebuild2
-rw-r--r--dev-libs/boost/boost-1.84.0-r3.ebuild2
-rw-r--r--dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild2
-rw-r--r--dev-libs/icu/icu-74.2.ebuild2
-rw-r--r--dev-libs/libixion/libixion-0.19.0.ebuild2
-rw-r--r--dev-libs/liborcus/liborcus-0.19.2.ebuild2
-rw-r--r--dev-util/mdds/mdds-2.1.1.ebuild2
-rw-r--r--media-gfx/darktable/darktable-4.6.0.ebuild4
-rw-r--r--sys-kernel/dkms/dkms-3.0.12-r1.ebuild (renamed from sys-kernel/dkms/dkms-3.0.12.ebuild)3
16 files changed, 19 insertions, 16 deletions
diff --git a/app-crypt/gpgme/gpgme-1.23.2.ebuild b/app-crypt/gpgme/gpgme-1.23.2.ebuild
index 7f108d7c3e79..e8d872e8dd55 100644
--- a/app-crypt/gpgme/gpgme-1.23.2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.23.2.ebuild
@@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2.1"
# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
SLOT="1/11.6.15.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild
index 68867f7e3420..91d90d27cfe4 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
IUSE="gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
# the = is correct, the debug info needs to fit the exact binary
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild
index aba91ab8bf5f..0649819afffb 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
IUSE="gnome java kde cpu_flags_x86_sse2"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
BIN_COMMON_DEPEND="
app-text/hunspell:0/1.7
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild
index c5265f91e982..71859948fb1f 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE="offlinehelp"
#
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index aa14ea35f69e..184c62e5df60 100644
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild
index b3efde34cbfa..00e64b9cf29c 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
diff --git a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
index 3a25fcdc8534..e9ef4f7498cc 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
src_configure() {
econf \
diff --git a/app-text/poppler/poppler-24.02.0.ebuild b/app-text/poppler/poppler-24.02.0.ebuild
index 820eeeed8598..059dbef8b36d 100644
--- a/app-text/poppler/poppler-24.02.0.ebuild
+++ b/app-text/poppler/poppler-24.02.0.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
SLOT="0/134" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/dev-libs/boost/boost-1.84.0-r3.ebuild b/dev-libs/boost/boost-1.84.0-r3.ebuild
index a9b31a9a58c3..483f20567989 100644
--- a/dev-libs/boost/boost-1.84.0-r3.ebuild
+++ b/dev-libs/boost/boost-1.84.0-r3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
LICENSE="Boost-1.0"
SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
index 1077c45a1d3d..5ee6ca896b2d 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source
LICENSE="BSD"
SLOT="0/${PV%.*}.1"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="debug static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/icu/icu-74.2.ebuild b/dev-libs/icu/icu-74.2.ebuild
index cf2868d8fc7e..5c6d4ebdac54 100644
--- a/dev-libs/icu/icu-74.2.ebuild
+++ b/dev-libs/icu/icu-74.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
S="${WORKDIR}"/${PN}/source
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
LICENSE="BSD"
SLOT="0/${PV%.*}.1"
diff --git a/dev-libs/libixion/libixion-0.19.0.ebuild b/dev-libs/libixion/libixion-0.19.0.ebuild
index 132df8788b1d..49298c9b60c4 100644
--- a/dev-libs/libixion/libixion-0.19.0.ebuild
+++ b/dev-libs/libixion/libixion-0.19.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
else
MDDS_SLOT="1/2.1"
SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/liborcus/liborcus-0.19.2.ebuild b/dev-libs/liborcus/liborcus-0.19.2.ebuild
index cc256f36d078..d9063833d425 100644
--- a/dev-libs/liborcus/liborcus-0.19.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.19.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
else
MDDS_SLOT="1/2.1"
SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/dev-util/mdds/mdds-2.1.1.ebuild b/dev-util/mdds/mdds-2.1.1.ebuild
index 8046260ebd00..96264ca9dfda 100644
--- a/dev-util/mdds/mdds-2.1.1.ebuild
+++ b/dev-util/mdds/mdds-2.1.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
inherit autotools toolchain-funcs
diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild
index 4da939721ef7..437afc9b907f 100644
--- a/media-gfx/darktable/darktable-4.6.0.ebuild
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -32,7 +32,7 @@ else
)
)"
- KEYWORDS="~amd64 ~arm64 -x86"
+ KEYWORDS="amd64 ~arm64 -x86"
LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
fi
diff --git a/sys-kernel/dkms/dkms-3.0.12.ebuild b/sys-kernel/dkms/dkms-3.0.12-r1.ebuild
index 832fba5761ab..7cfc1c96a1f1 100644
--- a/sys-kernel/dkms/dkms-3.0.12.ebuild
+++ b/sys-kernel/dkms/dkms-3.0.12-r1.ebuild
@@ -46,6 +46,9 @@ src_install() {
else
emake install DESTDIR="${ED}" KCONF="/usr/lib/kernel"
fi
+ # Backwards compatibility with sys-kernel/installkernel[-systemd]
+ dosym ../../../usr/lib/kernel/postinst.d/dkms /etc/kernel/postinst.d/dkms
+ dosym ../../../usr/lib/kernel/prerm.d/dkms /etc/kernel/prerm.d/dkms
einstalldocs
keepdir /var/lib/dkms
}