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 3DB4D138330 for ; Tue, 4 Oct 2016 19:50:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09D3DE0B71; Tue, 4 Oct 2016 19:50:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEDAEE0B71 for ; Tue, 4 Oct 2016 19:50:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EAD7341040 for ; Tue, 4 Oct 2016 19:50:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF5FA248A for ; Tue, 4 Oct 2016 19:50:42 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1475610633.0759b05344348162ccb9185b601b26881bb0243b.soap@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-1.8.0.2-r1.ebuild net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild X-VCS-Directories: net-im/skypeforlinux/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0759b05344348162ccb9185b601b26881bb0243b X-VCS-Branch: master Date: Tue, 4 Oct 2016 19:50:42 +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: 3ad32ebd-3933-4534-a7c5-77da45b4c9e3 X-Archives-Hash: a0fbaeff0ba06dc1c19d8dbebff062db commit: 0759b05344348162ccb9185b601b26881bb0243b Author: Raymond Jennings gmail com> AuthorDate: Sun Oct 2 07:27:19 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Oct 4 19:50:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0759b053 net-im/skypeforlinux: Update to new version * Remove obsolete ebuild after upstream rpm removal * Add new upstream build * Remove spurious dependencies on gcc and glibc * Fix dodoc calls * Slash-endy finagle EROOT * Fix src_prepare() - Add call to default - Add || die to sed calls Closes: https://github.com/gentoo/gentoo/pull/2451 Signed-off-by: David Seifert gentoo.org> net-im/skypeforlinux/Manifest | 2 +- ....8.0.2-r1.ebuild => skypeforlinux-1.9.0.2.ebuild} | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index bc70ca3..ca5e07d 100644 --- a/net-im/skypeforlinux/Manifest +++ b/net-im/skypeforlinux/Manifest @@ -1 +1 @@ -DIST skypeforlinux_1.8.0.2-1.x86_64.rpm 58432819 SHA256 6e26fceb77ae98b825630150e087d777beb09c8914adcf59afbb6721e0f826c0 SHA512 84023de783b7bb7c69e8c4f79e44fe882a18efb322627a7b99a486d57d702685cacbbd6febc132625858b5e4a3cf2514608feaccf15e2e6bcb3edb020f6be9f8 WHIRLPOOL 459d06f06ff5c8bd7db398efe26569e1b4c098a4ef461a8b329eb81ffe6b8236ca63c3de2b10f83eba62db177629be6d8d5be5d833fc196e9fca33d89a23b784 +DIST skypeforlinux_1.9.0.2-1.x86_64.rpm 62767691 SHA256 9b838d5c0aa72287a96a5a11b150dbf647c50fe65aa2a386be8af7002e477e61 SHA512 9390c60f0cd7e643e8806596b6a1cdadffb45086fc456218f59361ffe74adb2adfbba4893d3276b59f1435067146d90becd1c644008932c6efcc978bd4288c8c WHIRLPOOL 631b471593e590aa7f2642e410c58971b07dd42f6c1bd8447c070c9b29dd18514f4d38f73c63e296d3e449d8a12ac5fb088f38ecdd6e81d922fd0b173c969d42 diff --git a/net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild similarity index 84% rename from net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild rename to net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild index 4fbe60a..106a1e5 100644 --- a/net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild @@ -9,7 +9,7 @@ inherit eutils rpm DESCRIPTION="P2P Internet Telephony (VoiceIP) client" HOMEPAGE="http://www.skype.com/" -SRC_URI="https://repo.skype.com/rpm/stable/skypeforlinux_${PV}-1.x86_64.rpm" +SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" LICENSE="Skype-TOS no-source-code" SLOT="0" @@ -35,8 +35,6 @@ RDEPEND="virtual/ttf-fonts media-libs/freetype:2 net-print/cups sys-apps/dbus - sys-devel/gcc - sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 @@ -59,12 +57,12 @@ src_unpack () { } src_prepare() { - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT}opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux - sed -e "s!^Exec=.*!Exec=${EROOT}opt/bin/skypeforlinux!" \ + default + sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT%/}/opt/skypeforlinux/skypeforlinux!" \ + -i usr/bin/skypeforlinux || die + sed -e "s!^Exec=.*!Exec=${EROOT%/}/opt/bin/skypeforlinux!" \ -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -i usr/share/applications/skypeforlinux.desktop - eapply_user + -i usr/share/applications/skypeforlinux.desktop || die } src_install() { @@ -93,11 +91,7 @@ src_install() { # insinto /etc/dbus-1/system.d # doins ${PN}.conf - dodoc usr/share/doc/skypeforlinux/* usr/share/skypeforlinux/*.html - dodoc usr/share/skypeforlinux/*.txt usr/share/skypeforlinux/LICENSE - - # create compat symlink - dosym ${P} /usr/share/doc/skypeforlinux + dodoc -r usr/share/doc/skypeforlinux/. doicon usr/share/pixmaps/skypeforlinux.png