Merge updates from master

dev-java/tomcat-native/tomcat-native-1.3.5.ebuild

@@ -16,7 +16,7 @@ S=${WORKDIR}/${P}-src/native
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="static-libs"
 
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"

media-video/droidcam/Manifest

@@ -1,2 +1,3 @@
 DIST droidcam-2.1.3.tar.gz 86091 BLAKE2B 1e5ef24cdfed7135c411b899e801cb3bc82779f6bee79ea4c7eceabf95ff32c4211bb6c98d1b19e119be9a50b6dfb800490a70d7392382dcbb0cbb1684ab1809 SHA512 74f6973179b383bb12b4b063b2c524c0be99ea9465c0f1423d11ece5aa90ab5d93929f029c1716513ab63a6e8707699e78f64e747a3583b5afaf5205a96e18bc
 DIST droidcam-2.1.4.tar.gz 86139 BLAKE2B 9723d5ddd42d326480f38a5c3397b384bf3fb3d801c4d25378c5316da327b08fd43aba80eb423c1c96844d64751cc067aa168671c156fc7a14b73bf42831d602 SHA512 7527c08e60bb509cbc3513f8bb55da8fb2241706b6ded1a5baac4e9e0a3a114b62b8d14cf0ee5dbffad7bbf5a812e32888cd63675df1083a095d9d797d043e6d
+DIST droidcam-2.1.5.tar.gz 86340 BLAKE2B db8c71525dcda3b88d10b9312e6c468396c714fa9b2690f287dee7063a2700444dcb36c096ddbb8a8781a63784d638215be1ffab43a2f24bc9c7e0c0bc96691c SHA512 6c1069a67b45c5ca97a14ee32ee88d3ac7fe22126ff797211385a086373c56b4138f5af9b6637955154a5532d324ad251b450cfe730593e053143ddb82865d0f

media-video/droidcam/droidcam-2.1.5.ebuild

@@ -0,0 +1,144 @@
+# Copyright 2019-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop linux-mod-r1 xdg
+
+DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
+SRC_URI="https://github.com/dev47apps/${PN}-linux-client/archive/v${PV//_rc1/-RC}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-linux-client-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="gtk"
+
+# Requires connection to phone/tablet
+RESTRICT="test"
+
+DEPEND="
+	app-pda/libplist
+	app-pda/libusbmuxd
+	dev-libs/glib
+	dev-libs/libayatana-appindicator
+	dev-libs/libxml2:=
+	dev-util/android-tools
+	media-libs/alsa-lib
+	media-libs/libjpeg-turbo
+	>=media-libs/speex-1.2.0-r1
+	media-video/ffmpeg
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
+
+src_prepare() {
+	if ! use gtk; then
+		default
+		sed -i -e '/cflags gtk+/d' Makefile || die
+	else
+		default
+		# remove path and extension from Icon and Exec entry
+		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
+			-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
+			droidcam.desktop || die
+		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	if use gtk; then
+		USBMUXD=libusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1 emake droidcam
+	fi
+	 USBMUXD=libusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1 emake droidcam-cli
+
+	local modlist=(
+		v4l2loopback-dc=video:v4l2loopback:v4l2loopback:all
+	)
+
+	local modargs=(
+		KERNEL_DIR="${KV_OUT_DIR}"
+	)
+
+	linux-mod-r1_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback" || die
+	default
+	./test || die
+	popd || die
+}
+
+src_install() {
+	if use gtk; then
+		dobin droidcam
+		newicon -s 32 icon.png droidcam.png
+		newicon -s 96 icon2.png droidcam.png
+		domenu droidcam.desktop
+	fi
+	dobin droidcam-cli
+
+	# The cli and gui do not auto load the module if unloaded,
+	# so we just put it in modules-load.d to make sure it always works
+	insinto /etc/modules-load.d
+	if linux_config_exists; then
+		if linux_chkconfig_module SND_ALOOP; then
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+				snd_aloop
+			EOF
+		else
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+			EOF
+		fi
+	fi
+
+	linux-mod-r1_src_install
+}
+
+pkg_preinst() {
+	if use gtk; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	if use gtk; then
+		xdg_pkg_postinst
+	else
+		elog
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
+		elog
+	fi
+
+	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
+	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
+	elog
+	elog "Links to the Android/iPhone/iPad apps can be found at"
+	elog "https://www.dev47apps.com/"
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_pkg_postrm
+	fi
+}