Merge updates from master

6 files changed, 21 insertions, 11 deletions

diff --git a/dev-python/gevent/gevent-21.8.0.ebuild b/dev-python/gevent/gevent-21.8.0.ebuild
index 4660f4f02cd3..0705b21c73f2 100644
--- a/dev-python/gevent/gevent-21.8.0.ebuild
+++ b/dev-python/gevent/gevent-21.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index c09ffea97490..007349e5a44a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
index a041a9847339..5b813b81d795 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch b/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch
new file mode 100644
index 000000000000..87a1b4e2f7fd
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -173,7 +173,7 @@
+ CXXFLAGS+=@CXX_STRERROR_FLAG@
+ CXXFLAGS+=@LFS_FLAGS@
+ INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
+-LIBS:=-laio -lexpat -lboost_iostreams -ldl
++LIBS:=-laio -lexpat -ldl
+ 
+ ifeq ("@DEVTOOLS@", "yes")
+ LIBS+=-lncurses
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
index a79debda1725..3a4bf5d068d7 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}"/0.9.0-remove-boost_iostreams.patch
 )
 
 src_prepare() {
@@ -59,15 +60,14 @@ src_configure() {
 }
 
 src_compile() {
-	MAKEOPTS+=" V="
-	default
+	emake V=
 }
 
 src_test() {
-	emake unit-test
+	emake V= unit-test
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
+	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
 	dodoc README.md TODO.org
 }
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index ad10f7d89ec9..f9480dfe1fc3 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -59,15 +59,14 @@ src_configure() {
 }
 
 src_compile() {
-	MAKEOPTS+=" V="
-	default
+	emake V=
 }
 
 src_test() {
-	emake unit-test
+	emake V= unit-test
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
+	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
 	dodoc README.md TODO.org
 }