| 1 |
commit: 0759b05344348162ccb9185b601b26881bb0243b |
| 2 |
Author: Raymond Jennings <shentino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 2 07:27:19 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 4 19:50:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0759b053 |
| 7 |
|
| 8 |
net-im/skypeforlinux: Update to new version |
| 9 |
|
| 10 |
* Remove obsolete ebuild after upstream rpm removal |
| 11 |
* Add new upstream build |
| 12 |
* Remove spurious dependencies on gcc and glibc |
| 13 |
* Fix dodoc calls |
| 14 |
* Slash-endy finagle EROOT |
| 15 |
* Fix src_prepare() |
| 16 |
- Add call to default |
| 17 |
- Add || die to sed calls |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/2451 |
| 19 |
|
| 20 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 21 |
|
| 22 |
net-im/skypeforlinux/Manifest | 2 +- |
| 23 |
....8.0.2-r1.ebuild => skypeforlinux-1.9.0.2.ebuild} | 20 +++++++------------- |
| 24 |
2 files changed, 8 insertions(+), 14 deletions(-) |
| 25 |
|
| 26 |
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest |
| 27 |
index bc70ca3..ca5e07d 100644 |
| 28 |
--- a/net-im/skypeforlinux/Manifest |
| 29 |
+++ b/net-im/skypeforlinux/Manifest |
| 30 |
@@ -1 +1 @@ |
| 31 |
-DIST skypeforlinux_1.8.0.2-1.x86_64.rpm 58432819 SHA256 6e26fceb77ae98b825630150e087d777beb09c8914adcf59afbb6721e0f826c0 SHA512 84023de783b7bb7c69e8c4f79e44fe882a18efb322627a7b99a486d57d702685cacbbd6febc132625858b5e4a3cf2514608feaccf15e2e6bcb3edb020f6be9f8 WHIRLPOOL 459d06f06ff5c8bd7db398efe26569e1b4c098a4ef461a8b329eb81ffe6b8236ca63c3de2b10f83eba62db177629be6d8d5be5d833fc196e9fca33d89a23b784 |
| 32 |
+DIST skypeforlinux_1.9.0.2-1.x86_64.rpm 62767691 SHA256 9b838d5c0aa72287a96a5a11b150dbf647c50fe65aa2a386be8af7002e477e61 SHA512 9390c60f0cd7e643e8806596b6a1cdadffb45086fc456218f59361ffe74adb2adfbba4893d3276b59f1435067146d90becd1c644008932c6efcc978bd4288c8c WHIRLPOOL 631b471593e590aa7f2642e410c58971b07dd42f6c1bd8447c070c9b29dd18514f4d38f73c63e296d3e449d8a12ac5fb088f38ecdd6e81d922fd0b173c969d42 |
| 33 |
|
| 34 |
diff --git a/net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild |
| 35 |
similarity index 84% |
| 36 |
rename from net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild |
| 37 |
rename to net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild |
| 38 |
index 4fbe60a..106a1e5 100644 |
| 39 |
--- a/net-im/skypeforlinux/skypeforlinux-1.8.0.2-r1.ebuild |
| 40 |
+++ b/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild |
| 41 |
@@ -9,7 +9,7 @@ inherit eutils rpm |
| 42 |
|
| 43 |
DESCRIPTION="P2P Internet Telephony (VoiceIP) client" |
| 44 |
HOMEPAGE="http://www.skype.com/" |
| 45 |
-SRC_URI="https://repo.skype.com/rpm/stable/skypeforlinux_${PV}-1.x86_64.rpm" |
| 46 |
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" |
| 47 |
|
| 48 |
LICENSE="Skype-TOS no-source-code" |
| 49 |
SLOT="0" |
| 50 |
@@ -35,8 +35,6 @@ RDEPEND="virtual/ttf-fonts |
| 51 |
media-libs/freetype:2 |
| 52 |
net-print/cups |
| 53 |
sys-apps/dbus |
| 54 |
- sys-devel/gcc |
| 55 |
- sys-libs/glibc |
| 56 |
x11-libs/cairo |
| 57 |
x11-libs/gdk-pixbuf:2 |
| 58 |
x11-libs/gtk+:2 |
| 59 |
@@ -59,12 +57,12 @@ src_unpack () { |
| 60 |
} |
| 61 |
|
| 62 |
src_prepare() { |
| 63 |
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT}opt/skypeforlinux/skypeforlinux!" \ |
| 64 |
- -i usr/bin/skypeforlinux |
| 65 |
- sed -e "s!^Exec=.*!Exec=${EROOT}opt/bin/skypeforlinux!" \ |
| 66 |
+ default |
| 67 |
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT%/}/opt/skypeforlinux/skypeforlinux!" \ |
| 68 |
+ -i usr/bin/skypeforlinux || die |
| 69 |
+ sed -e "s!^Exec=.*!Exec=${EROOT%/}/opt/bin/skypeforlinux!" \ |
| 70 |
-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ |
| 71 |
- -i usr/share/applications/skypeforlinux.desktop |
| 72 |
- eapply_user |
| 73 |
+ -i usr/share/applications/skypeforlinux.desktop || die |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
@@ -93,11 +91,7 @@ src_install() { |
| 78 |
# insinto /etc/dbus-1/system.d |
| 79 |
# doins ${PN}.conf |
| 80 |
|
| 81 |
- dodoc usr/share/doc/skypeforlinux/* usr/share/skypeforlinux/*.html |
| 82 |
- dodoc usr/share/skypeforlinux/*.txt usr/share/skypeforlinux/LICENSE |
| 83 |
- |
| 84 |
- # create compat symlink |
| 85 |
- dosym ${P} /usr/share/doc/skypeforlinux |
| 86 |
+ dodoc -r usr/share/doc/skypeforlinux/. |
| 87 |
|
| 88 |
doicon usr/share/pixmaps/skypeforlinux.png |
Archives