summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-09-19 21:51:50 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-09-19 21:51:50 +0000
commit83c25fdf3bc40fba7d076fd7ee1e30b1e02450e3 (patch)
tree3946fcb5b6dd9b5d3c7a219cccce52580e7fba67
parent2021-09-19 20:51:27 UTC (diff)
parentsci-libs/gts: Keyword 20121130 for ~m68k (diff)
downloadgentoo-83c25fdf3bc40fba7d076fd7ee1e30b1e02450e3.tar.gz
gentoo-83c25fdf3bc40fba7d076fd7ee1e30b1e02450e3.tar.bz2
gentoo-83c25fdf3bc40fba7d076fd7ee1e30b1e02450e3.zip
Merge updates from master
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild2
-rw-r--r--dev-python/aioresponses/aioresponses-0.7.2.ebuild2
-rw-r--r--dev-python/dask/dask-2021.8.1.ebuild2
-rw-r--r--dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild2
-rw-r--r--dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild2
-rw-r--r--dev-python/requests-file/requests-file-1.5.1-r1.ebuild2
-rw-r--r--dev-python/zeep/zeep-4.1.0.ebuild2
-rw-r--r--dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild2
-rw-r--r--dev-ruby/crack/crack-0.4.4.ebuild2
-rw-r--r--dev-ruby/hocon/hocon-1.3.1.ebuild4
-rw-r--r--dev-ruby/mocha/mocha-1.13.0.ebuild2
-rw-r--r--dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild2
-rw-r--r--dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild2
-rw-r--r--dev-ruby/rouge/rouge-3.26.0.ebuild2
-rw-r--r--dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild2
-rw-r--r--dev-ruby/sync/sync-0.5.0.ebuild2
-rw-r--r--dev-ruby/tins/tins-1.29.1.ebuild2
-rw-r--r--eclass/systemd.eclass21
-rw-r--r--eclass/udev.eclass2
-rw-r--r--media-libs/netpbm/netpbm-10.86.22.ebuild2
-rw-r--r--media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild2
-rw-r--r--media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild2
-rw-r--r--media-libs/smpeg/smpeg-0.4.4-r11.ebuild2
-rw-r--r--media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild2
-rw-r--r--media-sound/xmms2/xmms2-0.8_p20201016.ebuild2
-rw-r--r--net-im/pidgin/pidgin-2.14.6-r1.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild2
-rw-r--r--profiles/arch/m68k/package.use.mask8
-rw-r--r--sci-geosciences/qgis/qgis-3.20.2.ebuild2
-rw-r--r--sci-libs/gts/gts-20121130.ebuild2
-rw-r--r--sys-apps/dbus/dbus-1.12.20-r3.ebuild1
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild10
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild12
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild12
-rw-r--r--sys-fs/lvm2/lvm2-2.02.188-r2.ebuild8
-rw-r--r--sys-fs/lvm2/lvm2-2.03.13-r2.ebuild8
36 files changed, 104 insertions, 34 deletions
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
index 020f9e8c745b..1e3113cc888f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-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"
+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 o-flag-munging static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-python/aioresponses/aioresponses-0.7.2.ebuild b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
index cdfed14150c4..97031db4a060 100644
--- a/dev-python/aioresponses/aioresponses-0.7.2.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/dask/dask-2021.8.1.ebuild b/dev-python/dask/dask-2021.8.1.ebuild
index a7f474643d23..3389d3987162 100644
--- a/dev-python/dask/dask-2021.8.1.ebuild
+++ b/dev-python/dask/dask-2021.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
index 4b833ecdca41..b655394efae8 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.13.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
=dev-python/httpx-0.19*[${PYTHON_USEDEP}]
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 57fefe304ed3..7ae6f52563c3 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
DEPEND="
dev-libs/xmlsec:=
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
index b7fbcc9559ca..64b3b87dd7f0 100644
--- a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+++ b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/zeep/zeep-4.1.0.ebuild b/dev-python/zeep/zeep-4.1.0.ebuild
index 237bb99c3aad..7735af371f3e 100644
--- a/dev-python/zeep/zeep-4.1.0.ebuild
+++ b/dev-python/zeep/zeep-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="async"
RDEPEND="
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
index 020dc3d821f9..5dd63f0be4ff 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( virtual/ruby-ssl )"
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
index f7aefc450c06..cf34e5d092d1 100644
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/hocon/hocon-1.3.1.ebuild b/dev-ruby/hocon/hocon-1.3.1.ebuild
index ce808c13ff26..b7768a518f89 100644
--- a/dev-ruby/hocon/hocon-1.3.1.ebuild
+++ b/dev-ruby/hocon/hocon-1.3.1.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
@@ -21,4 +21,4 @@ RUBY_S="ruby-hocon-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
diff --git a/dev-ruby/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
index dfce767b69a2..53976fc84766 100644
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
index 62081ec9a120..13fed6f70af6 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-persistent"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index b1dd403f05fe..9df8159a9e29 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rouge/rouge-3.26.0.ebuild b/dev-ruby/rouge/rouge-3.26.0.ebuild
index d0a913c2bc17..e5257d519b94 100644
--- a/dev-ruby/rouge/rouge-3.26.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.26.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
index b225eebf1cb9..51771bbc0572 100644
--- a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index ddc891dd0aca..f60875fe384a 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/sync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/tins/tins-1.29.1.ebuild b/dev-ruby/tins/tins-1.29.1.ebuild
index 3f51213ee411..99d0050eb863 100644
--- a/dev-ruby/tins/tins-1.29.1.ebuild
+++ b/dev-ruby/tins/tins-1.29.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/tins"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
# Earlier versions of ruby bundled this dependency
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 27e4dcae1ff7..7731bede094e 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -48,6 +48,9 @@ _systemd_get_dir() {
[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <variable-name> <fallback-directory>"
local variable=${1} fallback=${2} d
+ # https://github.com/pkgconf/pkgconf/issues/205
+ local -x PKG_CONFIG_FDO_SYSROOT_RULES=1
+
if $(tc-getPKG_CONFIG) --exists systemd; then
d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die
d=${d#${EPREFIX}}
@@ -142,6 +145,24 @@ systemd_get_systemgeneratordir() {
echo "${EPREFIX}$(_systemd_get_systemgeneratordir)"
}
+# @FUNCTION: _systemd_get_systempresetdir
+# @INTERNAL
+# @DESCRIPTION:
+# Get unprefixed systempresetdir.
+_systemd_get_systempresetdir() {
+ _systemd_get_dir systemdsystempresetdir /lib/systemd/system-preset
+}
+
+# @FUNCTION: systemd_get_systempresetdir
+# @DESCRIPTION:
+# Output the path for the systemd system preset directory (not including
+# ${D}). This function always succeeds, even if systemd is not installed.
+systemd_get_systempresetdir() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ echo "${EPREFIX}$(_systemd_get_systempresetdir)"
+}
+
# @FUNCTION: systemd_dounit
# @USAGE: <unit>...
# @DESCRIPTION:
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index 7f9415914cd2..073e5d8acbc9 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -49,6 +49,8 @@ fi
# @DESCRIPTION:
# Get unprefixed udevdir.
_udev_get_udevdir() {
+ # https://github.com/pkgconf/pkgconf/issues/205
+ local -x PKG_CONFIG_FDO_SYSROOT_RULES=1
if $($(tc-getPKG_CONFIG) --exists udev); then
local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
echo "${udevdir#${EPREFIX%/}}"
diff --git a/media-libs/netpbm/netpbm-10.86.22.ebuild b/media-libs/netpbm/netpbm-10.86.22.ebuild
index 4fd56a25b07c..402cbd40216d 100644
--- a/media-libs/netpbm/netpbm-10.86.22.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
BDEPEND="
diff --git a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
index 6f4fe15c6eb7..7930d179e542 100644
--- a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
+++ b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE="doc"
RDEPEND="
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index c84784f71651..73616e2803a8 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
index e79dae9392a0..6c6b4f52b875 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cpu_flags_x86_mmx opengl"
RDEPEND="
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
index fc1598ddc4aa..af36e827c1ca 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="cpu_flags_x86_mmx"
DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
index db8da4f31821..f33b0e4d64f1 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86"
# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index 5b7201c880d7..e2037bc5b01a 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
tk +xscreensaver zephyr zeroconf"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 8bd28124e981..0a1478244958 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 122a64163d1d..77548a42cb27 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -2,6 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
+# Avoid having to keyword Poppler and X11 libraries for now.
+media-gfx/graphviz lefty pdf
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
+# Requires Rust, which is currently unavailable on m68k.
+media-gfx/graphviz svg
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
# Requires Ruby, which is broken on m68k.
app-text/htmltidy test
diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index c9e0381c5f2e..51cd2ec672ea 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
inherit cmake desktop python-single-r1 qmake-utils xdg
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 2ce0a8b48a5e..3a6449d4a08d 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="test" # bug #277165
diff --git a/sys-apps/dbus/dbus-1.12.20-r3.ebuild b/sys-apps/dbus/dbus-1.12.20-r3.ebuild
index f175a20c1aeb..d108b73feed6 100644
--- a/sys-apps/dbus/dbus-1.12.20-r3.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-r3.ebuild
@@ -135,6 +135,7 @@ multilib_src_configure() {
--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
--with-dbus-user=messagebus
$(use_with X x)
)
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
index d6fa26516aad..c5acec8fc6de 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit systemd
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
inherit autotools git-r3
@@ -30,3 +32,11 @@ src_prepare() {
default
[[ ${PV} != 9999 ]] || eautoreconf
}
+
+src_configure() {
+ local myconf=(
+ --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+ --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+ )
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index 7983540e7260..0d5b07883d97 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -1,8 +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 systemd
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
inherit autotools git-r3
@@ -28,3 +30,11 @@ src_prepare() {
default
[[ ${PV} != 9999 ]] || eautoreconf
}
+
+src_configure() {
+ local myconf=(
+ --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+ --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+ )
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 7983540e7260..0d5b07883d97 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,8 +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 systemd
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
inherit autotools git-r3
@@ -28,3 +30,11 @@ src_prepare() {
default
[[ ${PV} != 9999 ]] || eautoreconf
}
+
+src_configure() {
+ local myconf=(
+ --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+ --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+ )
+ econf "${myconf[@]}"
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
index a6c786adcc2d..dcba617a6048 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
HOMEPAGE="https://sourceware.org/lvm2/"
@@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON}
!!sys-fs/lvm-user
>=sys-apps/util-linux-2.16
lvm2create_initrd? ( sys-apps/makedev )
+ !device-mapper-only? ( virtual/tmpfiles )
thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
DEPEND="${DEPEND_COMMON}
@@ -265,7 +267,9 @@ src_install() {
}
pkg_postinst() {
- tmpfiles_process lvm2.conf
+ if ! use device-mapper-only; then
+ tmpfiles_process lvm2.conf
+ fi
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
index f6c64e6f5d1b..f23621e8619b 100644
--- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
HOMEPAGE="https://sourceware.org/lvm2/"
@@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON}
!!sys-fs/lvm-user
>=sys-apps/util-linux-2.16
lvm2create_initrd? ( sys-apps/makedev )
+ !device-mapper-only? ( virtual/tmpfiles )
thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
DEPEND="${DEPEND_COMMON}
@@ -253,7 +255,9 @@ src_install() {
}
pkg_postinst() {
- tmpfiles_process lvm2.conf
+ if ! use device-mapper-only; then
+ tmpfiles_process lvm2.conf
+ fi
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation