lxqt-base/lxqt-session : EAPI bump

1 files changed, 40 insertions, 24 deletions

diff --git a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
index cf6db38c..151187a6 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
@@ -1,63 +1,79 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="LXQT session manager"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-KEYWORDS="amd64"
-IUSE="+gtk"
+MY_PV="$(ver_cut 1-2)*"
 
-LICENSE="GPL-2 LGPL-2.1+"
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="+gtk +themes +udev"
+
+LICENSE="LGPL-2.1+"
 SLOT="0"
 
-CDEPEND="
-	>=dev-libs/libqtxdg-3.2.0
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=lxqt-base/lxqt-build-tools-0.6.0
+"
+DEPEND="
+	>=dev-libs/libqtxdg-3.3.1
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 	kde-frameworks/kwindowsystem:5[X]
-	~lxqt-base/liblxqt-${PV}
+	=lxqt-base/liblxqt-${MY_PV}
 	x11-libs/libX11
 	x11-misc/xdg-user-dirs
-	gtk? ( ~lxqt-base/lxqt-config-${PV}[gtk] )"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	dev-util/intltool
-	!!lxqt-base/lxqt-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	~lxqt-base/lxqt-themes-${PV}"
+	themes? ( =x11-themes/lxqt-themes-${MY_PV} )
+	udev? ( virtual/libudev )
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
 
 src_prepare () {
 	if use gtk; then
 		# Redcore patch, to override default platform plugin to qgtk2
-		epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch
+		eapply ${FILESDIR}/${PN}-override-default-platformplugin.patch
 		cmake-utils_src_prepare
 	else
 		cmake-utils_src_prepare
 	fi
 }
 
+
 src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	local mycmakeargs=(
+		-DWITH_LIBUDEV=$(usex udev)
+	)
 	cmake-utils_src_configure
 }
 
 src_install(){
 	cmake-utils_src_install
+	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
+
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/usr/share\" >> 91lxqt-config-dir
+	doenvd 91lxqt-config-dir
+
 	dodir "/etc/xdg/lxqt"
 	insinto "/etc/xdg/lxqt"
 	doins "${FILESDIR}/session.conf"
-	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
+
 	dodir "/etc/X11/Sessions"
 	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
 }