diff --git a/sci-chemistry/ghemical/ghemical-3.0.0.ebuild b/sci-chemistry/ghemical/ghemical-3.0.0.ebuild
index 4c2d4ebec0718..abe9e85c6ed1c 100644
--- a/sci-chemistry/ghemical/ghemical-3.0.0.ebuild
+++ b/sci-chemistry/ghemical/ghemical-3.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit autotools eutils
 
@@ -28,8 +28,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/2.99.2-docs.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/2.99.2-docs.patch
+	default
 	eautoreconf
 }
 
@@ -49,6 +51,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	make_desktop_entry /usr/bin/ghemical Ghemical /usr/share/ghemical/${PV}/pixmaps/ghemical.png
 }
diff --git a/sci-chemistry/ghemical/metadata.xml b/sci-chemistry/ghemical/metadata.xml
index 8dbe075a6c0a5..05b56d91546f9 100644
--- a/sci-chemistry/ghemical/metadata.xml
+++ b/sci-chemistry/ghemical/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci-chemistry@gentoo.org</email>
-  <name>Gentoo Chemistry Project</name>
-</maintainer>
-<longdescription>
+  <maintainer type="project">
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
+  <longdescription>
 Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models 
 and molecular mechanics models (there is an experimental Tripos 5.2-like force 
 field for organic molecules). Also a tool for reduced protein models is 
 included. Geometry optimization, molecular dynamics and a large set of 
 visualization tools are currently available.
 </longdescription>
-<use>
-  <flag name="openbabel">Use <pkg>sci-chemistry/openbabel</pkg> for file
+  <use>
+    <flag name="openbabel">Use <pkg>sci-chemistry/openbabel</pkg> for file
     conversions</flag>
-</use>
+  </use>
 </pkgmetadata>