gentoo resync : 26.11.2017

6 files changed, 130 insertions, 92 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index ad6de2a2f8f8..9ff6d1eeeade 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,9 +1,9 @@
-AUX 1.2.0-desktop-files.patch 1001 SHA256 80404a930c681ffbfdbac11235b0be24c6b4285f8ac8f2612cb928442e31a25b SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d WHIRLPOOL 523ad45f61d415d023de2604376e101adc2b247a1233e31a8abc768241e047889a50f06c28e55804a500a2d8071aea1d97d8d550be53940b03ac5bcde834de08
-AUX 1.3.0-OS-detect.patch 408 SHA256 e34b9270ac8fb6ed27fcf75b9450fafd7720a540903dc2ef342ecbc86ce91070 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b WHIRLPOOL 505c1ba31aed2180b516600053278f27c6c1d3e2ca567d2e7cb50896b7e30642cf84ff2dba84cd40490fe291a24ad514879bfe67b7689cea488a70a77edf7796
-DIST lumina-1.2.0_p1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
-DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
-EBUILD lumina-1.2.0_p1.ebuild 1597 SHA256 e585aa7a6baac5442e94023d135bec5f78eff6e9ea14c3d91e7dd6fd3b5b5bb6 SHA512 80e936102bcb783232e323b15051f17fc487f56bce3f91c5a5e7c21f4c559f5bcee02b80031d981377897d58213bfb4b576812627e7242c3e64c1407b2f6a549 WHIRLPOOL a446b51f5a11005fc4e8a5462a2c09949df4150f7a4b7ca4406fd977cc5e82edce621b50fc0d094168e48b2390592b4ca8b9bc0d80d20d0d7f9a82da6ac2197d
-EBUILD lumina-1.3.0_p1.ebuild 1462 SHA256 13da925bbf18fcb8cb6aae6add01268f7ab03bcbaabb1719fb58770f41e2c12d SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a WHIRLPOOL 4c731d705932427eab7c359b563742852236b0a1455c28b6b59e3310a751c911ac63ab17e728a986757fd564060a2facd91df62a1575dd1b66e1679645ff62a2
-EBUILD lumina-9999.ebuild 1388 SHA256 27fef91f532f765d9093b4f6d9058403b753f8c175897e7f0c2a198b632629b7 SHA512 3676f6aa70c001e6a9e04f44261dd669a5b5eb5bf2c8fd8625a1226804079339ecbf75d66ed61f0315fbf3951df39d036c76556c2221994653408dcbb2f369c3 WHIRLPOOL 34a651e9bf71cbb46aecdcd871dbf7891d88ebea31495b51485530f07445d266cc5a63f4f78fd5c9e4e46457c1aa18f6ba64dbcb28f09e354cabf1d6266a9847
-MISC ChangeLog 903 SHA256 b1b26b42764af12c8710a72f38f65da5021ad128b1127b34a5201198ec0d6dcb SHA512 f9ebd062b553ae8c644b723b05ff8db8936d8cf936ccd481954729f1a49c2cf45fc2742742f9091c15b553194e851b6a6b20be3b8867bf0c2c6be6f31420b253 WHIRLPOOL 3038057f792b98aeff7664198928e9ed3126feb82fd566c3e672abbef5a41557bd9ff5b28909b034db1befc6852f40cd21d569e2ce8305ff11526e2a4df5b2cb
-MISC metadata.xml 1959 SHA256 45fa6bb4b8c32add820b31c87d3e72dba94a3978c94bd819ab4bd93fddaec94c SHA512 05b50342a8ccfb076cdfd9f761162853d17d444323d364613b6bbfc7b0309d3afb0e7dfd33a5350babe6526c866596e5677bda54d219e3bcf57c96736bf83093 WHIRLPOOL 17515e587293bcec4564547f4ccad33b0c22c60d4130259e9148de062e0ef2e7d0495d98661d90eeafdadc31c3d8336e4c1289d5661a6be65421d5fe12f88b1c
+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
+DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
+DIST lumina-1.4.0.tar.gz 22489118 BLAKE2B 547d062826a6b253cb361db3fb030c182485d335dea3baff7e30f1331c67fbffca619dbee4688f79ac04ff04e5ef2ceeae0c1146d18730a25b7d01125bc62fd3 SHA512 7243fc366a851832d9431df8ae8cac0f70a7bc92bed1282e78e5775c6593d799a07e2cac7042d770c8d6c4758bb142523027d67227a2282b47ed945b0e617cb0
+EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
+EBUILD lumina-1.4.0-r2.ebuild 2596 BLAKE2B 32cf312812abffcf373f0c55873f295b02bd366838e82677ad3bc5b24238d08d356ff59c45958f6dfc2dd3b8168b30223e642df68c314bde04f6d6f3841d6a95 SHA512 1834805af41c1fd7a49c5c7489674149e41340e4f5b413e6d67c54242650402503a9beff342ed9b0ddf124bea5250cac16ab8bb733f9e027f763f7d5bb414db2
+EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
+MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/files/1.4.0-poppler.patch b/x11-wm/lumina/files/1.4.0-poppler.patch
new file mode 100644
index 000000000000..8b9399aed9c6
--- /dev/null
+++ b/x11-wm/lumina/files/1.4.0-poppler.patch
@@ -0,0 +1,10 @@
+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.2.0_p1.ebuild b/x11-wm/lumina/lumina-1.2.0_p1.ebuild
deleted file mode 100644
index 6ea490a4cf1d..000000000000
--- a/x11-wm/lumina/lumina-1.2.0_p1.ebuild
+++ /dev/null
@@ -1,70 +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
-	|| ( virtual/freedesktop-icon-theme
-	x11-themes/hicolor-icon-theme )
-	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"
-)
-
-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" L_BINDIR="${EPREFIX}/usr/bin" \
-		L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		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.4.0-r2.ebuild b/x11-wm/lumina/lumina-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..4bab7adf10bf
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.4.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
+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
+	desktop-utils? ( app-text/poppler[qt5] )"
+
+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"
+	"${FILESDIR}/1.4.0-poppler.patch"
+)
+
+DOCS=( README.md )
+
+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
+
+	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install(){
+	# A hack to avoid sandbox violation and install liblthemeengine*.so to the correct places
+	emake install INSTALL_ROOT="${D}"
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop "${ED%/}"/liblthemeengine*.so "${ED%/}"/lthemeengine || die
+	mv "${D}/${D}/etc" "${D}/etc" || die
+	mv "${D}/${D}/usr/bin" "${D}/usr/bin" || die
+	mv "${D}/${D}/usr/share" "${D}/usr/share" || die
+	rm -rf "${D}/var" || die
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	einstalldocs
+
+	remove_locale() {
+		rm -f "${D}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+	}
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 11c8d155760b..276d1056a915 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit git-r3 qmake-utils
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
-EGIT_REPO_URI="https://github.com/pcbsd/lumina"
+EGIT_REPO_URI="https://github.com/trueos/lumina"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml
index 174a8f3dbc82..9855a5e82816 100644
--- a/x11-wm/lumina/metadata.xml
+++ b/x11-wm/lumina/metadata.xml
@@ -4,18 +4,18 @@
   <maintainer type="person">
     <email>grozin@gentoo.org</email>
   </maintainer>
-	<use>
-		<flag name="desktop-utils">Build and install lumina's desktop-utils</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>ken@pcbsd.org</email>
-			<name>Ken Moore</name>
-		</maintainer>
-		<remote-id type="github">pcbsd/lumina</remote-id>
-		<bugs-to>https://github.com/pcbsd/lumina/issues</bugs-to>
-		<doc lang="en">http://lumina-desktop.org/handbook/</doc>
-	</upstream>
+  <use>
+    <flag name="desktop-utils">Build and install lumina's desktop-utils</flag>
+  </use>
+  <upstream>
+    <maintainer status="active">
+      <email>ken@pcbsd.org</email>
+      <name>Ken Moore</name>
+    </maintainer>
+    <remote-id type="github">pcbsd/lumina</remote-id>
+    <bugs-to>https://github.com/pcbsd/lumina/issues</bugs-to>
+    <doc lang="en">http://lumina-desktop.org/handbook/</doc>
+  </upstream>
 <longdescription lang="en">The Lumina Desktop Environment is a lightweight system interface that is designed for use on any Unix-like operating system. It takes a plugin-based approach, allowing the entire interface to be assembled/arranged by each individual user as desired, with a system-wide default layout which was setup by the  system administrator. This allows every system (or user session) to be designed to maximize the individual user's productivity.
 
 The Lumina desktop developers understand that the point of a computer system is to run applications, so Lumina was designed to require as few system dependencies/requirements as possible. This allows it to be used to revitalize older systems or to allow the user to run applications that may need a higher percentage of the system resources than were previously available with other desktop environments.