revert (un-needed) revbump

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

2 files changed, 7 insertions, 63 deletions

diff --git a/dev-python/pyopenssl/pyopenssl-0.14-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.14-r1.ebuild
deleted file mode 100644
index f1713927472c..000000000000
--- a/dev-python/pyopenssl/pyopenssl-0.14-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14-r1.ebuild,v 1.1 2014/03/25 07:15:11 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl http://pypi.python.org/pypi/pyOpenSSL"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed \
-		-e "s/test_set_tlsext_host_name_wrong_args/_&/" \
-		-i OpenSSL/test/test_ssl.py || die "test_ssl sed failed"
-
-	# https://github.com/pyca/pyopenssl/issues/41
-	sed -e "s/test_digest/_&/" -i OpenSSL/test/test_crypto.py
-	# https://github.com/pyca/pyopenssl/issues/67
-	sed -e "s/test_wantWriteError/_&/" -i OpenSSL/test/test_ssl.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	esetup.py test
-
-	# https://bugs.launchpad.net/pyopenssl/+bug/1237953
-	rm -rf tmp* *.key *.pem
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-0.14.ebuild b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
index b1f941fe6a3d..381c4785e5ef 100644
--- a/dev-python/pyopenssl/pyopenssl-0.14.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.5 2014/03/22 23:09:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.6 2014/03/25 07:23:36 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -31,6 +31,11 @@ python_prepare_all() {
 		-e "s/test_set_tlsext_host_name_wrong_args/_&/" \
 		-i OpenSSL/test/test_ssl.py || die "test_ssl sed failed"
 
+	# https://github.com/pyca/pyopenssl/issues/41
+	sed -e "s/test_digest/_&/" -i OpenSSL/test/test_crypto.py
+	# https://github.com/pyca/pyopenssl/issues/67
+	sed -e "s/test_wantWriteError/_&/" -i OpenSSL/test/test_ssl.py
+
 	distutils-r1_python_prepare_all
 }
 
@@ -47,10 +52,6 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
 }