gentoo resync : 24.12.2018

6 files changed, 7 insertions, 322 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d20932b81e1b..648bfbf69e18 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,5 @@
-AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6
-AUX plasma-desktop-5.13.5-kickersearch-nav.patch 3897 BLAKE2B ca412633e3d09f924a03f26b0019e5967fea7a54e03f921c6ba23178cbb91f314094bffae28f97a96800379d723ad3db1e783a557d106a6a0a6e2cd4905e458d SHA512 c5e43ca565aeaa19bb8b5cf7307c60a1fdc2b1600552e4860a79fe261bf681a2954b44a3b34462e2b5164f7848b0f827ba21494022360eaa565a6675c2e6bd45
-AUX plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch 5132 BLAKE2B 5653c5d6e0403fedb314d2cef4c5de20adc9d142cd197fd41b2bbe471e2e3b28cca2a6ca052d1e88c3c07e511b2345ed68ec72108519945da34094ef6f700ae8 SHA512 33d8436643418e8e9806f23862c9c0cbea65dd1360face47f4f21a61b79ecadcbfc3dde93865a76ac76f7591198a7935496260a1c257e0291367c3455a025dc4
-DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
 DIST plasma-desktop-5.14.3.tar.xz 9141312 BLAKE2B f6be5a432abac3835b7a6102a755f7bfc8809ef851c498ecc57ca2026fadcf7aebc2cf5c4e8b11198551cdaca04eff0607fd0d7ebcfd47a33fb4fd739e1eaf42 SHA512 52ce17321a0dd153446e9e334102ab2f6579e84595c53641864a660969ae410272f4762b345397fd00e9f6e936ce097e179d0b69a62341fa97b7b6b0b1ec38bd
