diff options
| author |   Raymond Jennings <shentino@gmail.com> | 2016-10-02 00:27:19 -0700 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-10-04 21:50:33 +0200 |
| commit | 0759b05344348162ccb9185b601b26881bb0243b (patch) | |
| tree | 5b8b05fa839b410935804d32e0bd4dc1b7d220b4 /net-im | |
| parent | sci-geosciences/merkaartor: remove old version (diff) | |
| download | gentoo-0759b05344348162ccb9185b601b26881bb0243b.tar.gz gentoo-0759b05344348162ccb9185b601b26881bb0243b.tar.bz2 gentoo-0759b05344348162ccb9185b601b26881bb0243b.zip | |
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 <soap@gentoo.org>
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skypeforlinux/Manifest | 2 | ||||
| -rw-r--r-- | net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild) | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index bc70ca34ea97..ca5e07d71aa0 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 index 4fbe60a71ec7..106a1e5e078f 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 |