diff options
| -rw-r--r-- | net-im/skypeforlinux/Manifest | 2 | ||||
| -rw-r--r-- | net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-5.5.0.1-r1710.ebuild) | 50 |
2 files changed, 25 insertions, 27 deletions
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index e6dbce88..8b7b3fae 100644 --- a/net-im/skypeforlinux/Manifest +++ b/net-im/skypeforlinux/Manifest @@ -1 +1 @@ -DIST skypeforlinux_5.5.0.1-1.x86_64.rpm 72080362 SHA256 f32db8a5858a9eb8dde3ca7b29b920649bb2422649ccb58ffee77ff73d81a919 SHA512 73ae5e8443e8e7110a74456d336933d1fe1873009189e764e31904b7c82b3c6b0a6603e527d455b08e780a73b5c1f7794faea5de8179cb600114561ffbb5bcd9 WHIRLPOOL 467d1442ff1d8b0ed8756d1f82dae32d3f182c20f84e944835a564537dff34000504216a445f1ebc9e9ac19553e21646b212baec34154c5b08e6a664059a42bb +DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 SHA256 70ec2dc04ba8bcefb6ac08fa3001e256ce96b1a8b33884958a380a9ae9d75b0a SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e WHIRLPOOL 4138f2ecc829cb2f868867cd715aa5f3b0b63fa57ca730da0eb99613b169f0be206ab7cd5eed0fd7a92b39d237fccbad17d16cac0d008d13ff97f6692ab092a0 diff --git a/net-im/skypeforlinux/skypeforlinux-5.5.0.1-r1710.ebuild b/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild index f0810abe..21af07f5 100644 --- a/net-im/skypeforlinux/skypeforlinux-5.5.0.1-r1710.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild @@ -5,22 +5,23 @@ EAPI=6 MULTILIB_COMPAT=( abi_x86_64 ) -inherit pax-utils rpm multilib-build xdg-utils +inherit eutils 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 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/skypeforlinux/skypeforlinux +QA_PREBUILT="*" RESTRICT="mirror bindist strip" #299368 -RDEPEND="app-crypt/libsecret +RDEPEND=" + app-crypt/libsecret[${MULTILIB_USEDEP}] dev-libs/atk[${MULTILIB_USEDEP}] dev-libs/expat[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] @@ -30,10 +31,10 @@ RDEPEND="app-crypt/libsecret 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}] @@ -49,6 +50,8 @@ RDEPEND="app-crypt/libsecret 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() { @@ -59,37 +62,29 @@ src_prepare() { default sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ -i usr/bin/skypeforlinux || die - sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/skypeforlinux!" \ + sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \ -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ + -e "/^OnlyShowIn=/d" \ -i usr/share/applications/skypeforlinux.desktop || die } src_install() { - insinto /opt/skypeforlinux/locales - doins usr/share/skypeforlinux/locales/*.pak - - insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release - doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node - - insinto /opt/skypeforlinux/resources - doins usr/share/skypeforlinux/resources/*.asar - - insinto /opt/skypeforlinux - doins usr/share/skypeforlinux/*.pak - doins usr/share/skypeforlinux/*.bin - doins usr/share/skypeforlinux/*.dat - doins usr/share/skypeforlinux/version - exeinto /opt/skypeforlinux - doexe usr/share/skypeforlinux/*.so - doexe usr/share/skypeforlinux/skypeforlinux + dodir /opt + cp -a usr/share/skypeforlinux "${D}"/opt || die into /opt dobin usr/bin/skypeforlinux + 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/skypeforlinux doicon usr/share/pixmaps/skypeforlinux.png + # compat symlink for the autostart desktop file + 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/skypeforlinux.png skypeforlinux.png @@ -98,7 +93,8 @@ src_install() { domenu usr/share/applications/skypeforlinux.desktop if use pax_kernel; then - pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux + pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux + pax-mark -m "${ED%/}"/opt/skypeforlinux/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" @@ -110,9 +106,11 @@ src_install() { 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 } |