новый файл: lxde-base/menu-cache/menu-cache-1.1.0.ebuild

	новый файл:    lxde-base/menu-cache/metadata.xml
	удалено:       lxqt-base/lxqt-panel/files/ec62109e0fa678875a9b10fc6f1975267432712d.diff
	удалено:       lxqt-base/lxqt-panel/lxqt-panel-0.11.0-r1.ebuild
	удалено:       lxqt-base/lxqt-panel/metadata.xml

5 files changed, 35 insertions, 135 deletions

diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
new file mode 100644
index 0000000..f009891
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/metadata.xml b/lxde-base/menu-cache/metadata.xml
new file mode 100644
index 0000000..5f7b2ab
--- /dev/null
+++ b/lxde-base/menu-cache/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lxde</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/lxqt-base/lxqt-panel/files/ec62109e0fa678875a9b10fc6f1975267432712d.diff b/lxqt-base/lxqt-panel/files/ec62109e0fa678875a9b10fc6f1975267432712d.diff
deleted file mode 100644
index 8ffe41f..0000000
--- a/lxqt-base/lxqt-panel/files/ec62109e0fa678875a9b10fc6f1975267432712d.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
-index c4aa4e27..883df074 100644
---- a/plugin-kbindicator/src/x11/kbdlayout.cpp
-+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp
-@@ -33,8 +33,15 @@
- 
- #include <xkbcommon/xkbcommon-x11.h>
- #include <xcb/xcb.h>
-+
-+// Note: We need to override "explicit" as this is a C++ keyword. But it is
-+// used as variable name in xkb.h. This is causing a failure in C++ compile
-+// time.
-+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
- #define explicit _explicit
- #include <xcb/xkb.h>
-+#undef explicit
-+
- #include "../kbdinfo.h"
- #include "../controls.h"
- 
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0-r1.ebuild
deleted file mode 100644
index a372b90..0000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="http://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
-	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
-	statusnotifier sysstat +taskbar +tray +volume worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kguiaddons:5
-	kde-frameworks/kwindowsystem:5[X]
-	>=lxde-base/menu-cache-0.3.3
-	~lxqt-base/liblxqt-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	kbindicator? ( x11-libs/libxkbcommon )
-	mount? ( kde-frameworks/solid:5 )
-	networkmonitor? ( sys-libs/libstatgrab )
-	sensors? ( sys-apps/lm_sensors )
-	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	sysstat? ( =lxqt-base/libsysstat-0.3* )
-	tray? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender )
-	volume? ( alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${CDEPEND}
-	dev-qt/qtsvg:5
-	>=lxde-base/lxmenu-data-0.1.2"
-
-src_prepare() {
-		epatch  "${FILESDIR}/ec62109e0fa678875a9b10fc6f1975267432712d.diff"
-		default
-}
-
-src_configure() {
-	local mycmakeargs i y
-	mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \
-		networkmonitor quicklaunch sensors showdesktop statusnotifier \
-		sysstat taskbar tray volume worldclock; do
-		#Switch to ^^ when we switch to EAPI=6.
-		#y=${i^^}
-		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
-		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
-	done
-
-	if use volume; then
-		mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA)
-			$(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
deleted file mode 100644
index bc6d089..0000000
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
-  <use>
-    <flag name="clock">Build clock plugin</flag>
-    <flag name="colorpicker">Build colorpicker plugin</flag>
-    <flag name="cpuload">Build cpuload plugin</flag>
-    <flag name="desktopswitch">Build desktopswitch plugin</flag>
-    <flag name="dom">Build dom plugin</flag>
-    <flag name="kbindicator">Build kbindicator plugin</flag>
-    <flag name="mainmenu">Build mainmenu plugin</flag>
-    <flag name="mount">Build mount plugin</flag>
-    <flag name="networkmonitor">Build networkmonitor plugin</flag>
-    <flag name="quicklaunch">Build quicklaunch plugin</flag>
-    <flag name="screensaver">Build screensaver plugin</flag>
-    <flag name="sensors">Build sensors plugin</flag>
-    <flag name="showdesktop">Build showdesktop plugin</flag>
-    <flag name="statusnotifier">Build statusnotifier plugin</flag>
-    <flag name="sysstat">Build sysstat plugin</flag>
-    <flag name="taskbar">Build taskbar plugin</flag>
-    <flag name="tray">Build tray plugin</flag>
-    <flag name="volume">Build volume plugin</flag>
-    <flag name="worldclock">Build worldclock plugin</flag>
-  </use>
-</pkgmetadata>