Merge branch 'develop' of git.calculate.ru:/repo/calculate into develop

mhiretskiy 1813
Alexander Tratsevskiy 5 years ago
commit 753e140fea

@ -1 +1,2 @@
DIST riot-web-1.3.3.tar.gz 1514218 BLAKE2B 3d0dac145d72e339c6f7fb493fa1c44577f892dcd87b92eb0961b6e08a8de10ac49655eea0a6ece0cd9cb94315bf026a5dfaeaf8ab1997f15d955c48ee01dcfb SHA512 bfe44600935a5d29b5c57818c2c3f8b0015ec7f4a2e7e58dc1f75c753741768ec0281f94156830328d24c5835a9ee67598c47341113038431b858291989d1745
DIST riot-web-1.3.6.tar.gz 1500603 BLAKE2B 246caa3d04328a8c1c88df42f795ad0a7890abf9ae4d03734866115a249540fe4dcd93ff34a77855efb3fb7445551e60112afbfcf7259b46eb0d57e4cab2e29b SHA512 25714c13f10e5029a249809c819ac90cbba091dfcb5b8e5c19ed320b8626d695c2b367b9f3784b033797987297594b16d7d6565a2e910b802ed9c18261290676

@ -0,0 +1,91 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="A glossy Matrix collaboration client for the web"
HOMEPAGE="https://riot.im"
inherit eutils gnome2-utils
if [[ ${PV} == "9999" ]]; then
inherit git-r3
SRC_URI=""
EGIT_REPO_URI="https://github.com/vector-im/riot-web.git"
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/vector-im/riot-web/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="abi_x86_32 abi_x86_64"
REQUIRED_USE="abi_x86_32? ( !abi_x86_64 )
abi_x86_64? ( !abi_x86_32 )"
DEPEND="sys-devel/binutils:*
net-libs/nodejs
sys-apps/yarn
x11-libs/libXScrnSaver
net-print/cups
dev-libs/nss
gnome-base/gconf"
RDEPEND="${DEPEND}"
QA_PREBUILT="
opt/Riot/libffmpeg.so
opt/Riot/libnode.so
opt/Riot/riot-web"
DESTINATION="/" # We build and unpack a Debian installer, which already has everything in the proper directories {usr,opt}, so we just set the destination to "/"
src_prepare() {
default
if [[ ${PV} == "9999" ]]; then
"${S}"/scripts/fetch-develop.deps.sh
fi
yarn install || die "Yarn module installation failed"
cp "${S}"/config.sample.json "${S}"/config.json
}
src_compile() {
if use x86; then
# Currently, by default v8 has a memory limit of 512MB on 32-bit systems,
# and 1.4GB on 64-bit systems.
NODE_OPTIONS="--max_old_space_size=1536" yarn run build || die "Build failed"
else
yarn run build || die "Build failed"
fi
if use abi_x86_32; then
"${S}"/node_modules/.bin/build --linux --ia32 || die "Bundling failed"
elif use abi_x86_64; then
"${S}"/node_modules/.bin/build --linux --x64 || die "Bundling failed"
fi
}
src_install() {
ar x "${S}"/electron_app/dist/riot-web*.deb
tar xvf data.tar.xz
mv usr/share/doc/${PN} usr/share/doc/${PF}
gunzip usr/share/doc/${PF}/changelog.gz
insinto ${DESTINATION}
doins -r usr
doins -r opt
fperms +x /opt/Riot/${PN}
dosym ${DESTINATION}/opt/Riot/${PN} ${DESTINATION}/usr/bin/${PN}
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}

@ -1 +0,0 @@
DIST skypeforlinux_8.51.0.92-1.x86_64.rpm 106489251 BLAKE2B 1846623eb9ab78bf143b9a45bf2001fb3ae4b78ac1690041b984f96f309f57ac427f1313722de02d3305cab4413f40470a9452f1d87a47b3e3af1d0878eecabb SHA512 58c86e19900badec28e0bc58ed23459aea8e94e6f0d36fd8d8412d99d96eec15945a9b4920278788e5edccc6cc26ec7da9159d7105ff4499f9c6e44d3e4615ac

