1 |
commit: e2e8a4c2b6dd5c38993908dfea2cf6eb551d893e |
2 |
Author: Raymond Jennings <shentino <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 29 15:32:31 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 18:10:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e8a4c2 |
7 |
|
8 |
net-im/skypeforlinux: Version bump |
9 |
|
10 |
Gentoo-bug: 598436 |
11 |
* Remove defunct old version |
12 |
* Just rename in place, skype doesn't like users on old versions anyway |
13 |
* Cleanup some defunct comments in ebuild |
14 |
* Sort dependencies |
15 |
Closes: https://github.com/gentoo/gentoo/pull/2694 |
16 |
|
17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
18 |
|
19 |
net-im/skypeforlinux/Manifest | 3 +- |
20 |
...0.1-r1.ebuild => skypeforlinux-1.11.0.1.ebuild} | 13 +-- |
21 |
net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild | 125 --------------------- |
22 |
3 files changed, 4 insertions(+), 137 deletions(-) |
23 |
|
24 |
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest |
25 |
index 65fbe41..0ae6f8c 100644 |
26 |
--- a/net-im/skypeforlinux/Manifest |
27 |
+++ b/net-im/skypeforlinux/Manifest |
28 |
@@ -1,2 +1 @@ |
29 |
-DIST skypeforlinux_1.10.0.1-1.x86_64.rpm 62779116 SHA256 24e83f598b0729649e9562f0265ca12236cc53775d7bc1bc9e14cf5de48848ff SHA512 f3e9947588bab83fcc3cdedf455e18d93da9ae1098cb55acb7494552b1f8f97508abac6cdf987f67db779fa5f2786c1fd8e22032936f6100258260c5fb399272 WHIRLPOOL ad5078392d8f49c33a1810afc653175e9ad36e2ece118f92818c3c1cc2a1b6ed0328f9f623958aefd635048ba586ec6f2b502aed6a4ef76bb970e1f25528eab2 |
30 |
-DIST skypeforlinux_1.9.0.2-1.x86_64.rpm 62767691 SHA256 9b838d5c0aa72287a96a5a11b150dbf647c50fe65aa2a386be8af7002e477e61 SHA512 9390c60f0cd7e643e8806596b6a1cdadffb45086fc456218f59361ffe74adb2adfbba4893d3276b59f1435067146d90becd1c644008932c6efcc978bd4288c8c WHIRLPOOL 631b471593e590aa7f2642e410c58971b07dd42f6c1bd8447c070c9b29dd18514f4d38f73c63e296d3e449d8a12ac5fb088f38ecdd6e81d922fd0b173c969d42 |
31 |
+DIST skypeforlinux_1.11.0.1-1.x86_64.rpm 63377325 SHA256 cddd5bc09b82f8b82bf8361a5b7718f67840f286bfbcf67a30f94cd5eebaf827 SHA512 11d64352790a096498c35394392082e549c39c0295c6fed5c040838614e91f17b4086d5f203eebc089605f48bbd6b2efcbc3845dff73df6f507b48e5d82e8f1b WHIRLPOOL 6225d24211f795694d7b75d40851580b93f9ee24ff3dc005d404b998f9a477ad12aefc2b5af056b24a84eb4d4975e690f371392eb37c6fd4c8ce5efde9b854da |
32 |
|
33 |
diff --git a/net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-1.11.0.1.ebuild |
34 |
similarity index 93% |
35 |
rename from net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild |
36 |
rename to net-im/skypeforlinux/skypeforlinux-1.11.0.1.ebuild |
37 |
index 1001af4..8d3e2a1 100644 |
38 |
--- a/net-im/skypeforlinux/skypeforlinux-1.10.0.1-r1.ebuild |
39 |
+++ b/net-im/skypeforlinux/skypeforlinux-1.11.0.1.ebuild |
40 |
@@ -4,7 +4,6 @@ |
41 |
|
42 |
EAPI=6 |
43 |
|
44 |
-#inherit eutils rpm pax-utils |
45 |
inherit eutils rpm |
46 |
|
47 |
DESCRIPTION="P2P Internet Telephony (VoiceIP) client" |
48 |
@@ -20,8 +19,7 @@ S="${WORKDIR}" |
49 |
QA_PREBUILT=opt/skypeforlinux/skypeforlinux |
50 |
RESTRICT="mirror bindist strip" #299368 |
51 |
|
52 |
-RDEPEND="virtual/ttf-fonts |
53 |
- dev-libs/atk |
54 |
+RDEPEND="dev-libs/atk |
55 |
dev-libs/expat |
56 |
dev-libs/glib:2 |
57 |
dev-libs/nspr |
58 |
@@ -35,10 +33,12 @@ RDEPEND="virtual/ttf-fonts |
59 |
sys-apps/dbus |
60 |
sys-devel/gcc[cxx] |
61 |
sys-libs/glibc |
62 |
+ virtual/ttf-fonts |
63 |
x11-libs/cairo |
64 |
x11-libs/gdk-pixbuf:2 |
65 |
x11-libs/gtk+:2 |
66 |
x11-libs/libX11 |
67 |
+ x11-libs/libXScrnSaver |
68 |
x11-libs/libXcomposite |
69 |
x11-libs/libXcursor |
70 |
x11-libs/libXdamage |
71 |
@@ -47,7 +47,6 @@ RDEPEND="virtual/ttf-fonts |
72 |
x11-libs/libXi |
73 |
x11-libs/libXrandr |
74 |
x11-libs/libXrender |
75 |
- x11-libs/libXScrnSaver |
76 |
x11-libs/libXtst |
77 |
x11-libs/pango" |
78 |
|
79 |
@@ -86,9 +85,6 @@ src_install() { |
80 |
into /opt |
81 |
dobin usr/bin/skypeforlinux |
82 |
|
83 |
-# insinto /etc/dbus-1/system.d |
84 |
-# doins ${PN}.conf |
85 |
- |
86 |
dodoc -r usr/share/doc/skypeforlinux/. |
87 |
|
88 |
doicon usr/share/pixmaps/skypeforlinux.png |
89 |
@@ -108,9 +104,6 @@ src_install() { |
90 |
eqawarn "you suspect that ${PN} is being broken by this modification," |
91 |
eqawarn "please open a bug." |
92 |
fi |
93 |
- |
94 |
-# echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN} |
95 |
-# doenvd "${T}"/99${PN} #430142 |
96 |
} |
97 |
|
98 |
pkg_postinst() { |
99 |
|
100 |
diff --git a/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild |
101 |
deleted file mode 100644 |
102 |
index 106a1e5..00000000 |
103 |
--- a/net-im/skypeforlinux/skypeforlinux-1.9.0.2.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,125 +0,0 @@ |
106 |
-# Copyright 1999-2016 Gentoo Foundation |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Id$ |
109 |
- |
110 |
-EAPI=6 |
111 |
- |
112 |
-#inherit eutils rpm pax-utils |
113 |
-inherit eutils rpm |
114 |
- |
115 |
-DESCRIPTION="P2P Internet Telephony (VoiceIP) client" |
116 |
-HOMEPAGE="http://www.skype.com/" |
117 |
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" |
118 |
- |
119 |
-LICENSE="Skype-TOS no-source-code" |
120 |
-SLOT="0" |
121 |
-KEYWORDS="~amd64" |
122 |
-#IUSE="pax_kernel selinux" |
123 |
-IUSE="" |
124 |
- |
125 |
-S="${WORKDIR}" |
126 |
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux |
127 |
-RESTRICT="mirror bindist strip" #299368 |
128 |
- |
129 |
-RDEPEND="virtual/ttf-fonts |
130 |
- !net-im/skype:1 |
131 |
- dev-libs/atk |
132 |
- dev-libs/expat |
133 |
- dev-libs/glib:2 |
134 |
- dev-libs/nspr |
135 |
- dev-libs/nss |
136 |
- gnome-base/gconf:2 |
137 |
- gnome-base/libgnome-keyring |
138 |
- media-libs/alsa-lib |
139 |
- media-libs/fontconfig:1.0 |
140 |
- media-libs/freetype:2 |
141 |
- net-print/cups |
142 |
- sys-apps/dbus |
143 |
- x11-libs/cairo |
144 |
- x11-libs/gdk-pixbuf:2 |
145 |
- x11-libs/gtk+:2 |
146 |
- x11-libs/libX11 |
147 |
- x11-libs/libXcomposite |
148 |
- x11-libs/libXcursor |
149 |
- x11-libs/libXdamage |
150 |
- x11-libs/libXext |
151 |
- x11-libs/libXfixes |
152 |
- x11-libs/libXi |
153 |
- x11-libs/libXrandr |
154 |
- x11-libs/libXrender |
155 |
- x11-libs/libXScrnSaver |
156 |
- x11-libs/libXtst |
157 |
- x11-libs/pango" |
158 |
-# selinux? ( sec-policy/selinux-skype )" |
159 |
- |
160 |
-src_unpack () { |
161 |
- rpm_src_unpack ${A} |
162 |
-} |
163 |
- |
164 |
-src_prepare() { |
165 |
- default |
166 |
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT%/}/opt/skypeforlinux/skypeforlinux!" \ |
167 |
- -i usr/bin/skypeforlinux || die |
168 |
- sed -e "s!^Exec=.*!Exec=${EROOT%/}/opt/bin/skypeforlinux!" \ |
169 |
- -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ |
170 |
- -i usr/share/applications/skypeforlinux.desktop || die |
171 |
-} |
172 |
- |
173 |
-src_install() { |
174 |
- insinto /opt/skypeforlinux/locales |
175 |
- doins usr/share/skypeforlinux/locales/*.pak |
176 |
- |
177 |
- insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release |
178 |
- doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node |
179 |
- |
180 |
- insinto /opt/skypeforlinux/resources |
181 |
- doins usr/share/skypeforlinux/resources/*.asar |
182 |
- |
183 |
- insinto /opt/skypeforlinux |
184 |
- doins usr/share/skypeforlinux/*.pak |
185 |
- doins usr/share/skypeforlinux/*.bin |
186 |
- doins usr/share/skypeforlinux/*.dat |
187 |
- doins usr/share/skypeforlinux/version |
188 |
- exeinto /opt/skypeforlinux |
189 |
- doexe usr/share/skypeforlinux/*.so |
190 |
- doexe usr/share/skypeforlinux/skypeforlinux |
191 |
- |
192 |
- into /opt |
193 |
- dobin usr/bin/skypeforlinux |
194 |
- fowners root:audio /opt/bin/skypeforlinux /opt/skypeforlinux/skypeforlinux |
195 |
- |
196 |
-# insinto /etc/dbus-1/system.d |
197 |
-# doins ${PN}.conf |
198 |
- |
199 |
- dodoc -r usr/share/doc/skypeforlinux/. |
200 |
- |
201 |
- doicon usr/share/pixmaps/skypeforlinux.png |
202 |
- |
203 |
- local res |
204 |
- for res in 16 32 256 512; do |
205 |
- newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png |
206 |
- done |
207 |
- |
208 |
- domenu usr/share/applications/skypeforlinux.desktop |
209 |
- |
210 |
-# if use pax_kernel; then |
211 |
-# if use apulse; then |
212 |
-# pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die |
213 |
-# else |
214 |
-# pax-mark Cm "${ED}"/opt/bin/${PN} || die |
215 |
-# fi |
216 |
-# eqawarn "You have set USE=pax_kernel meaning that you intend to run" |
217 |
-# eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" |
218 |
-# eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" |
219 |
-# eqawarn "you suspect that ${PN} is being broken by this modification," |
220 |
-# eqawarn "please open a bug." |
221 |
-# fi |
222 |
- |
223 |
-# echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN} |
224 |
-# doenvd "${T}"/99${PN} #430142 |
225 |
-} |
226 |
- |
227 |
-pkg_postinst() { |
228 |
- einfo "See https://support.skype.com/en/faq/FA34656" |
229 |
- einfo "for more information about Skype for Linux Alpha." |
230 |
-} |