diff --git a/x11-libs/liboglappth/files/gcc-4.3.patch b/x11-libs/liboglappth/files/gcc-4.3.patch
index 7a70ab2a2659d..bc04b9e97c7b5 100644
--- a/x11-libs/liboglappth/files/gcc-4.3.patch
+++ b/x11-libs/liboglappth/files/gcc-4.3.patch
@@ -1,5 +1,5 @@
---- liboglappth-0.96.orig/src/base_wcl.cpp	2008-07-07 23:49:10.000000000 -0700
-+++ liboglappth-0.96/src/base_wcl.cpp	2008-07-07 23:49:26.000000000 -0700
+--- a/src/base_wcl.cpp	2008-07-07 23:49:10.000000000 -0700
++++ b/src/base_wcl.cpp	2008-07-07 23:49:26.000000000 -0700
 @@ -11,6 +11,7 @@
  
  #include "base_app.h"
diff --git a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
index fed4ef03864a0..a73b0a57b03fa 100644
--- a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
+++ b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
@@ -1,26 +1,21 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Libary for OpenGL applications with easy-to-code scene setup and selection"
 HOMEPAGE="http://www.bioinformatics.org/ghemical/"
 SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="virtual/opengl
+
+RDEPEND="
+	virtual/opengl
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gcc-4.3.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
+PATCHES=( "${FILESDIR}"/gcc-4.3.patch )
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
index acee35cb0a6c4..75150c9666994 100644
--- a/x11-libs/liboglappth/metadata.xml
+++ b/x11-libs/liboglappth/metadata.xml
@@ -1,11 +1,11 @@
 <?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