| 1 |
commit: f080bf81d486d5d1dda6119662c493487c3a6eb2 |
| 2 |
Author: Karol Grudziński <krlgrudzinski+gentoo <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Nov 2 16:24:42 2017 +0000 |
| 4 |
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 27 18:28:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f080bf81 |
| 7 |
|
| 8 |
net-im/skypeforlinux: version bump |
| 9 |
|
| 10 |
- Remove ebuilds for obsolete versions |
| 11 |
- Bump to 8.11.0.4 with changes in ebuild: |
| 12 |
- updated the list of dependencies |
| 13 |
- updated list of licenses |
| 14 |
- simplified the installation |
| 15 |
- other QA fixes |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/636278 |
| 18 |
Bug: https://bugs.gentoo.org/615468 |
| 19 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 20 |
|
| 21 |
net-im/skypeforlinux/Manifest | 3 +- |
| 22 |
net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild | 108 --------------------- |
| 23 |
....5.0.1.ebuild => skypeforlinux-8.11.0.4.ebuild} | 50 +++++----- |
| 24 |
3 files changed, 25 insertions(+), 136 deletions(-) |
| 25 |
|
| 26 |
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest |
| 27 |
index 4330b9f02cb..fcdd3ec4604 100644 |
| 28 |
--- a/net-im/skypeforlinux/Manifest |
| 29 |
+++ b/net-im/skypeforlinux/Manifest |
| 30 |
@@ -1,2 +1 @@ |
| 31 |
-DIST skypeforlinux_5.4.0.1-1.x86_64.rpm 72058201 SHA256 7acb723ba220ba2a2776f98a021a47223ead0a7959f33201ec6d4e9145024702 SHA512 706d33b1ea5c0b9e7aa1799b06ac465f5aafc29627ef4b3660598b0f1762986ba217af0903af1da41f2478ca5011adf9070fe7a331ecfcb028f81ca839b03ccb WHIRLPOOL 83a4fe4931432d7a5fce7231e008011905a41fb6f28240a42c355bc27d673033eecbddfc100da053a9efbea5c1d5c89161e1aab88394ab775a16ebf6848ae819 |
| 32 |
-DIST skypeforlinux_5.5.0.1-1.x86_64.rpm 72080362 SHA256 f32db8a5858a9eb8dde3ca7b29b920649bb2422649ccb58ffee77ff73d81a919 SHA512 73ae5e8443e8e7110a74456d336933d1fe1873009189e764e31904b7c82b3c6b0a6603e527d455b08e780a73b5c1f7794faea5de8179cb600114561ffbb5bcd9 WHIRLPOOL 467d1442ff1d8b0ed8756d1f82dae32d3f182c20f84e944835a564537dff34000504216a445f1ebc9e9ac19553e21646b212baec34154c5b08e6a664059a42bb |
| 33 |
+DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e |
| 34 |
|
| 35 |
diff --git a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild |
| 36 |
deleted file mode 100644 |
| 37 |
index da51c705af2..00000000000 |
| 38 |
--- a/net-im/skypeforlinux/skypeforlinux-5.4.0.1.ebuild |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,108 +0,0 @@ |
| 41 |
-# Copyright 1999-2017 Gentoo Foundation |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
- |
| 44 |
-EAPI=6 |
| 45 |
- |
| 46 |
-MULTILIB_COMPAT=( abi_x86_64 ) |
| 47 |
- |
| 48 |
-inherit pax-utils rpm multilib-build |
| 49 |
- |
| 50 |
-DESCRIPTION="Instant messaging client, with support for audio and video" |
| 51 |
-HOMEPAGE="https://www.skype.com/" |
| 52 |
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" |
| 53 |
- |
| 54 |
-LICENSE="Skype-TOS no-source-code" |
| 55 |
-SLOT="0" |
| 56 |
-KEYWORDS="~amd64" |
| 57 |
-IUSE="pax_kernel" |
| 58 |
- |
| 59 |
-S="${WORKDIR}" |
| 60 |
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux |
| 61 |
-RESTRICT="mirror bindist strip" #299368 |
| 62 |
- |
| 63 |
-RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}] |
| 64 |
- dev-libs/expat[${MULTILIB_USEDEP}] |
| 65 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 66 |
- dev-libs/nspr[${MULTILIB_USEDEP}] |
| 67 |
- dev-libs/nss[${MULTILIB_USEDEP}] |
| 68 |
- gnome-base/gconf:2[${MULTILIB_USEDEP}] |
| 69 |
- gnome-base/libgnome-keyring[${MULTILIB_USEDEP}] |
| 70 |
- media-libs/alsa-lib[${MULTILIB_USEDEP}] |
| 71 |
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] |
| 72 |
- media-libs/freetype:2[${MULTILIB_USEDEP}] |
| 73 |
- net-print/cups[${MULTILIB_USEDEP}] |
| 74 |
- sys-apps/dbus[${MULTILIB_USEDEP}] |
| 75 |
- sys-devel/gcc[cxx] |
| 76 |
- sys-libs/glibc |
| 77 |
- virtual/ttf-fonts |
| 78 |
- x11-libs/cairo[${MULTILIB_USEDEP}] |
| 79 |
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] |
| 80 |
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] |
| 81 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
| 82 |
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] |
| 83 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
| 84 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 85 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
| 86 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 87 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 88 |
- x11-libs/libXi[${MULTILIB_USEDEP}] |
| 89 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 90 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 91 |
- x11-libs/libXtst[${MULTILIB_USEDEP}] |
| 92 |
- x11-libs/pango[${MULTILIB_USEDEP}]" |
| 93 |
- |
| 94 |
-src_unpack() { |
| 95 |
- rpm_src_unpack ${A} |
| 96 |
-} |
| 97 |
- |
| 98 |
-src_prepare() { |
| 99 |
- default |
| 100 |
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ |
| 101 |
- -i usr/bin/skypeforlinux || die |
| 102 |
- sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/skypeforlinux!" \ |
| 103 |
- -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ |
| 104 |
- -i usr/share/applications/skypeforlinux.desktop || die |
| 105 |
-} |
| 106 |
- |
| 107 |
-src_install() { |
| 108 |
- insinto /opt/skypeforlinux/locales |
| 109 |
- doins usr/share/skypeforlinux/locales/*.pak |
| 110 |
- |
| 111 |
- insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release |
| 112 |
- doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node |
| 113 |
- |
| 114 |
- insinto /opt/skypeforlinux/resources |
| 115 |
- doins usr/share/skypeforlinux/resources/*.asar |
| 116 |
- |
| 117 |
- insinto /opt/skypeforlinux |
| 118 |
- doins usr/share/skypeforlinux/*.pak |
| 119 |
- doins usr/share/skypeforlinux/*.bin |
| 120 |
- doins usr/share/skypeforlinux/*.dat |
| 121 |
- doins usr/share/skypeforlinux/version |
| 122 |
- exeinto /opt/skypeforlinux |
| 123 |
- doexe usr/share/skypeforlinux/*.so |
| 124 |
- doexe usr/share/skypeforlinux/skypeforlinux |
| 125 |
- |
| 126 |
- into /opt |
| 127 |
- dobin usr/bin/skypeforlinux |
| 128 |
- |
| 129 |
- dodoc -r usr/share/doc/skypeforlinux/. |
| 130 |
- |
| 131 |
- doicon usr/share/pixmaps/skypeforlinux.png |
| 132 |
- |
| 133 |
- local res |
| 134 |
- for res in 16 32 256 512; do |
| 135 |
- newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png |
| 136 |
- done |
| 137 |
- |
| 138 |
- domenu usr/share/applications/skypeforlinux.desktop |
| 139 |
- |
| 140 |
- if use pax_kernel; then |
| 141 |
- pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux |
| 142 |
- eqawarn "You have set USE=pax_kernel meaning that you intend to run" |
| 143 |
- eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" |
| 144 |
- eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" |
| 145 |
- eqawarn "you suspect that ${PN} is being broken by this modification," |
| 146 |
- eqawarn "please open a bug." |
| 147 |
- fi |
| 148 |
-} |
| 149 |
|
| 150 |
diff --git a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild b/net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild |
| 151 |
similarity index 70% |
| 152 |
rename from net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild |
| 153 |
rename to net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild |
| 154 |
index f9444b1d3cd..21af07f5775 100644 |
| 155 |
--- a/net-im/skypeforlinux/skypeforlinux-5.5.0.1.ebuild |
| 156 |
+++ b/net-im/skypeforlinux/skypeforlinux-8.11.0.4.ebuild |
| 157 |
@@ -5,35 +5,36 @@ EAPI=6 |
| 158 |
|
| 159 |
MULTILIB_COMPAT=( abi_x86_64 ) |
| 160 |
|
| 161 |
-inherit pax-utils rpm multilib-build xdg-utils |
| 162 |
+inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils |
| 163 |
|
| 164 |
DESCRIPTION="Instant messaging client, with support for audio and video" |
| 165 |
HOMEPAGE="https://www.skype.com/" |
| 166 |
SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" |
| 167 |
|
| 168 |
-LICENSE="Skype-TOS no-source-code" |
| 169 |
+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" |
| 170 |
SLOT="0" |
| 171 |
-KEYWORDS="~amd64" |
| 172 |
+KEYWORDS="~amd64 -*" |
| 173 |
IUSE="pax_kernel" |
| 174 |
|
| 175 |
S="${WORKDIR}" |
| 176 |
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux |
| 177 |
+QA_PREBUILT="*" |
| 178 |
RESTRICT="mirror bindist strip" #299368 |
| 179 |
|
| 180 |
-RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}] |
| 181 |
+RDEPEND=" |
| 182 |
+ app-crypt/libsecret[${MULTILIB_USEDEP}] |
| 183 |
+ dev-libs/atk[${MULTILIB_USEDEP}] |
| 184 |
dev-libs/expat[${MULTILIB_USEDEP}] |
| 185 |
dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 186 |
dev-libs/nspr[${MULTILIB_USEDEP}] |
| 187 |
dev-libs/nss[${MULTILIB_USEDEP}] |
| 188 |
gnome-base/gconf:2[${MULTILIB_USEDEP}] |
| 189 |
- gnome-base/libgnome-keyring[${MULTILIB_USEDEP}] |
| 190 |
media-libs/alsa-lib[${MULTILIB_USEDEP}] |
| 191 |
media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] |
| 192 |
media-libs/freetype:2[${MULTILIB_USEDEP}] |
| 193 |
+ media-libs/libv4l[${MULTILIB_USEDEP}] |
| 194 |
net-print/cups[${MULTILIB_USEDEP}] |
| 195 |
sys-apps/dbus[${MULTILIB_USEDEP}] |
| 196 |
sys-devel/gcc[cxx] |
| 197 |
- sys-libs/glibc |
| 198 |
virtual/ttf-fonts |
| 199 |
x11-libs/cairo[${MULTILIB_USEDEP}] |
| 200 |
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] |
| 201 |
@@ -49,6 +50,8 @@ RDEPEND="dev-libs/atk[${MULTILIB_USEDEP}] |
| 202 |
x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 203 |
x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 204 |
x11-libs/libXtst[${MULTILIB_USEDEP}] |
| 205 |
+ x11-libs/libxcb[${MULTILIB_USEDEP}] |
| 206 |
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}] |
| 207 |
x11-libs/pango[${MULTILIB_USEDEP}]" |
| 208 |
|
| 209 |
src_unpack() { |
| 210 |
@@ -59,37 +62,29 @@ src_prepare() { |
| 211 |
default |
| 212 |
sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ |
| 213 |
-i usr/bin/skypeforlinux || die |
| 214 |
- sed -e "s!^Exec=.*!Exec=${EPREFIX}/opt/bin/skypeforlinux!" \ |
| 215 |
+ sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \ |
| 216 |
-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ |
| 217 |
+ -e "/^OnlyShowIn=/d" \ |
| 218 |
-i usr/share/applications/skypeforlinux.desktop || die |
| 219 |
} |
| 220 |
|
| 221 |
src_install() { |
| 222 |
- insinto /opt/skypeforlinux/locales |
| 223 |
- doins usr/share/skypeforlinux/locales/*.pak |
| 224 |
- |
| 225 |
- insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release |
| 226 |
- doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node |
| 227 |
- |
| 228 |
- insinto /opt/skypeforlinux/resources |
| 229 |
- doins usr/share/skypeforlinux/resources/*.asar |
| 230 |
- |
| 231 |
- insinto /opt/skypeforlinux |
| 232 |
- doins usr/share/skypeforlinux/*.pak |
| 233 |
- doins usr/share/skypeforlinux/*.bin |
| 234 |
- doins usr/share/skypeforlinux/*.dat |
| 235 |
- doins usr/share/skypeforlinux/version |
| 236 |
- exeinto /opt/skypeforlinux |
| 237 |
- doexe usr/share/skypeforlinux/*.so |
| 238 |
- doexe usr/share/skypeforlinux/skypeforlinux |
| 239 |
+ dodir /opt |
| 240 |
+ cp -a usr/share/skypeforlinux "${D}"/opt || die |
| 241 |
|
| 242 |
into /opt |
| 243 |
dobin usr/bin/skypeforlinux |
| 244 |
|
| 245 |
+ dodoc usr/share/skypeforlinux/*.html |
| 246 |
dodoc -r usr/share/doc/skypeforlinux/. |
| 247 |
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) |
| 248 |
+ dosym ${P} usr/share/doc/skypeforlinux |
| 249 |
|
| 250 |
doicon usr/share/pixmaps/skypeforlinux.png |
| 251 |
|
| 252 |
+ # compat symlink for the autostart desktop file |
| 253 |
+ dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux |
| 254 |
+ |
| 255 |
local res |
| 256 |
for res in 16 32 256 512; do |
| 257 |
newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png |
| 258 |
@@ -98,7 +93,8 @@ src_install() { |
| 259 |
domenu usr/share/applications/skypeforlinux.desktop |
| 260 |
|
| 261 |
if use pax_kernel; then |
| 262 |
- pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux |
| 263 |
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux |
| 264 |
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node |
| 265 |
eqawarn "You have set USE=pax_kernel meaning that you intend to run" |
| 266 |
eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" |
| 267 |
eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" |
| 268 |
@@ -110,9 +106,11 @@ src_install() { |
| 269 |
pkg_postinst() { |
| 270 |
xdg_desktop_database_update |
| 271 |
xdg_mimeinfo_database_update |
| 272 |
+ gnome2_icon_cache_update |
| 273 |
} |
| 274 |
|
| 275 |
pkg_postrm() { |
| 276 |
xdg_desktop_database_update |
| 277 |
xdg_mimeinfo_database_update |
| 278 |
+ gnome2_icon_cache_update |
| 279 |
} |
Archives