From d49fcb1bc7dca36a97c55ffb600a4452f74deeb0 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 26 Jan 2023 16:06:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BC=D0=B0=D1=81=D0=BA=D0=B8,=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-im/viber/Manifest | 1 - net-im/viber/viber-16.1.0.37.ebuild | 152 -------------------- net-im/viber/viber-18.2.0.2.ebuild | 2 +- profiles/default/package.keywords/calculate | 1 - profiles/default/package.use/exactly-one-of | 2 + 5 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 net-im/viber/viber-16.1.0.37.ebuild diff --git a/net-im/viber/Manifest b/net-im/viber/Manifest index a22d4e8fd..d6a6a5246 100644 --- a/net-im/viber/Manifest +++ b/net-im/viber/Manifest @@ -1,2 +1 @@ -DIST viber-16.1.0.37.deb 110082688 BLAKE2B 065620f41be1e72115f3d54264258944d98378a052013dc3bff8fb68a85250a4f5e59fc538feb7dcbbc5608064bbdb0d504d1416123ae4f1e5cc8dfee8113431 SHA512 b73f5513117a094f28de88f830bdbbfd449995c333b0645886986d90c6a22e46b2ffe6327649878b29357793e1a7cb4c6e86cb969ba698bd8580425d79f6f777 DIST viber-18.2.0.2.deb 133597600 BLAKE2B e631ecee8d17fc409959abbc9afb8be0231a0108f360b0bfef9482b9ad4672ecfd16c44178d68cc6b7ef0516d46792f75575b9c46c630318a2329cb392f2f224 SHA512 e3543322058285b1cffd9e6fc22376aad831b30ff4f2dd71567840ba5bcead7241d8f132f0eec9a5eb6fcbcb42b56d12636976a02d1de232aedcaf36d2961ff8 diff --git a/net-im/viber/viber-16.1.0.37.ebuild b/net-im/viber/viber-16.1.0.37.ebuild deleted file mode 100644 index 52c2b1e24..000000000 --- a/net-im/viber/viber-16.1.0.37.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit desktop multilib-build pax-utils unpacker xdg - -QA_PREBUILT="/opt/viber/Viber - /opt/viber/libexec/QtWebEngineProcess - /opt/viber/plugins/*/*.so - /opt/viber/lib/* - /opt/viber/qml/*" - -DESCRIPTION="Free text and calls" -HOMEPAGE="http://www.viber.com" -SRC_URI="http://download.cdn.viber.com/cdn/desktop/Linux/${PN}.deb -> ${P}.deb" - -LICENSE="Viber-TOS" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="+abi_x86_64 apulse +pulseaudio" -REQUIRED_USE="^^ ( apulse pulseaudio )" -RESTRICT="bindist mirror" - -RDEPEND="dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/openssl-compat[${MULTILIB_USEDEP}] - dev-libs/wayland[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/zlib:0/1[${MULTILIB_USEDEP}] - x11-libs/libdrm[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libxcb:0/1.12[${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/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/xcb-util-image[${MULTILIB_USEDEP}] - x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] - x11-libs/xcb-util-renderutil[${MULTILIB_USEDEP}] - x11-libs/xcb-util-wm[${MULTILIB_USEDEP}] - apulse? ( media-sound/apulse[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )" -BDEPEND="sys-apps/fix-gnustack" - -S="${WORKDIR}" - -src_prepare() { - default - - if use apulse ; then - sed -i '/Exec=/s|/opt|apulse /opt|' \ - usr/share/applications/viber.desktop || die "sed failed" - fi - - # remove hardcoded path - sed -i '/Icon/s|/usr/share/pixmaps/viber.png|viber|' \ - usr/share/applications/viber.desktop \ - || die "sed failed for viber.desktop" -} - -src_install() { - fix-gnustack -f opt/viber/lib/libQt5WebEngineCore.so.5 > /dev/null \ - || die "removing execstack flag failed" - - newicon -s scalable usr/share/icons/hicolor/scalable/apps/Viber.svg \ - viber.svg - for size in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do - newicon -s "${size%%x*}" usr/share/viber/"${size}".png viber.png - done - dosym ../icons/hicolor/96x96/apps/viber.png \ - /usr/share/pixmaps/viber.png - - domenu usr/share/applications/viber.desktop - - insinto /opt/viber - doins -r opt/viber/. - - pax-mark -m "${ED}"/opt/viber/Viber \ - "${ED}"/opt/viber/QtWebEngineProcess - - fperms -R +x /opt/viber/Viber \ - /opt/viber/libexec/QtWebEngineProcess \ - /opt/viber/plugins/{audio,generic,geoservices,imageformats,mediaservice,platforminputcontexts,platforms,printsupport,sqldrivers,xcbglintegrations}/ \ - /opt/viber/qml/Qt/labs/animation/liblabsanimationplugin.so \ - /opt/viber/qml/Qt/labs/calendar/libqtlabscalendarplugin.so \ - /opt/viber/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so \ - /opt/viber/qml/Qt/labs/location/liblocationlabsplugin.so \ - /opt/viber/qml/Qt/labs/lottieqt/liblottieqtplugin.so \ - /opt/viber/qml/Qt/labs/platform/libqtlabsplatformplugin.so \ - /opt/viber/qml/Qt/labs/qmlmodels/liblabsmodelsplugin.so \ - /opt/viber/qml/Qt/labs/settings/libqmlsettingsplugin.so \ - /opt/viber/qml/Qt/labs/sharedimage/libsharedimageplugin.so \ - /opt/viber/qml/Qt/labs/wavefrontmesh/libqmlwavefrontmeshplugin.so \ - /opt/viber/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so \ - /opt/viber/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin.so \ - /opt/viber/qml/QtLocation/libdeclarative_location.so \ - /opt/viber/qml/QtMultimedia/libdeclarative_multimedia.so \ - /opt/viber/qml/QtPositioning/libdeclarative_positioning.so \ - /opt/viber/qml/QtQml/Models.2/libmodelsplugin.so \ - /opt/viber/qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so \ - /opt/viber/qml/QtQml/StateMachine/libqtqmlstatemachine.so \ - /opt/viber/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so \ - /opt/viber/qml/QtQml/libqmlplugin.so \ - /opt/viber/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so \ - /opt/viber/qml/QtQuick/Controls/libqtquickcontrolsplugin.so \ - /opt/viber/qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so \ - /opt/viber/qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so \ - /opt/viber/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so \ - /opt/viber/qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so \ - /opt/viber/qml/QtQuick/Controls.2/libqtquickcontrols2plugin.so \ - /opt/viber/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so \ - /opt/viber/qml/QtQuick/Dialogs/libdialogplugin.so \ - /opt/viber/qml/QtQuick/Extras/libqtquickextrasplugin.so \ - /opt/viber/qml/QtQuick/Layouts/libqquicklayoutsplugin.so \ - /opt/viber/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so \ - /opt/viber/qml/QtQuick/Particles.2/libparticlesplugin.so \ - /opt/viber/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so \ - /opt/viber/qml/QtQuick/Scene2D/libqtquickscene2dplugin.so \ - /opt/viber/qml/QtQuick/Scene3D/libqtquickscene3dplugin.so \ - /opt/viber/qml/QtQuick/Shapes/libqmlshapesplugin.so \ - /opt/viber/qml/QtQuick/Templates.2/libqtquicktemplates2plugin.so \ - /opt/viber/qml/QtQuick/Timeline/libqtquicktimelineplugin.so \ - /opt/viber/qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so \ - /opt/viber/qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so \ - /opt/viber/qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so \ - /opt/viber/qml/QtQuick/Window.2/libwindowplugin.so \ - /opt/viber/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so \ - /opt/viber/qml/QtQuick.2/libqtquick2plugin.so \ - /opt/viber/qml/QtWebChannel/libdeclarative_webchannel.so \ - /opt/viber/qml/QtWebEngine/libqtwebengineplugin.so - - dosym ../../opt/viber/Viber /usr/bin/Viber -} diff --git a/net-im/viber/viber-18.2.0.2.ebuild b/net-im/viber/viber-18.2.0.2.ebuild index 26329c73b..cd51be127 100644 --- a/net-im/viber/viber-18.2.0.2.ebuild +++ b/net-im/viber/viber-18.2.0.2.ebuild @@ -19,7 +19,7 @@ SRC_URI="http://download.cdn.viber.com/cdn/desktop/Linux/${PN}.deb -> ${P}.deb" LICENSE="Viber-TOS" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="+abi_x86_64 apulse +pulseaudio" REQUIRED_USE="^^ ( apulse pulseaudio )" RESTRICT="bindist mirror" diff --git a/profiles/default/package.keywords/calculate b/profiles/default/package.keywords/calculate index ed7b47bc3..4ebae24f8 100644 --- a/profiles/default/package.keywords/calculate +++ b/profiles/default/package.keywords/calculate @@ -1,6 +1,5 @@ ~app-crypt/shim-signed-0.2 amd64 ~media-gfx/epsonscan2-6.6.42.0 amd64 -~net-im/viber-16.1.0.37 amd64 ~net-misc/modem-manager-gui-0.0.18 amd64 ~net-p2p/opentracker-20170428 amd64 ~net-wireless/rtl8814au-20211122 amd64 diff --git a/profiles/default/package.use/exactly-one-of b/profiles/default/package.use/exactly-one-of index 3a2f6b05f..b2de6ac5c 100644 --- a/profiles/default/package.use/exactly-one-of +++ b/profiles/default/package.use/exactly-one-of @@ -50,3 +50,5 @@ acct-user/git gitea # exactly-one-of ( lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4 ) dev-lang/fennel lua_single_target_lua5-4 +# exactly-one-of ( apulse pulseaudio ) +net-im/viber -apulse