@ -1,128 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MULTILIB_COMPAT=( abi_x86_64 )
inherit desktop gnome2-utils pax-utils rpm multilib-build xdg-utils
DESCRIPTION="Instant messaging client, with support for audio and video"
HOMEPAGE="https://www.skype.com/"
SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
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"
SLOT="0"
KEYWORDS="-* amd64"
IUSE="pax_kernel"
S="${WORKDIR}"
QA_PREBUILT="*"
RESTRICT="mirror bindist strip" #299368
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
dev-libs/atk[${MULTILIB_USEDEP}]
dev-libs/expat[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
dev-libs/nss[${MULTILIB_USEDEP}]
gnome-base/gconf:2[${MULTILIB_USEDEP}]
media-libs/alsa-lib[${MULTILIB_USEDEP}]
media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
media-libs/freetype:2[${MULTILIB_USEDEP}]
media-libs/libv4l[${MULTILIB_USEDEP}]
net-print/cups[${MULTILIB_USEDEP}]
sys-apps/dbus[${MULTILIB_USEDEP}]
sys-devel/gcc[cxx]
virtual/ttf-fonts
x11-libs/cairo[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
x11-libs/gtk+:2[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
x11-libs/libXcomposite[${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXdamage[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXrender[${MULTILIB_USEDEP}]
x11-libs/libXtst[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
x11-libs/libxkbfile[${MULTILIB_USEDEP}]
x11-libs/pango[${MULTILIB_USEDEP}]
|| (
sys-auth/elogind
sys-apps/systemd
)"
src_unpack() {
rpm_src_unpack ${A}
}
src_prepare() {
default
sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-i usr/bin/skypeforlinux || die
sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-e "/^OnlyShowIn=/d" \
-i usr/share/applications/skypeforlinux.desktop || die
# fix size icon in systray
local regexp=$(echo -n "const hiDPISuffix = platform.isMac() ? '@2x' : '';" | hexdump -ve '1/1 "%.2X"')
local replacement=$(echo -n "const hiDPISuffix = platform.isMac() ? '' : '@2x';" | hexdump -ve '1/1 "%.2X"')
hexdump -ve '1/1 "%.2X"' usr/share/skypeforlinux/resources/app.asar |
sed "s/${regexp}/${replacement}/g" |
xxd -r -p >usr/share/skypeforlinux/resources/app.asar.patched
mv usr/share/skypeforlinux/resources/app.asar.patched usr/share/skypeforlinux/resources/app.asar
}
src_install() {
dodir /opt
cp -a usr/share/skypeforlinux "${D}"/opt || die
into /opt
dobin usr/bin/skypeforlinux
dodoc usr/share/skypeforlinux/*.html
dodoc -r usr/share/doc/skypeforlinux/.
# symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
dosym ${P} usr/share/doc/skypeforlinux
doicon usr/share/pixmaps/skypeforlinux.png
# compat symlink for the autostart desktop file
dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
local res
for res in 16 32 256 512; do
newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
done
domenu usr/share/applications/skypeforlinux.desktop
if use pax_kernel; then
pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
ewarn "You have set USE=pax_kernel meaning that you intend to run"
ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
ewarn "you suspect that ${PN} is being broken by this modification,"
ewarn "please open a bug."
fi
}
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
gnome2_icon_cache_update
}

@ -112,6 +112,7 @@
~net-im/discord-bin-0.0.9 amd64
~net-im/psi-1.4 amd64 x86
net-im/signal-desktop-bin amd64 x86
~net-im/skypeforlinux-8.52.0.138 amd64
net-im/telegram-desktop-bin amd64 x86
~net-im/vacuum-1.3.0_pre20180105 amd64 x86
~net-irc/hexchat-2.14.2 amd64 x86

@ -296,7 +296,7 @@
~app-editors/emacs-26.1 amd64 x86
~app-editors/kakoune-0_pre20171120 amd64 x86
~app-editors/le-1.16.5 amd64 x86
~app-editors/neovim-0.3.4 amd64 x86
~app-editors/neovim-0.3.8 amd64 x86
~app-editors/ng-1.5_beta1 amd64 x86
~app-editors/qxmledit-0.9.10 amd64 x86
~app-editors/retext-7.0.4 amd64 x86

@ -148,9 +148,6 @@ media-plugins/grilo-plugins tracker
# required by kde-apps/ktp-call-ui-16.04.1
net-libs/telepathy-qt farstream
# required by net-im/skype-4.3.0.37-r6
dev-qt/qtwebkit -exceptions
# required by media-video/openshot-1.4.3-r1::gentoo[-libav,ffmpeg]
media-video/ffmpeg vpx
@ -646,3 +643,6 @@ dev-libs/libdazzle vala
# required by media-tv/kodi-18.4
net-misc/curl http2
# required by app-portage/kuroo-0.90.5_p20180410
kde-plasma/kde-cli-tools kdesu

Loading…
Cancel
Save