gentoo auto-resync : 08:06:2023 - 15:45:39

3 files changed, 15 insertions, 28 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f25c212a1336..156e76fa9db3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index fc0b74b54314..02f464423849 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,7 +1,6 @@
 AUX droidcam-1.8.2_p20220831-makefile-fixes.patch 2181 BLAKE2B 82cfc66741ac1794ed822e6bd633600bc00e2289eb5bd3a3b2ca4ac71110262ba894503e07f089c46a1650e48d751b72893952393d874767afaa6ccb5e2c65a1 SHA512 abe964a3562ddcd7926f4985c9713ceae3881929b5eae2443461a2828e05975acc84901bf633f06116891170af91f9a6af5990f40303cce6c8b25c1ab33290ef
 AUX droidcam-2.0.0-libusbmuxd-20.patch 580 BLAKE2B 96f00d52d250f4153240e21cebffd0029dc3940aa61cde5295053d0842a28d61f570eb127ed681cc6a1e96b2c0f618c2dfa2f0cc6473fb08fc3cdd73826f72d4 SHA512 cb43712132eae371d2ed06462ba2e5ab69b50d1494ef1bf942d867302aaa4f169bfa0b02c930076c17bca44d7dfdb754aa38413a67b75fda10ff01ede8748e80
-DIST droidcam-1.9.0.tar.gz 85083 BLAKE2B ab96fd70a8514ff6f3ebb98fc482e6d8ee17f984c4929c26441ed1f6223ce5dc6421039e99068ab747012fbcb252d6e158c4c778a45f117cb8143aa278766ded SHA512 47532731688c08d90dfe1c7d177154ea68180a84061050bf6602669bfb867ce6d44e1d1f351cb5526d3d4abf1c6235c26ddf53b423e3641a2956afd392f9f5f6
 DIST droidcam-2.0.0.tar.gz 85146 BLAKE2B 95b96e7474ee457589d751caff156f9715f75cab3e54bef151334f8fe6371f5eed919e9a5df050ec683a65f15c2e40a06efc66e80e5323a8b0e6713980c75174 SHA512 68fe4de308df238fc096ad8b658c5d330400113c7ddf54bf0f070c9852e375273f80c7a8293bd9b5e357163305573931c94bb2bd005673086f718121181b2212
-EBUILD droidcam-1.9.0.ebuild 3515 BLAKE2B dd0d17dbadd257aad587ffbc7319f55b5a7b98f445ff2b2ecbad549361297b55c4cf8aadc90c96dedfe81ba30201b8563aaffc7f08904a90d2def1242c451ffd SHA512 71b92f6be8dc9fe45d76185baa12ecd4cce5a20419d892d2b8eeb5e23bece6b8124e27c5a6f06f3b5f97604b4c940de73b057b6bd8ac9f1b605fd6de3793c64d
 EBUILD droidcam-2.0.0-r1.ebuild 3581 BLAKE2B 252355a8e409d0ada940058ded66a1d1fb19d305a4489b34f29eb204db1c06a02851a4a174d84dbf0eef1cb3e7757c2eacc55a2de26f60df018d80b73fc98d1c SHA512 584ed5cfe390eb1763bb7b3b5e36cbeecff2c770a98da347e346080126dff72350a06cbb5e5ba9b7f5b062ee6b9ca01c9273e046b83ccd179f068d9c996e2d32
+EBUILD droidcam-2.0.0-r3.ebuild 3077 BLAKE2B b6d158128dbc7ccadf903ce6e7324038cc2af03283f914b39377ffdcad7274450cf15424ecd2c73cd8f0a22ca8defee4fedd2190238628e6d307ba61a04111ef SHA512 13cf41ad2f141ddf3c8e4ec8102b35cf1e02b477e667981d88a0043fa6f6a0664c92530bdcffcbc0c60c5ac949e21b22e5fe87c9d8d9533a90edd1d9993f7bc2
 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.9.0.ebuild b/media-video/droidcam/droidcam-2.0.0-r3.ebuild
index 43c1cec97661..a5924d0a08de 100644
--- a/media-video/droidcam/droidcam-1.9.0.ebuild
+++ b/media-video/droidcam/droidcam-2.0.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop linux-mod xdg
+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/"
@@ -40,14 +40,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
 CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
 ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
 
-PATCHES="${FILESDIR}/${PN}-1.8.2_p20220831-makefile-fixes.patch"
+PATCHES=(
+	"${FILESDIR}/${P}-libusbmuxd-20.patch"
+)
 
 src_prepare() {
 	if ! use gtk; then
@@ -70,22 +68,15 @@ src_configure() {
 
 src_compile() {
 	if use gtk; then
-		emake droidcam
-	fi
-	emake droidcam-cli
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
+		APPINDICATOR=ayatana-appindicator3-0.1 emake droidcam
 	fi
+	 APPINDICATOR=ayatana-appindicator3-0.1 emake droidcam-cli
+
+	local modlist=(
+		v4l2loopback-dc=video:v4l2loopback:v4l2loopback:all
+	)
 	export KERNEL_DIR || die
-	linux-mod_src_compile
+	linux-mod-r1_src_compile
 }
 
 src_test() {
@@ -104,7 +95,7 @@ src_install() {
 	fi
 	dobin droidcam-cli
 
-	# The cli and gui do not auto load the module if unloaded (why not though?)
+	# 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
@@ -120,19 +111,17 @@ src_install() {
 		fi
 	fi
 
-	einstalldocs
-	linux-mod_src_install
+	linux-mod-r1_src_install
 }
 
 pkg_preinst() {
-	linux-mod_pkg_preinst
 	if use gtk; then
 		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
+	linux-mod-r1_pkg_postinst
 	if use gtk; then
 		xdg_pkg_postinst
 	else
@@ -149,7 +138,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	linux-mod_pkg_postrm
 	if use gtk; then
 		xdg_pkg_postrm
 	fi