gentoo resync : 24.12.2018

5 files changed, 52 insertions, 3 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 7e71876b2437..a2fb7199b1b2 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 4e456284aac4..2b86325f5880 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -3,5 +3,5 @@ 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
-EBUILD lxsession-0.5.2.ebuild 1793 BLAKE2B d9ca4ff641e115d07887ade84a0d72fd7944d8a5b8232a2d99b36429317286249ed10ca3de11180176ceeb850ea452477de3cd8ff1290fe4ba55766398acf707 SHA512 353259b2f136864a57a56063ae8f104355afbc9424d807f9d5b387dd0b3f782c69adb46bf5add7a662c7fcad58e0baa306ac1a504b0e2f6098a56b2a909e04a1
+EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/lxsession-0.5.2.ebuild b/lxde-base/lxsession/lxsession-0.5.2.ebuild
index 612fe3e4ccb6..84ca13270d27 100644
--- a/lxde-base/lxsession/lxsession-0.5.2.ebuild
+++ b/lxde-base/lxsession/lxsession-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxsession-edit
 	sys-apps/lsb-release
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+	upower? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index f424f811c2e6..3661a242809e 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,3 +1,5 @@
 DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
+DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
 EBUILD lxterminal-0.3.1.ebuild 1194 BLAKE2B 03216f78192a5966b8f30032be30c032983675883f68c479150d52ba8905a01e44b8e43a3d6c34a7859081ca06c7a73856db38224aeaad0e079bb2db412800ca SHA512 3a4971f6ebdb7f21dd30608196e400981feb4213ca5e0b0fa7d837c91151106a61ee7bca68b2d161be30885f2f1efda787eb425e94907d740e54f7e73d75c1fa
+EBUILD lxterminal-0.3.2.ebuild 1195 BLAKE2B c27a79f25f528586d242c9c0c100287d6edf39973144a292a4523d92fc2f7f00f289cd08469b3c461f42025a14ea7fabf34809173bb9ecf82883d9eec33bd8df SHA512 3e88dfe07e9e6d0355bd7b201d5b499ec827c0a9afba94e05d11c8eff4a96ebfe994fd53f86b4fca4eea7418f18ab487e73ac8e0b7114dae3348d66fc3b738a3
 MISC metadata.xml 408 BLAKE2B 46853cfafd4a24907018aa2f99cf01f261d2ba37bdadd119e70493a6632e14b8dfec1dd0359c2192940c0c272d38e7c482a83590c7e775a06587b0bf4059e57b SHA512 2542f3365bcca18cfbb25bbe5a58b569bc7480ab42df1d86238e7dc1b52968387440f588394421b7b9ddcebb3c26709630a92ad3670684fa6b510d1cabc58907
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2.ebuild b/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
new file mode 100644
index 000000000000..a11e78007f3a
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn bn_IN ca cs da de el en_GB eo es et eu fa fi fo fr frp gl
+he hr hu id is it ja kk ko lg lt ml ms nb nl nn pa pl ps pt pt_BR ro ru sk sl sr
+sr@latin sv te th tr tt_RU ug uk ur ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit autotools l10n
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/lxde/${PN}"
+	inherit git-r3
+	KEYWORDS="amd64 arm ppc x86"
+else
+	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk3"
+
+RDEPEND="dev-libs/glib:2
+	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 )
+	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.91 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	econf --enable-man $(use_enable gtk3)
+}