gentoo resync : 02.06.2019

9 files changed, 108 insertions, 37 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index c52131ee4dfd..6e2c8211811b 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 14b0546547bb..f8a574702fda 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD lxde-meta-0.5.5-r5.ebuild 953 BLAKE2B 35a9808c50cb78a34283407de3bf1e484ea3308a79b1a5725631d965ef52c079c80cb56be05bc3f636cc76c5bf59c4835ac8253c5bacab885ed0b8631deb54b0 SHA512 5605a730a11f11716542f8c86f1f42c6743b4afe9d27d41195ce283cceee8002471c35ba33ef130670f22e77c22671d04b8daeef7958ba9a0d4b300cad222b60
 EBUILD lxde-meta-0.5.5-r6.ebuild 950 BLAKE2B 32b53bd5e4297cdc8053d91373baa8480996fb5af8ff8d70ff2de7d5baba07f4d9a5f2bf327fa41510218d31b69cd27686549371d80d07e9b82f34cc9b6e2d4e SHA512 b22f33a762412dfcc664312397bb71f0dc30fa7f96b96449b172b6df4ed9c0d48d2899394bff4a8030f1329d87f075cc5a9530be6b8939895604a11bb353a7d4
 MISC metadata.xml 257 BLAKE2B efad62f245bde8ac51046146d034662f80c0d53ba081e1b308572facf6104e001af8d874e5429c2ad7f2c587545091f286e607fb53e353ee6eddacf01846d9ce SHA512 f25b418b4204c0b1b8c3a08ae8cad894c8352b5f49ca653ec9fb028eb5e0cd1f3a8ce26ca5acce609085b8fd73e49586d8c34ff5f0808ff9cb9688c8aafd8c69
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
deleted file mode 100644
index 767a9d1dfb9b..000000000000
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
-HOMEPAGE="https://lxde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86"
-IUSE=""
-
-RDEPEND=">=lxde-base/menu-cache-0.3.3
-	>=lxde-base/lxappearance-0.5.5
-	>=lxde-base/lxde-icon-theme-0.5.0
-	>=lxde-base/lxde-common-0.5.5
-	>=lxde-base/lxmenu-data-0.1.4
-	>=lxde-base/lxinput-0.3.2
-	>=lxde-base/lxpanel-0.5.10
-	>=lxde-base/lxrandr-0.1.2
-	>=lxde-base/lxsession-0.5.2
-	|| ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
-	>=lxde-base/lxtask-0.1.6
-	>=lxde-base/lxterminal-0.1.11
-	media-gfx/gpicview
-	x11-misc/pcmanfm
-	x11-wm/openbox
-	>=x11-misc/obconf-2.0.3_p20111019"
-
-pkg_postinst() {
-	elog "For your convenience you can review the LXDE Configuration HOWTO at"
-	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
-}
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index f1d5f3118d60..260d50b97379 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -4,5 +4,5 @@ AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
 EBUILD lxdm-0.5.3-r1.ebuild 1601 BLAKE2B 9462ffa28e673e6d33bc8998ac5d87422af87e1ae659a6a749153f13e00f16028c6338036e4db30f17326b298d10dcba1f26150e3ecca0231e8b053166fa0657 SHA512 cfe4f814cea30c4ca305ec88266cfc3e4ec7048a13d62297f4dfa477a35aac73dcd57b108b09a5190f499e4ef12126ccb3c3c8e52c81f45a853ad4cdd16f4cd6
-EBUILD lxdm-0.5.3-r2.ebuild 1830 BLAKE2B cbe3d0b5b1e00e7a10fed92e32dac6c5ccea52193bbb031829d30925e439b04de13ba2d6a8f3150cf3cba0ec6ba81ef974132473e19ed4cdf1725d8f692250b4 SHA512 5d353b584fce136f90ccd3d3babd4083a5a0cc9f4a917ed758fcb10fb19d3eaf7f4f0f9a331a47c8371a729f59d7e3ce2d04ff61f605273058a0e5b03930d714
+EBUILD lxdm-0.5.3-r2.ebuild 1829 BLAKE2B 639cd342a2f2951a00f423a6d1118994736d36b89a6d6d80e39382d77da59c57db685733e99f79b6e09ef6b0c8382f260d6a936d4038db55db4ca69b4abee92a SHA512 e929cee459f10b7525ca97845139782a09711a76998c925d10f4be2560c33c05f3c0fc2c1096a427644db687e6bd1b2dfbb0f25e90e305872097d7525a1fb7de
 MISC metadata.xml 581 BLAKE2B 1fa67dfa056b08a3797120c83b23a11014a0b15a0c9ca6f6323c77ed80654c67cf1ffa7f4877af66286bf739f77ccbd7a997459abc85d7db7d240519bd60d496 SHA512 bfb1509cb2c43f2711a38c284a1a4152192b91c5a9f681fe063848cbeb39e8a2185d2bff084d08b0d9583cb2482101e23ce955aa9b81606a2bc270a657d7a2d1
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index 543eded4fd2a..6a29e48fcaa1 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 
 IUSE="consolekit debug elogind +gtk3 nls pam systemd"
 
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 2b86325f5880..9e10f97491ad 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -3,5 +3,7 @@ AUX lxsession-0.5.2-key2-null.patch 1051 BLAKE2B 9ebf6b30c49ab4f9dcd3506fc38019f
 AUX lxsession-0.5.2-notify-daemon-default.patch 709 BLAKE2B 7f2c75ce81e70abbe0c9621d6d5605a87925f2231d86644dadf93235349a90fa733b75b9a371833c4b8b482b43c644c617f041ac1f29df1d94550cc0d7abd7c8 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c
 AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75e264fd45b1861b05ece4085a3fc48be94ccc60011e496eba605410cf1d7f08289b49e1a62e6b7b562b0edeef1bff50 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1
 DIST lxsession-0.5.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1
+DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
 EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
+EBUILD lxsession-0.5.4.ebuild 1311 BLAKE2B 01b9d7d65131918545a0290174e75ec1085b9d282c6a5c20897942dbe7b36474b3462849307044159f4d0d36c72c2b612bc6bf900b2a98979471fa212949d15f SHA512 be85604140af0e52cd71695bdab0b315322cbc8e69253181821227c33f3df3d58c9b386763749cb6d2056a54f014da05e87c14ffc11baf16f592fedd46a38f0b
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/lxsession-0.5.4.ebuild b/lxde-base/lxsession/lxsession-0.5.4.ebuild
new file mode 100644
index 000000000000..e9fb636e8f23
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+SLOT="0"
+
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libgee:0
+	dev-libs/libunique:1
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+	"${FILESDIR}"/${PN}-0.5.2-fix-invalid-memcpy.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	# gtk3 looks to not be ready, follow what other distributions are
+	# doing
+	econf \
+		$(use_enable nls) \
+		--disable-gtk3
+}
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index b419f748965b..a1aa8b7f024c 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,5 +1,7 @@
 AUX lxtask-0.1.7-fix-no-common.patch 2102 BLAKE2B b0329dcdaf9b958b3376d3a641fd392980affedea52a432bfb7b88c5dbb6145ead473b4eb6ec52cd49f76469c706bc241b5b3b618d8d12f6fccea2bdc5e860c2 SHA512 74b8f187836a70e7c144b5e0f7b0fc06ac1bd2c8db5559360c709bb441293b0fa92ba41e9b02f7e455d231ddeb6d7822dd8e3859c20252e0bceab391cefb6d2e
 DIST lxtask-0.1.8.tar.xz 137288 BLAKE2B 05a69cfeb8d4801cc0ee7fa502f23d98992e3eff7c5d02ddac8c46942da366224a669704d174723c9857b13396a23aa2bbe4ac0e35afac6f6c65b0e9869bebbc SHA512 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a
+DIST lxtask-0.1.9.tar.xz 138000 BLAKE2B 1f26cf4c4ce0ab64cd6b3bf6b7539aead92da2a816f66f4dd53d170f48aee8d824993b26d316535dc23f8539c33f9b31c89a631f2bc8ed4778675a3c001ea470 SHA512 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d
 EBUILD lxtask-0.1.8-r1.ebuild 965 BLAKE2B 403261a84811f1f5ce3b5eba2c38a124c4ea144160c5ba18161aec57fc4986b42b073512f5819e1603178a7acff019494c1eff7bd0f87838baf370b75b729654 SHA512 2e42807ca81f0ec0d4fca2077b403a45301cdb791ec2b2217833903ba62a5f479aeb17b1fef7abba1ec4c3d15d676b5f06e79b0ebfd9f0f4b6d7de56a6fb48b2
 EBUILD lxtask-0.1.8.ebuild 582 BLAKE2B d1c44263e026b4797dba64945f4390af83de51fe59228b3aaf6e5b56a97d9f2297c3dc3cc2a65dbdbd460fb158330d45a31304abfcc84c16207b0de0d557d43a SHA512 913f9f5f9fe2e3f1c350ebeaaf6973da45c9caefe00dd4c1891cb0f57de76bd85619e2991880d010cba5edb9cb000417865993de477eef19d37208e3af836850
+EBUILD lxtask-0.1.9.ebuild 966 BLAKE2B efd9155fb2ad64004d23fd4d3598814502f89656f4c9f5d98829ccad9795a70aa1d2f10fa53cb05fa0f03d88f5e04a153691673788169e53dde142dc1555dba0 SHA512 4c57d4acc412df94b80a52e7d6a82a5e13ba300ce60cef61979accf74cd00ab82e58ac94b283fc84ca9e3359196df1c9c32bf1757d21f5ac749bd0a6d559d759
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxtask/lxtask-0.1.9.ebuild b/lxde-base/lxtask/lxtask-0.1.9.ebuild
new file mode 100644
index 000000000000..71ab48b914c6
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr
+frp gl he hr hu id is it ja kk ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt
+ro ru sk sl sq sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
+
+PLOCALE_BACKUP="en_GB"
+
+inherit l10n
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXTask"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+# Upstream report:
+# https://sourceforge.net/p/lxde/patches/535/
+PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
+
+src_prepare() {
+	default
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}