3 files changed, 14 insertions, 10 deletions
diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index fc30f1acc158..0b2f3ad5c154 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.98 2015/06/07 13:46:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.99 2015/06/07 13:50:17 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> m2crypto-0.21.1-r2.ebuild,
+  m2crypto-0.22.3-r3.ebuild:
+  Use eclass correctly
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
index ce2e7d3cf2ae..c2103db2a273 100644
--- a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.4 2015/05/15 09:03:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.5 2015/06/07 13:50:17 jlec Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
 IUSE="doc examples"
 
 # swig-3.0.5 results in broken constants, #538920
-RDEPEND=">=dev-libs/openssl-0.9.8"
+RDEPEND=">=dev-libs/openssl-0.9.8:0"
 DEPEND="${RDEPEND}
 	<dev-lang/swig-3.0.5
 	>=dev-lang/swig-1.3.28
@@ -33,13 +33,13 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 # Tests access network, and fail randomly. Bug #431458.
 RESTRICT=test
 
+PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
+
 python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	distutils-r1_python_prepare_all
 
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
-
-	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
index 3767ab9937ed..42c93dc31888 100644
--- a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.4 2015/05/25 17:41:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.5 2015/06/07 13:50:17 jlec Exp $
 
 EAPI=5
 
@@ -33,13 +33,13 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 # Tests access network, and fail randomly. Bug #431458.
 RESTRICT=test
 
+PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
+
 python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	distutils-r1_python_prepare_all
 
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
-
-	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {