[gentoo-commits] repo/gentoo:master commit in: x11-wm/enlightenment/

[Michał Górny]

commit:     c13587cb8abbb4c75a5dd457b43cb52b29c3e2d7
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Fri Apr 13 15:11:36 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 11 08:44:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13587cb

x11-wm/enlightenment: disable module_check from 0.20.5 & 0.20.6

Bug: https://bugs.gentoo.org/648896
Package-Manager: Portage[mgorny]-2.3.26.1
Closes: https://github.com/gentoo/gentoo/pull/7970

 x11-wm/enlightenment/enlightenment-0.20.5.ebuild | 23 +++++++++++++++++++----
 x11-wm/enlightenment/enlightenment-0.20.6.ebuild | 23 +++++++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
index 88a5cec9394..9d9e764576e 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}

diff --git a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
index 0cd5bfe7261..130c64f8a4c 100644
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ else
 	EKEY_STATE="snap"
 fi
 
-inherit enlightenment
+inherit enlightenment xdg-utils
 
 DESCRIPTION="Enlightenment DR17 window manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -57,7 +57,10 @@ RDEPEND="
 	>=dev-libs/efl-1.17[X]
 	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+"
 
 S=${WORKDIR}/${MY_P}
 
@@ -91,7 +94,9 @@ check_modules() {
 }
 
 src_configure() {
-	check_modules
+	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
+	# see #648896. Can be restored with future release
+	# check_modules
 
 	E_ECONF=(
 		--disable-install-sysactions
@@ -125,3 +130,13 @@ src_install() {
 	insinto /etc/enlightenment
 	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}