diff --git a/dev-util/molecule-core/molecule-core-1.0.2.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
similarity index 61%
rename from dev-util/molecule-core/molecule-core-1.0.2.ebuild
rename to dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index bbef4ea957879..0ac7754415ac7 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2.ebuild
+++ b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_DEPEND="*"
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit python
+inherit python-r1
 
 DESCRIPTION="Sabayon distro-agnostic images build tool"
 HOMEPAGE="http://www.sabayon.org"
@@ -23,14 +23,5 @@ RDEPEND="!<dev-util/molecule-1
 
 src_install() {
 	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
-		PREFIX="/usr" SYSCONFDIR="/etc" install \
-		|| die "emake install failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize "/usr/lib/molecule"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "/usr/lib/molecule"
+		PREFIX="/usr" SYSCONFDIR="/etc" install
 }