gentoo resync : 18.05.2019

6 files changed, 16 insertions, 5 deletions

diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 0f6aaf0ed4b3..05a566b50549 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 59643c72dee9..3e7616752c10 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD lxqt-meta-0.13.0.ebuild 1695 BLAKE2B 3a8e34a40c873031f02e84ceeeff3b96cb14519e111dbcc12df56164d18f659843c720b74d96855ebddf4c27974a70aac7289b0ef052a0bac18f146b2450849e SHA512 634ec73834ad8479249c7b3fd07ecfac8daad2bf0c4299e79712ff6a6a7245a9c0337719c5b0956ff0a8e64a535bdc5ef1741ac50b06e7ed50a5fc46ef14e87c
-EBUILD lxqt-meta-0.14.1.ebuild 1668 BLAKE2B 3c9db69fa73ecdf1a2b0065ecf873adc2791da70173c80b37b27a5ac3a49c64510bcadc5fcf94e791207ef7f9bcf4f9d5c56e2c18ef4b0f13020e58dccaf09c4 SHA512 bf776c5d4b1ad468ec6080082bb4cb6c61356556f0e7b13ea2cb4ef8df17c0e93ed1111424faeffaeb8d095a78e66e3a0afb2214db87a45ea2457ac8ffbd1fa1
-MISC metadata.xml 1405 BLAKE2B 0429df038c2609bd4685b4aae435270ee87213f80147f2deb7ab8b4aff265fbd028dea1d47c8917f53ad5c1540dcc37f968f963a0a2ce0dc9eb5444d816b19c5 SHA512 aa40146c3397e8e6c3384c2bf8b9a134d79b82ad67c14ba37e4b5245d4738e5a9bbc5115889c88f9f0e774830b92c87ddf94ef490162c25c83c4c4deba187005
+EBUILD lxqt-meta-0.14.1-r1.ebuild 1743 BLAKE2B 60c1abe6c5880dadbde36d6b691c0584bb682b0d8a982a93a7909b959784cb857a421dc48ceef3aa3f9f61aa1533e1ae2da058a1eb3b7775ac99feb7fc512c8e SHA512 dfdc49b6058dec6e75e7cad52ff7f4bf30a6e7565ca39ffb531e266c96d02f75070e0881fb5fee7d3b18a59dae3d56f2f1e4b0d6e2167c7f3f90e2c5099d04c5
+MISC metadata.xml 1526 BLAKE2B 904b5a67781f80fe9467970ea81a52444e5936114ffc5e7e91ee2da9ea68f1d2bc16531e76d08345bf258b1cf3025a63f9333d4bfe74b5a04329c982abab868f SHA512 b8a34fdc1db1caf60524fb7348da13bbe2064dc71a4943c60fbdbfac6a676a5c283e78c77729004952a4f88826c1af7a0435d4aed0db6ae0a96afc5a28998435
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
index c1cc47e1f015..c1ba932bbeaf 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
@@ -14,9 +14,12 @@ fi
 
 LICENSE="metapackage"
 SLOT="0"
+
 IUSE="+about admin +filemanager lightdm lximage minimal nls
 	+policykit powermanagement processviewer screenshot sddm
-	ssh-askpass sudo terminal"
+	ssh-askpass sudo terminal +trash"
+
+REQUIRED_USE="trash? ( filemanager )"
 
 # Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
 # install expects oxygen icons, until the user specifies otherwise (bug 543380)
@@ -50,4 +53,5 @@ RDEPEND="
 	ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV} )
 	sudo? ( =lxqt-base/lxqt-sudo-${MY_PV} )
 	terminal? ( x11-terms/qterminal:0 )
+	trash? ( gnome-base/gvfs )
 "
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 0017a396e654..5b3bc3eec067 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -20,5 +20,7 @@
 		<flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> user password prompt tool</flag>
 		<flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag>
 		<flag name="terminal">Install <pkg>x11-terms/qterminal</pkg> package</flag>
+		<flag name="trash">Install <pkg>gnome-base/gvfs</pkg> to enable 'trash'
+			functionality in x11-misc/pcmanfm-qt</flag>
 	</use>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 7bcb19573b4c..b402406eb9b2 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-panel-0.13.0.tar.xz 273924 BLAKE2B affed55daf1c0a4bf20faeb35278a7d0c7474e514627d24c33469954bcf57ef2c5ee0ac1346918a3edc58f929f07a923e730d0c8ec1d32eeb3d2af41134beced SHA512 f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3
 DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
 EBUILD lxqt-panel-0.13.0.ebuild 2881 BLAKE2B bb9694192d9a3beb262d16faa94fe3fc21bef539bf15d1b267e5ec24594f633e5baca6b8d02566abd29b18be3a47adbee8a55abf576b79ee18de3c25e6a6a9de SHA512 a3c8a76c97111435069c591a7d122c8201604a55676c5e4e002d919379e659a40eb4927b711b9bd7d9e112d500a7f1830d1f7021eca00713b75181b3e0ab8d08
-EBUILD lxqt-panel-0.14.1.ebuild 2764 BLAKE2B 3611109fbcfee8851f9cbe8b0e1a6fdcaa1f3a4ac84246f5ebbc5efe02ed2cf2e5a1607c9849f87263335821e1bee4ab26f2d62cdc5816aa9a6a66c60749d200 SHA512 738b327f173c3ff234e758be1b8c61c54e9391fcf0b860f6a241a166a89c75e6bb7c1c86dd1b8c30054cd03ba42eda62ea8277d46e6e5969c4b69a3e5e138f3d
+EBUILD lxqt-panel-0.14.1.ebuild 2888 BLAKE2B 0775669c929d8f06046844223d576bd866d1ab1e642531b9ca5812d46b361cf93ce6bd1602e0cf47b386d70c5a510998e544504705e0ca43f28ead74a44f96f3 SHA512 e1e2e2cb33fa785c9feae8acf91ed73111a626526651a225df6f08a4ad58aa33437c23f4f1e9ea342b7ad66fd5d60410cb332704fd6f2f654925286ecafd47ab
 MISC metadata.xml 1505 BLAKE2B bab5a3343f1b765980b9b59a7a7d2b3d4e9968e9f47c2d9965bd1cc59b9770d69e543ecb2adf0c65bed3324becd988e7388218ddc19039a895ede16713014b80 SHA512 3c4775f11a763645878d24f3f5cf4a6c6b8622ee6bb6ccc8cd28582eedc8092030dcff06734db1c3266f13a076a63e1474d1334c206fb4d0bc55829eb3f9f1b4
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
index d63d618db914..9ef997edc34b 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
@@ -23,7 +23,12 @@ SLOT="0"
 IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu
 	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
 	+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
+
+# Work around a missing header issue: https://bugs.gentoo.org/666278
+REQUIRED_USE="
+	|| ( desktopswitch mainmenu showdesktop taskbar )
+	volume? ( || ( alsa pulseaudio ) )
+"
 
 BDEPEND="
 	dev-qt/linguist-tools:5