-EBUILD plasma-desktop-5.13.5-r3.ebuild 4618 BLAKE2B 06c0eafa797deaf2e4d7b83d0b538dd9cc4b54b2090abe77f197dbced60bbb0718a70156468e9cf5150650a5ebb03b974e322749ccbcfa73320389cf63a24a26 SHA512 4aefbf759f4026e14ea16cc300df89f64f5ad47f26895c5708e8f558b66e5a67097cd5a8885167f29583c2c18666c2f1b4ee75b960ce0dd23575bff35db85470
-EBUILD plasma-desktop-5.14.3.ebuild 3857 BLAKE2B 542d45e834e2d7baf5d55ce7a21cd9dbf4778acaa460031e456d02fed9640cd1eeedf708ee39b277707ac28e93c30958caa74423c09dd8b9ad24cea466e33761 SHA512 72a0c88a8374f7453e3b043f9e55b862321dfeb183c7b710d71eb1ec3cd1ab259a51a4d2e631936f8eb5207dbc5e0b26112fac840749a3c3406f70d4d3328091
+DIST plasma-desktop-5.14.4.1.tar.xz 9139608 BLAKE2B b30e27031ac93f031010261fd064d774d5cd1e88be470f4f174a4dd2dda7f6c2af359c6be25671c5c0408ec9a71a6a6aed595b25dc4b5432bb35432b63f8cd34 SHA512 92404c766eddaf97f5ba6e76edfd3320eb21e787202aa8aadc76e4c1f613f455a669a9fc09fe3d19e90e46c39a4bf55185d3e2ef99f7f79adb7afe3f63e7bbdc
+EBUILD plasma-desktop-5.14.3.ebuild 3855 BLAKE2B 94aac2ed142295424fcbd016980b1f73e11c5ba63ea5b5e46df9fc2e93e94043469cd1e2ba819d5fee2bd3581d296030a4d4e29f4d1b3e963aeacaf3f7148d1a SHA512 5e8898d2b675e46d362099f22da89eb027332e384e3298a8b6971cc96bac04f026c71f14dc76da1e83a298d5ea27027009ad95847487fc2aa46f7b62cddcf60d
+EBUILD plasma-desktop-5.14.4.1.ebuild 3857 BLAKE2B 542d45e834e2d7baf5d55ce7a21cd9dbf4778acaa460031e456d02fed9640cd1eeedf708ee39b277707ac28e93c30958caa74423c09dd8b9ad24cea466e33761 SHA512 72a0c88a8374f7453e3b043f9e55b862321dfeb183c7b710d71eb1ec3cd1ab259a51a4d2e631936f8eb5207dbc5e0b26112fac840749a3c3406f70d4d3328091
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
deleted file mode 100644
index a495b075ca6b..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c1f3b45cabe0cf89e13a5b1c9b7a673992320826 Mon Sep 17 00:00:00 2001
-From: Thomas Surrel <thomas.surrel@protonmail.com>
-Date: Tue, 22 May 2018 14:20:25 -0600
-Subject: Activity switcher auto-hide when using Meta-Tab
-
-Summary:
-Commit 174aa217180434ab93b899d9c7cf967bd2daff7e created a new
-issue where the activity switcher would not hide anymore when
-switching activities with the Meta-Tab global shortcut and
-releasing the keys under one second.
-
-This patch fixes this by unconditionnal toggling the activity
-switcher visibility if it should be hidden, but keeping the
-timestamp condition before showing it, so that both Meta-q and
-Meta-Tab behaves correctly.
-
-BUG: 393912
-
-Reviewers: mart, ngraham
-
-Reviewed By: mart, ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D13012
----
- desktoppackage/contents/views/Desktop.qml | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/desktoppackage/contents/views/Desktop.qml b/desktoppackage/contents/views/Desktop.qml
-index 3272a89..3539050 100644
---- a/desktoppackage/contents/views/Desktop.qml
-+++ b/desktoppackage/contents/views/Desktop.qml
-@@ -73,17 +73,16 @@ Item {
-     property int lastToggleActivityManagerTimestamp: 0
- 
-     function toggleActivityManager() {
--        var currentTimestamp = new Date().getTime() / 1000;
-+        if (sidePanelStack.state == "activityManager") {
-+            sidePanelStack.state = "closed";
-+        } else {
-+            var currentTimestamp = new Date().getTime() / 1000;
- 
--        if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
--            if (sidePanelStack.state == "activityManager") {
--                sidePanelStack.state = "closed";
--            } else {
-+            if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
-                 sidePanelStack.state = "activityManager";
-                 sidePanelStack.setSource(Qt.resolvedUrl("../activitymanager/ActivityManager.qml"))
-+                lastToggleActivityManagerTimestamp = currentTimestamp;
-             }
--
--            lastToggleActivityManagerTimestamp = currentTimestamp;
-         }
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch
deleted file mode 100644
index 75b5bc27b2ae..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 1692ae244bc5229df78df2d5ba2e76418362cb50 Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Wed, 5 Sep 2018 18:58:35 +0900
-Subject: Improve arrow key navigation of Kicker search results
-
-Summary:
-Kicker already makes sure the first search result is highlighted
-and actionable while searching. This patch makes arrow-down after
-typing move to the second search result instead of merely moving
-focus from the search field to the list, so the user doesn't have
-to press arrow-down twice anymore.
-
-It also allows using arrow-left/right to jump to the other result
-columns, when the cursor is at the start or end of the text field,
-respectively.
-
-BUG:397779
-
-Reviewers: ngraham
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D15286
----
- .../package/contents/ui/MenuRepresentation.qml       | 20 +++++++++++++++++++-
- .../kicker/package/contents/ui/RunnerResultsList.qml |  1 +
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/applets/kicker/package/contents/ui/MenuRepresentation.qml b/applets/kicker/package/contents/ui/MenuRepresentation.qml
-index b70b76b..58cbf8d 100644
---- a/applets/kicker/package/contents/ui/MenuRepresentation.qml
-+++ b/applets/kicker/package/contents/ui/MenuRepresentation.qml
-@@ -393,7 +393,7 @@ FocusScope {
-             } else if (event.key == Qt.Key_Down) {
-                 if (rootList.visible) {
-                     rootList.showChildDialogs = false;
--                    rootList.currentIndex = 0;
-+                    rootList.currentIndex = Math.min(1, rootList.count);
-                     rootList.forceActiveFocus();
-                     rootList.showChildDialogs = true;
-                 }
-@@ -402,11 +402,29 @@ FocusScope {
-                     for (var i = 0; i < runnerModel.count; ++i) {
-                         if (runnerModel.modelForRow(i).count) {
-                             var targetList = runnerColumnsRepeater.itemAt(i);
-+                            targetList.currentIndex = Math.min(1, targetList.count);
-+                            targetList.forceActiveFocus();
-+                            break;
-+                        }
-+                    }
-+                }
-+            } else if (event.key == Qt.Key_Left && cursorPosition == 0) {
-+                    for (var i = runnerModel.count; i >= 0; --i) {
-+                        if (runnerModel.modelForRow(i).count) {
-+                            var targetList = runnerColumnsRepeater.itemAt(i);
-                             targetList.currentIndex = 0;
-                             targetList.forceActiveFocus();
-                             break;
-                         }
-                     }
-+            } else if (event.key == Qt.Key_Right && cursorPosition == length) {
-+                for (var i = 1; i < runnerModel.count; ++i) {
-+                    if (runnerModel.modelForRow(i).count) {
-+                        var targetList = runnerColumnsRepeater.itemAt(i);
-+                        targetList.currentIndex = 0;
-+                        targetList.forceActiveFocus();
-+                        break;
-+                    }
-                 }
-             } else if (event.key == Qt.Key_Enter || event.key == Qt.Key_Return) {
-                 if (runnerColumns.visible && runnerModel.modelForRow(0).count) {
-diff --git a/applets/kicker/package/contents/ui/RunnerResultsList.qml b/applets/kicker/package/contents/ui/RunnerResultsList.qml
-index 3627c2f..4e6dc2f 100644
---- a/applets/kicker/package/contents/ui/RunnerResultsList.qml
-+++ b/applets/kicker/package/contents/ui/RunnerResultsList.qml
-@@ -30,6 +30,7 @@ FocusScope {
-     signal keyNavigationAtListEnd
- 
-     property alias currentIndex: runnerMatches.currentIndex
-+    property alias count: runnerMatches.count
-     property alias containsMouse: runnerMatches.containsMouse
- 
-     Accessible.name: header.text
--- 
-cgit v0.11.2
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch
deleted file mode 100644
index 76b3e1b0f3ed..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From a4c724173b5c6a59331587f2e5db746dffbabdc6 Mon Sep 17 00:00:00 2001
-From: Roman Gilg <subdiff@gmail.com>
-Date: Tue, 4 Sep 2018 00:15:18 +0200
-Subject: [Mouse KCM] Avoid changes to touchpads in libinput backend
-
-Summary:
-Similar to evdev backend we need to ignore touchpad devices explicitly in the
-libinput backend because these are also pointer devices.
-
-XInput2 can do this in theory via input classes, but my touchpad did not set
-the class correctly. So just switch to using XInput like in the evdev backend
-to query all pointer devices and then use the XI_TOUCHPAD atom to filter out
-touchpads.
-
-BUG: 395401
-BUG: 395722
-BUG: 396269
-
-Test Plan: Manually
-
-Reviewers: #plasma, hein
-
-Reviewed By: #plasma, hein
-
-Subscribers: acrouthamel, ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D15256
----
- .../backends/x11/x11_libinput_dummydevice.cpp      | 32 ++++++++++++++--------
- 1 file changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
-index 6efca42..7ec314b 100644
---- a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
-+++ b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
-@@ -20,24 +20,28 @@
- 
- #include <libinput-properties.h>
- 
--#include <X11/Xlib.h>
- #include <X11/Xatom.h>
- #include <X11/extensions/XInput2.h>
-+#include <X11/extensions/XInput.h>
-+
-+static Atom s_touchpadAtom;
- 
- template<typename Callback>
--static void XI2ForallPointerDevices(Display* dpy, const Callback& callback)
-+static void XIForallPointerDevices(Display* dpy, const Callback& callback)
- {
-     int ndevices_return;
--    XIDeviceInfo* info = XIQueryDevice(dpy, XIAllDevices, &ndevices_return);
-+    XDeviceInfo *info = XListInputDevices(dpy, &ndevices_return);
-     if (!info) {
-         return;
-     }
-     for (int i = 0; i < ndevices_return; ++i) {
--        if ((info + i)->use == XISlavePointer) {
--            callback(info + i);
-+        XDeviceInfo *dev = info + i;
-+        if ((dev->use == IsXPointer || dev->use == IsXExtensionPointer) &&
-+                dev->type != s_touchpadAtom) {
-+            callback(dev);
-         }
-     }
--    XIFreeDeviceInfo(info);
-+    XFreeDeviceList(info);
- }
- 
- struct ScopedXDeleter {
-@@ -61,7 +65,8 @@ void valueWriterPart(T val, Atom valAtom, Display *dpy)
- template<>
- void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
- {
--    XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) {
-+    XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) {
-+        int deviceid = info->id;
-         Status status;
-         Atom type_return;
-         int format_return;
-@@ -70,7 +75,7 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
- 
-         unsigned char *_data = nullptr;
-         //data returned is an 1 byte boolean
--        status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1,
-+        status = XIGetProperty(dpy, deviceid, valAtom, 0, 1,
-                                False, XA_INTEGER, &type_return, &format_return,
-                                &num_items_return, &bytes_after_return, &_data);
-         if (status != Success) {
-@@ -87,7 +92,7 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
- 
-         unsigned char sendVal = val ? 1 : 0;
- 
--        XIChangeProperty(dpy, info->deviceid, valAtom, XA_INTEGER,
-+        XIChangeProperty(dpy, deviceid, valAtom, XA_INTEGER,
-                          8, XIPropModeReplace, &sendVal, 1);
- 
-     });
-@@ -96,7 +101,8 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
- template<>
- void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
- {
--    XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) {
-+    XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) {
-+        int deviceid = info->id;
-         Status status;
-         Atom float_type = XInternAtom (dpy, "FLOAT", False);
-         Atom type_return;
-@@ -106,7 +112,7 @@ void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
- 
-         unsigned char *_data = nullptr;
-         //data returned is an 1 byte boolean
--        status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1,
-+        status = XIGetProperty(dpy, deviceid, valAtom, 0, 1,
-                                False, float_type, &type_return, &format_return,
-                                &num_items_return, &bytes_after_return, &_data);
-         if (status != Success) {
-@@ -125,7 +131,7 @@ void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
-         float *sendPtr = (float*)buffer;
-         *sendPtr = val;
- 
--        XIChangeProperty(dpy, info->deviceid, valAtom, float_type,
-+        XIChangeProperty(dpy, deviceid, valAtom, float_type,
-                          format_return, XIPropModeReplace, buffer, 1);
- 
-     });
-@@ -161,6 +167,8 @@ X11LibinputDummyDevice::X11LibinputDummyDevice(QObject *parent, Display *dpy)
- 
-     m_supportsNaturalScroll.val = true;
-     m_naturalScrollEnabledByDefault.val = false;
-+
-+    s_touchpadAtom = XInternAtom(m_dpy, XI_TOUCHPAD, True);
- }
- 
- X11LibinputDummyDevice::~X11LibinputDummyDevice()
--- 
-cgit v0.11.2
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild
index 5e79908a990d..49a1c49347e0 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
index 35a5c34cce6d..5e79908a990d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
@@ -9,8 +9,8 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/libxkbfile
-	appstream? ( dev-libs/appstream[qt5] )
+	appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
 	fontconfig? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -86,11 +86,6 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
 	touchpad? ( x11-drivers/xf86-input-synaptics )
@@ -112,7 +107,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtgraphicaleffects)
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
 	!kde-apps/kcontrol
 	!<kde-apps/kde4-l10n-17.08.1-r1
 	!kde-apps/knetattach[handbook]
@@ -123,12 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/systemsettings:4
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-activityswitcher.patch"
-	"${FILESDIR}/${P}-kickersearch-nav.patch"
-	"${FILESDIR}/${P}-libinput-kcm-ignore-touchpads.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package appstream AppStreamQt)
@@ -136,7 +124,6 @@ src_configure() {
 		$(cmake-utils_use_find_package ibus IBus)
 		$(cmake-utils_use_find_package mouse Evdev)
 		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
 		$(cmake-utils_use_find_package scim SCIM)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
 		$(cmake-utils_use_find_package touchpad Synaptics)
@@ -155,14 +142,3 @@ src_test() {
 
 	kde5_src_test
 }
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
-		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
-	fi
-	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
-		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
-	fi
-}