From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02521139082 for ; Mon, 27 Nov 2017 18:29:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B5E4E0F0C; Mon, 27 Nov 2017 18:29:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBE9EE0F0C for ; Mon, 27 Nov 2017 18:29:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47A9C340BEA for ; Mon, 27 Nov 2017 18:29:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1FA8A996 for ; Mon, 27 Nov 2017 18:29:03 +0000 (UTC) From: "Agostino Sarubbo" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Agostino Sarubbo" Message-ID: <1511807336.f080bf81d486d5d1dda6119662c493487c3a6eb2.ago@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/skypeforlinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/skypeforlinux/Manifest net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild X-VCS-Directories: net-im/skypeforlinux/ X-VCS-Committer: ago X-VCS-Committer-Name: Agostino Sarubbo X-VCS-Revision: f080bf81d486d5d1dda6119662c493487c3a6eb2 X-VCS-Branch: master Date: Mon, 27 Nov 2017 18:29:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3704624-1e64-466e-b3d7-81563f11d7f0 X-Archives-Hash: cbad55e48803b2ab6dca61cd041c838f commit: f080bf81d486d5d1dda6119662c493487c3a6eb2 Author: Karol Grudziński gmail com> AuthorDate: Thu Nov 2 16:24:42 2017 +0000 Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Nov 27 18:28:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f080bf81 net-im/skypeforlinux: version bump - Remove ebuilds for obsolete versions - Bump to 8.11.0.4 with changes in ebuild: - updated the list of dependencies - updated list of licenses - simplified the installation - other QA fixes Bug: https://bugs.gentoo.org/636278 Bug: https://bugs.gentoo.org/615468 Package-Manager: Portage-2.3.13, Repoman-2.3.4 net-im/skypeforlinux/Manifest | 3 +- net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild | 108 --------------------- ....5.0.1.ebuild => skypeforlinux-8.11.0.4.ebuild} | 50 +++++----- 3 files changed, 25 insertions(+), 136 deletions(-) diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index 4330b9f02cb..fcdd3ec4604 100644 --- a/net-im/skypeforlinux/Manifest +++ b/net-im/skypeforlinux/Manifest @@ -1,2 +1 @@ -DIST skypeforlinux_5.4.0.1-1.x86_64.rpm 72058201 SHA256 7acb723ba220ba2a2776f98a021a47223ead0a7959f33201ec6d4e9145024702 SHA512 706d33b1ea5c0b9e7aa1799b06ac465f5aafc29627ef4b3660598b0f1762986ba217af0903af1da41f2478ca5011adf9070fe7a331ecfcb028f81ca839b03ccb WHIRLPOOL 83a4fe4931432d7a5fce7231e008011905a41fb6f28240a42c355bc27d673033eecbddfc100da053a9efbea5c1d5c89161e1aab88394ab775a16ebf6848ae819 -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 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e diff --git a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild deleted file mode 100644 index da51c705af2..00000000000 --- a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 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 - -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" -SLOT="0" -KEYWORDS="~amd64" -IUSE="pax_kernel" - -S="${WORKDIR}" -QA_PREBUILT=opt/skypeforlinux/skypeforlinux -RESTRICT="mirror bindist strip" #299368 - -RDEPEND="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}] - gnome-base/libgnome-keyring[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${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/pango[${MULTILIB_USEDEP}]" - -src_unpack() { - rpm_src_unpack ${A} -} - -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!" \ - -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -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 - - into /opt - dobin usr/bin/skypeforlinux - - dodoc -r usr/share/doc/skypeforlinux/. - - doicon usr/share/pixmaps/skypeforlinux.png - - 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 - done - - domenu usr/share/applications/skypeforlinux.desktop - - if use pax_kernel; then - pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux - 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 -} diff --git a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild similarity index 70% rename from net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild rename to net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild index f9444b1d3cd..21af07f5775 100644 --- a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild @@ -5,35 +5,36 @@ 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="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="dev-libs/atk[${MULTILIB_USEDEP}] +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}] - gnome-base/libgnome-keyring[${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}] @@ -49,6 +50,8 @@ RDEPEND="dev-libs/atk[${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() { @@ -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 }