Added net-im/skype-dbus-mock and make net-im/skypeforlinux depends on it

(instead of elogind)

Added net-im/skype-dbus-mock and make net-im/skypeforlinux depends on it
(instead of elogind)
c7c7deb8 · José Mª. Fernández · ccb6d320 · c7c7deb8 · c7c7deb8 · ccb6d320
Commit c7c7deb8 authored Nov 10, 2018 by José Mª. Fernández
--- a/net-im/skype-dbus-mock/skype-dbus-mock-9999.ebuild
+++ b/net-im/skype-dbus-mock/skype-dbus-mock-9999.ebuild
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+
+inherit git-r3 python-r1
+
+DESCRIPTION="Mocked systemd dbus interface for skype 8.30+"
+HOMEPAGE="https://github.com/maelnor/skype-dbus-mock"
+EGIT_REPO_URI="https://github.com/maelnor/skype-dbus-mock.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RDEPEND=">=net-im/skypeforlinux-8.30
+    dev-python/dbus-python[${PYTHON_USEDEP}]
+    !sys-apps/systemd
+    !sys-auth/elogind"
+
+src_install() {
+    newbin skype-dbus-mock.py skype-dbus-mock
+    insinto /usr/share/dbus-1/system-services
+    doins org.freedesktop.login1.service
+    insinto /usr/share/dbus-1/system.d
+    doins skype-dbus-mock.conf
+}
+
+pkg_postinst() {
+    ewarn "Restart dbus service to apply changes"
+}
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
-DIST skypeforlinux_8.26.76.25-1.x86_64.rpm 94075285 BLAKE2B f48acbb9f085feb482671fbbf7279aa47c2f20562b8dcfbc06f7eb33a80115e1904a01c075b96f8219eea3f30f6b945faabc1d86712eeacafa8445a9300c9998 SHA512 f0d0a40746edd27276eed537d479e0a2973e6e7140d3b77e72b61e9f90e39675d3960de57393cb1fa7eb5a6b026cd4db6112ce37ed7e89b5c0220374372e52e6
-DIST skypeforlinux_8.27.0.85-1.x86_64.rpm 94874950 BLAKE2B b96f79e66aa6b4e85abee2cbd7a94500f344c31ad3f0863a0bb5b360646b558823b6c289394f98cbc98da66bdbc7916e27aadbae15a0cb422cef10841cbf4679 SHA512 c30fd1d41c407719b480e2d04d18d192c585f33396f8923667d255309f9dcb7e258a4bc4383808872be728bada7f06d799be8c84930e8154c01771297f5d6fc2
-EBUILD skypeforlinux-8.26.76.25.ebuild 4500 BLAKE2B a56640cf018aba53ba9d25ee76c251d35a5f9d596311087e63a253cf8280f5e0805113a987c01f6d20ef21290371a7e47529b92fb04d9d795a273740884585a5 SHA512 8f56fa42679290f2975033fff43ff937643bf3723931b7a793dc79a87b48c5cfda4a157126367f5096473de58be5512ce317249d1ebf97a13d81c15a7bd7f977
-EBUILD skypeforlinux-8.27.0.85.ebuild 4498 BLAKE2B 9337878cf2fa468e6730e258e593f2ea06b2433cb906211de7b6e2cfc75697bd4e123698150676c01502fb1da2a92d052af1d5d08be3ba5e0ee5d24d2d52f822 SHA512 7694f68f7668d696c032cb011578ccf85ccbc606c0310d543a00aa6a7ea51e57addc25a132a06a45c6633a99bb80c9985980193b35e749ee4e58b1046b41885e
+DIST skypeforlinux_8.33.0.41-1.x86_64.rpm 96280740 BLAKE2B db751b800116587ae97600947372eaa655d438dfd6e70ad8e47d57bc4398ac47d4a01f49be7c9a0c1fb0606df8b0bad287577ada6da2999b384a01b3188e26f0 SHA512 f8c201f4da0f838982d64f51c9428d27bb4dd01f9eb753303600096406a1dc6d28af897985efb3f46bea9f0ef79708998e3e9308f92e2f0f4f42b1dca42b938b
+EBUILD skypeforlinux-8.33.0.41-r1.ebuild 3710 BLAKE2B c9a5624a4b5bf1c7bea3459b7e11c42d9838ec6929a2908b68a4ac8931950addbc9d5ecd3695220cc9a0cb1cdbe5e18517ebbd44d2434d13a28087ce61dc8615 SHA512 ec4308852207202cb263791ea731fca4eef2db9d69639458ab8db9d9e6793dc792506deec97a97f96a9c632fff1af87e43015a8498ebdc68281f13fd6b63ea31
--- a/net-im/skypeforlinux/skypeforlinux-8.26.76.25.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.26.76.25.ebuild
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit pax-utils rpm multilib-build xdg-utils gnome2-utils
-
-DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/unstable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1 no-source-code"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT=opt/${PN}/${PN}
-RESTRICT="mirror bindist strip" #299368
-
-# Dependency checker
-# find /opt/skypeforlinux/ -type f | while read -r f; do file $f | grep -i elf &>/dev/null && readelf -a $f | grep NEEDED; done | cut -d '[' -f 2 | sort -u | cut -d ']' -f 1 | grep -vE 'libgcc_s\.so\.1|libstdc\+\+\.so\.6' | while read l; do [ -f "/opt/skypeforlinux/$l" ] && continue;  [ -f "/lib/$l" ] && fl="/lib/$l" || fl="/usr/lib64/$l"; p=$(qfile $fl); [ -n "$p" ] && echo $l $p || echo "NOT FOUND $l" >&2; done | cut -d ' ' -f 2 | sort -u
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	sys-libs/glibc
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]
-"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/${PN}/${PN}!" \
-		-i usr/bin/${PN} || die
-	sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/${PN}!" \
-		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/${PN} "${D}"/opt || die
-
-	#insinto /opt/${PN}/locales
-	#doins usr/share/${PN}/locales/*.pak
-	#
-	#insinto /opt/${PN}
-	#doins -r usr/share/${PN}/resources
-	#
-	#insinto /opt/${PN}/resources
-	#doins usr/share/${PN}/resources/*.asar
-
-	#insinto /opt/${PN}
-	#doins usr/share/${PN}/*.pak
-	#doins usr/share/${PN}/*.bin
-	#doins usr/share/${PN}/*.dat
-	#doins usr/share/${PN}/*.html
-	#doins usr/share/${PN}/version
-	#exeinto /opt/${PN}
-	#doexe usr/share/${PN}/*.so
-	#doexe usr/share/${PN}/${PN}
-
-	into /opt
-	dobin usr/bin/${PN}
-
-	dodoc usr/share/${PN}/*.html
-	dodoc -r usr/share/doc/${PN}/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${P} usr/share/doc/${PN}
-
-	doicon usr/share/pixmaps/${PN}.png
-	
-	# compat symlink for the autostart desktop file
-	dosym ../../opt/bin/${PN} usr/bin/${PN}
-	
-	local res
-	for res in 16 32 256 512 ; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/${PN}.png ${PN}.png
-	done
-
-	domenu usr/share/applications/${PN}.desktop
-
-	if use pax_kernel; then
-		pax-mark -Cm "${ED%/}"/opt/${PN}/${PN}
-		pax-mark -m "${ED%/}"/opt/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
--- a/net-im/skypeforlinux/skypeforlinux-8.27.0.85.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.27.0.85.ebuild
@@ -5,26 +5,27 @@ EAPI=6

 MULTILIB_COMPAT=( abi_x86_64 )

-inherit pax-utils rpm multilib-build xdg-utils gnome2-utils
+inherit desktop gnome2-utils pax-utils rpm multilib-build xdg-utils

-DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
+DESCRIPTION="Instant messaging client, with support for audio and video"
 HOMEPAGE="https://www.skype.com/"
 SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"

-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1 no-source-code"
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 -*"
+KEYWORDS="-* ~amd64"
 IUSE="pax_kernel"

 S="${WORKDIR}"
-QA_PREBUILT=opt/${PN}/${PN}
+QA_PREBUILT="*"
 RESTRICT="mirror bindist strip" #299368

-# Dependency checker
-# find /opt/skypeforlinux/ -type f | while read -r f; do file $f | grep -i elf &>/dev/null && readelf -a $f | grep NEEDED; done | cut -d '[' -f 2 | sort -u | cut -d ']' -f 1 | grep -vE 'libgcc_s\.so\.1|libstdc\+\+\.so\.6' | while read l; do [ -f "/opt/skypeforlinux/$l" ] && continue;  [ -f "/lib/$l" ] && fl="/lib/$l" || fl="/usr/lib64/$l"; p=$(qfile $fl); [ -n "$p" ] && echo $l $p || echo "NOT FOUND $l" >&2; done | cut -d ' ' -f 2 | sort -u
-
 RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	|| (
+		net-im/skype-dbus-mock
+		sys-auth/elogind
+		sys-apps/systemd
+	)
 	dev-libs/atk[${MULTILIB_USEDEP}]
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -38,7 +39,6 @@ RDEPEND="
 	net-print/cups[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-devel/gcc[cxx]
-	sys-libs/glibc
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
@@ -56,8 +56,7 @@ RDEPEND="
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]
-"
+	x11-libs/pango[${MULTILIB_USEDEP}]"

 src_unpack() {
 	rpm_src_unpack ${A}
@@ -65,65 +64,46 @@ src_unpack() {

 src_prepare() {
 	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/${PN}/${PN}!" \
-		-i usr/bin/${PN} || die
-	sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/${PN}!" \
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
 		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
 		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/${PN}.desktop || die
+		-i usr/share/applications/skypeforlinux.desktop || die
 }

 src_install() {
 	dodir /opt
-	cp -a usr/share/${PN} "${D}"/opt || die
-
-	#insinto /opt/${PN}/locales
-	#doins usr/share/${PN}/locales/*.pak
-	#
-	#insinto /opt/${PN}
-	#doins -r usr/share/${PN}/resources
-	#
-	#insinto /opt/${PN}/resources
-	#doins usr/share/${PN}/resources/*.asar
-
-	#insinto /opt/${PN}
-	#doins usr/share/${PN}/*.pak
-	#doins usr/share/${PN}/*.bin
-	#doins usr/share/${PN}/*.dat
-	#doins usr/share/${PN}/*.html
-	#doins usr/share/${PN}/version
-	#exeinto /opt/${PN}
-	#doexe usr/share/${PN}/*.so
-	#doexe usr/share/${PN}/${PN}
+	cp -a usr/share/skypeforlinux "${D}"/opt || die

 	into /opt
-	dobin usr/bin/${PN}
+	dobin usr/bin/skypeforlinux

-	dodoc usr/share/${PN}/*.html
-	dodoc -r usr/share/doc/${PN}/.
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
 	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${P} usr/share/doc/${PN}
+	dosym ${P} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png

-	doicon usr/share/pixmaps/${PN}.png
-	
 	# compat symlink for the autostart desktop file
-	dosym ../../opt/bin/${PN} usr/bin/${PN}
-	
+	dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
 	local res
-	for res in 16 32 256 512 ; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/${PN}.png ${PN}.png
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
 	done

-	domenu usr/share/applications/${PN}.desktop
+	domenu usr/share/applications/skypeforlinux.desktop

 	if use pax_kernel; then
-		pax-mark -Cm "${ED%/}"/opt/${PN}/${PN}
-		pax-mark -m "${ED%/}"/opt/${PN}/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+		pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+		ewarn "You have set USE=pax_kernel meaning that you intend to run"
+		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
+		ewarn "you suspect that ${PN} is being broken by this modification,"
+		ewarn "please open a bug."
 	fi
 }