x11-wm/lumina: cleanups

Package-Manager: Portage-2.3.14, Repoman-2.3.6

2 files changed, 12 insertions, 86 deletions

diff --git a/x11-wm/lumina/lumina-1.4.0.ebuild b/x11-wm/lumina/lumina-1.4.0.ebuild
deleted file mode 100644
index e77758c2ea9f..000000000000
--- a/x11-wm/lumina/lumina-1.4.0.ebuild
+++ /dev/null
@@ -1,74 +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
-	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"
-)
-
-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(){
-	# 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
-}
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.