gentoo resync : 10.04.2018

3 files changed, 21 insertions, 13 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index de91529705cb..a4a7efbfe97c 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index c33d3f7ae716..039a585eb04e 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1,3 +1,3 @@
-DIST avogadro2-0.9.0.tar.gz 1096442 BLAKE2B b2c986b57fa5a9ea8876316f403bef55e9dd1f0a61d9320876935635952ef4e8443fc763a0f57595007e3a9c681d2fa083cf417b94e66b22dd188b05b6db8343 SHA512 bc780b1f45822ffc6cef82cf5fbe04cfbab035e553037959965eb0cad2c3f87e53bc71a574c7154cae5909377c74d14708550070c1794bdd5d83d738846b03ba
-EBUILD avogadro2-0.9.0.ebuild 1031 BLAKE2B b2ac4270f45784ee9f0181dd916ce3dea3cc0fa016ed65d25818fa0415d3848e9491d822e40458a7595da2ab19f11582f328fcb49eda21372a0c96e1cabbb0cf SHA512 3290929eca3db226824837533d8e0da2e13bc9aa8b7c4ae449aed7ebca743b2b669cb1cc3151a9df47ee30b932b149bd6b55ff4bf2e7e2d5934f1a10dca9a922
+DIST avogadro2-1.90.0_p20180211.tar.gz 1099312 BLAKE2B fbf8e2006c46114632587615b48ac130e45a46ce2859a9c34270714091bc8397d9d7a93c3166bf58833f100e3e40afd1962012e479a8f92ba8ff9078200d51c5 SHA512 db9b0983d2161df493138ddf18c5dbda54cf2f8b75ebc944f1f57dab0f1e2048582362e5f46a78b1610aba080aaac8a66d2b2b71db748e031ffde306d3609856
+EBUILD avogadro2-1.90.0_p20180211.ebuild 1225 BLAKE2B 28916f43f2a48e1cb855f70a2ca3df5a03438420841481bc4d33816333c3f54e04979c5d06238ece6c990ca8458862eeba04b7f060b3cb69ae0d5b82c63f96ad SHA512 249c0905f92fd3021da53327945ece37e30d48650b4a47267231f5833a85a1d97d27f3e87e3b41255ae4d9ce67f0169cdbc06c755db99c895cc3e57b8edb2a7c
 MISC metadata.xml 513 BLAKE2B f721104691759eb8a87d9cb6dd56bef45ac151e180caa68376406274a57df6c04e3fec6ba6d7e2aabf4355356002d27dd92e5b850c55103b3b23340d9b64d891 SHA512 4209c0681f7055b240f1054a10d58d5c22dca467903096ab1f5eb1b8cf276990f694b2033b4e9b4e4838cce65dd7c7660633079764248f394e32ece0048f09a0
diff --git a/sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild
index 201fc77dace6..8b017684a578 100644
--- a/sci-chemistry/avogadro2/avogadro2-0.9.0.ebuild
+++ b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
-
 MY_PN=avogadroapp
-MY_P=${MY_PN}-${PV}
+COMMIT=d5e1f827be7e9d1cc6755fd68a2b42b0b1d2ec32
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Advanced molecule editor and visualizer 2"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="https://github.com/OpenChemistry/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.openchemistry.org/"
+SRC_URI="https://github.com/OpenChemistry/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD GPL-2+"
@@ -20,9 +19,8 @@ IUSE="doc rpc test vtk"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	~sci-libs/avogadrolibs-${PV}[qt5,opengl]
+	>=sci-libs/avogadrolibs-${PV}[qt5,vtk?]
 	sci-libs/hdf5:=
 	rpc? ( sci-chemistry/molequeue )
 "
@@ -31,13 +29,13 @@ DEPEND="${DEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-RESTRICT=test
+RESTRICT="test"
 
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
 
 src_prepare() {
 	cmake-utils_src_prepare
-	sed '/COPYING/d' -i CMakeLists.txt || die
+	sed -e "/LICENSE/d" -i CMakeLists.txt || die
 }
 
 src_configure() {
@@ -49,3 +47,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}