gentoo (leap year) resync : 29.02.2020

7 files changed, 25 insertions, 117 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index fcd8d3afba92..944b33900044 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,12 +1,8 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
-AUX 1.3.0-OS-detect.patch 408 BLAKE2B d12dff0ac02af8542367ead135f9205e4e310acc3f4afcf222bb4fb0ba1eb395f2acc3fa7c7ae53ed5962da125458e0447996a96af600fa283ff4fa9485f1037 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b
-AUX 1.4.0-poppler.patch 511 BLAKE2B a81c3086043dadfa62cc493a37ca22044a74d2e4966ea880f0dad96f3d0940445e9cfb575a6cc8525aa22f6c313fdea11d3c39ee00905a50f349bc69fc472d5e SHA512 fe765f11ecb7dc99d421d8e4b6fb3fc18279755fbc7ef41517d315e2ca3fa703ab7826f6ce2de62198354379c66d02e1dd4240f33d9f621fa1e9837fc2222b60
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
-DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
-DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
-EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
-EBUILD lumina-1.4.0_p1-r1.ebuild 2158 BLAKE2B ce102e9cf2a5dc026ae83205dedc31cfd3295de9c38bb88f899fd09e509067711620a5643fc7b5ff571547a9c8b134f3cdb5db3ae365af174cd8db774e71ad16 SHA512 5087d59aaa8be0b47672b5f66db4db3d068f47021e8a41e65d63f73fcc1192d93cb7fe36d48fb5b7dd7f02fa889832055a26c50ac7a78e3c3fef0e7c336b2bca
-EBUILD lumina-1.5.0-r1.ebuild 2413 BLAKE2B 3ef16d92410e888f429767045519962327f942e88484c7e5b5a0fca22140c48eb23031f22a19117291d70b128d2429327c37043f7a21ee0657f3b2fb3c7e7469 SHA512 a110a66e1dad7c748ff773172a85635f7dc7e449a129ed4f741df664e149c08f1a48e129fa833dcde9388aee828f6983e248afa3d828f243fc903d4626df9ee4
-EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
+DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
+EBUILD lumina-1.6.0.ebuild 2418 BLAKE2B 5edf64f68c136c88d406cb51ad273a1c1be9aad51762c54125616569a90e9ab9568a2f9582ddf2db8209d97f04791b8ffd6088004b6b4cc2fec57180edc54645 SHA512 4186526b3679ba0c708b4c8a061742dedafb640b97db1cd3fe49ce93aaeed57d96a542d5cc5c5e7342f60fe49d6aefda65e4205c06accc49b6d2f3f1e6735fe9
+EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
deleted file mode 100644
index 48a2076f3aaf..000000000000
--- a/x11-wm/lumina/files/1.3.0-OS-detect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src-qt5/OS-detect.pri
-+++ ./src-qt5/OS-detect.pri
-@@ -76,6 +76,11 @@
-     equals(LINUX_DISTRO,"Fedora"){
-       isEmpty(L_ETCDIR){ L_ETCDIR=/etc }
-     }
-+    equals(LINUX_DISTRO,"Gentoo"){
-+      isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
-+      isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc }
-+      isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
-+    }
-   }else{
-     OS="Unknown";
-   }
diff --git a/x11-wm/lumina/files/1.4.0-poppler.patch b/x11-wm/lumina/files/1.4.0-poppler.patch
deleted file mode 100644
index 8b9399aed9c6..000000000000
--- a/x11-wm/lumina/files/1.4.0-poppler.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro
---- lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro	2017-11-21 23:21:47.000000000 +0700
-+++ lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro	2017-11-25 19:17:01.771778161 +0700
-@@ -26,5 +26,5 @@
- 
- LIBS += -lpoppler-qt5
--INCLUDEPATH+= $${L_INCLUDEDIR}/poppler/qt5
-+INCLUDEPATH+= /usr/include/poppler/qt5
- 
- TRANSLATIONS =  i18n/l-pdf_af.ts \
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
deleted file mode 100644
index bacd2527eb97..000000000000
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="desktop-utils"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
-	x11-libs/libxcb:0
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm"
-
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-	sys-power/acpilight )
-	media-sound/alsa-utils
-	sys-power/acpi
-	app-admin/sysstat"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.3.0-OS-detect.patch"
-)
-
-src_prepare(){
-	default
-
-	if use !desktop-utils ; then
-		rm -rf src-qt5/desktop-utils || die
-		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-	fi
-}
-
-src_configure(){
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install(){
-	default
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
-}
diff --git a/x11-wm/lumina/lumina-1.5.0-r1.ebuild b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
index 1a09bc9bc7b4..a55056735a3b 100644
--- a/x11-wm/lumina/lumina-1.5.0-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,7 @@ PATCHES=(
 
 DOCS=( README.md )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -63,12 +63,12 @@ src_prepare(){
 	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	emake install INSTALL_ROOT="${D}"
 	einstalldocs
 	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
diff --git a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index 27374bbd02dc..7ec4ca3bc6d1 100644
--- a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
 
-inherit qmake-utils l10n xdg-utils gnome2-utils
+inherit qmake-utils l10n xdg-utils
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
@@ -18,12 +18,13 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtmultimedia:5[widgets]
 	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -47,12 +48,11 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.4.0-poppler.patch"
 )
 
 DOCS=( README.md )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -63,14 +63,18 @@ src_prepare(){
 	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	emake install INSTALL_ROOT="${D}"
 	einstalldocs
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
 
 	remove_locale() {
 		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
@@ -82,11 +86,11 @@ src_install(){
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 276d1056a915..6881413499cb 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,7 @@ PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
 )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	if use !desktop-utils ; then
@@ -55,12 +55,12 @@ src_prepare(){
 	fi
 }
 
-src_configure(){
+src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
-src_install(){
+src_install() {
 	default
 	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
 	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die