diff --git a/media-gfx/viewer/viewer-0.8.0.ebuild b/media-gfx/viewer/viewer-0.8.0-r1.ebuild
similarity index 84%
rename from media-gfx/viewer/viewer-0.8.0.ebuild
rename to media-gfx/viewer/viewer-0.8.0-r1.ebuild
index d3a6f54c9311a..a55a58452c8b2 100644
--- a/media-gfx/viewer/viewer-0.8.0.ebuild
+++ b/media-gfx/viewer/viewer-0.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="A stereo pair image viewer (supports ppm's only)"
 HOMEPAGE="http://www-users.cs.umn.edu/~wburdick/geowall/viewer.html"
@@ -24,6 +24,7 @@ DEPEND="virtual/opengl
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i configure.in \
 		-e "s|/usr/X11R6/lib|/usr/$(get_libdir)/X11|g" \
 		-e 's|/usr/X11R6/include|/usr/include/X11|g'
@@ -31,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
 }
 
 src_install() {