Drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

7 files changed, 7 insertions, 301 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index cf9a60bfa1b1..c75a314db950 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2015/07/16 17:38:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.105 2015/07/30 17:55:01 jlec Exp $
+
+  30 Jul 2015; Justin Lecher <jlec@gentoo.org> -files/0.21.1-packaging.patch,
+  -files/m2crypto-0.21.1-cross-compile.patch,
+  -files/m2crypto-0.22.3-cross-compile.patch, -m2crypto-0.21.1-r2.ebuild,
+  -m2crypto-0.21.1-r3.ebuild, -m2crypto-0.22.3-r3.ebuild:
+  Drop old
 
   16 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> m2crypto-0.22.3-r4.ebuild:
   ia64 stable wrt bug #545606
diff --git a/dev-python/m2crypto/files/0.21.1-packaging.patch b/dev-python/m2crypto/files/0.21.1-packaging.patch
deleted file mode 100644
index 9c72ba5f6700..000000000000
--- a/dev-python/m2crypto/files/0.21.1-packaging.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From beb9c8df2e9cb79fcb1fd2a6ad6e43fff267c726 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 25 May 2015 13:09:35 -0400
-Subject: [PATCH] Gentoo-specific packaging fixes
-
-Fix cross-compiles
-EPREFIX support
----
- setup.py | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0967216..640e019 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,7 @@ class CustomBuild(build):
- class CustomInstall(install):
-     def run(self):
-         self.run_command('build_ext')
--        self.do_egg_install()
-+        install.run(self)
- 
- class _M2CryptoBuildExt(build_ext.build_ext):
-     '''Specialization of build_ext to enable swig_opts to inherit any 
-@@ -66,8 +66,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-         opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
-         opensslLibraryDir = os.path.join(self.openssl, 'lib')
-         
--        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
--                          [opensslIncludeDir, includeDir]]
-+        eprefix = os.getenv('EPREFIX', '')
-+        self.swig_opts = ['-I' + eprefix + '/usr/include']
-         if get_platform() == 'linux-x86_64':
-             self.swig_opts.append('-D__x86_64__')
-         self.swig_opts.append('-outdir')
-@@ -76,8 +76,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
-         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
-         
--        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
--                              os.path.join(os.getcwd(), 'SWIG')]        
-+        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
-             
-         if sys.platform == 'cygwin':
-             # Cygwin SHOULD work (there's code in distutils), but
-@@ -87,8 +86,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-             # Someday distutils will be fixed and this won't be needed.
-             self.library_dirs += [os.path.join(self.openssl, 'bin')]
-                
--        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
--
- 
- if sys.version_info < (2,4):
- 
--- 
-2.4.1
-
diff --git a/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
deleted file mode 100644
index 647d93a43205..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
-
---- a/setup.py
-+++ b/setup.py
-@@ -52,14 +52,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-         opensslIncludeDir = os.path.join(self.openssl, 'include')
-         opensslLibraryDir = os.path.join(self.openssl, 'lib')
-         
--        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
--                          [opensslIncludeDir]]
-+        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
-         self.swig_opts.append('-includeall')
-         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
-         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
-         
--        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
--                              os.path.join(os.getcwd(), 'SWIG')]        
-+        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
-             
-         if sys.platform == 'cygwin':
-             # Cygwin SHOULD work (there's code in distutils), but
-@@ -69,7 +67,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-             # Someday distutils will be fixed and this won't be needed.
-             self.library_dirs += [os.path.join(self.openssl, 'bin')]
-                
--        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
- 
- 
- if sys.version_info < (2,4):
diff --git a/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
deleted file mode 100644
index ba3140473ae7..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
-
---- a/setup.py
-+++ b/setup.py
-@@ -68,25 +68,14 @@ class _M2CryptoBuildExt(build_ext.build_ext):
- 
-         build_ext.build_ext.finalize_options(self)
- 
--        self.add_multiarch_paths()
--
-         opensslIncludeDir = os.path.join(self.openssl, 'include')
-         opensslLibraryDir = os.path.join(self.openssl, 'lib')
- 
--        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
--                          [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
-+        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
-         self.swig_opts.append('-includeall')
-         self.swig_opts.append('-modern')
- 
--        # Fedora does hat tricks.
--        if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
--            if platform.architecture()[0] == '64bit':
--                self.swig_opts.append('-D__x86_64__')
--            elif platform.architecture()[0] == '32bit':
--                self.swig_opts.append('-D__i386__')
--
--        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
--                              os.path.join(os.getcwd(), 'SWIG')]
-+        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
- 
-         if sys.platform == 'cygwin':
-             # Cygwin SHOULD work (there's code in distutils), but
-@@ -96,8 +85,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-             # Someday distutils will be fixed and this won't be needed.
-             self.library_dirs += [os.path.join(self.openssl, 'bin')]
- 
--        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
--
- if sys.platform == 'darwin':
-    my_extra_compile_args = ["-Wno-deprecated-declarations"]
- else:
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
deleted file mode 100644
index c2103db2a273..000000000000
--- a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.5 2015/06/07 13:50:17 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-# swig-3.0.5 results in broken constants, #538920
-RDEPEND=">=dev-libs/openssl-0.9.8:0"
-DEPEND="${RDEPEND}
-	<dev-lang/swig-3.0.5
-	>=dev-lang/swig-1.3.28
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# use pre-swigged sources
-	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
-}
-
-python_configure_all() {
-	set -- swig -python -includeall -I/usr/include \
-		-o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
-
-	echo "${@}" >&2
-	"${@}" || die 'swig failed'
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-		epydoc --html --output=api --name=M2Crypto M2Crypto || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild
deleted file mode 100644
index b26eb3c04c7c..000000000000
--- a/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-r3.ebuild,v 1.4 2015/05/26 22:34:33 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz
-	http://dev.gentoo.org/~floppym/dist/m2crypto-0.21.1-backports.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/openssl-0.9.8:0="
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.28
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-PATCHES=(
-	"${WORKDIR}"/patch/0.21.1-0001-Fixed-invalid-variable-name.patch
-	"${WORKDIR}"/patch/0.21.1-0002-Fixing-memory-leaks-in-the-SWIG-wrapper.patch
-	"${WORKDIR}"/patch/0.21.1-0003-Use-swig-generated-python-loader.patch
-	"${FILESDIR}"/0.21.1-packaging.patch
-)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
deleted file mode 100644
index 42c93dc31888..000000000000
--- a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.5 2015/06/07 13:50:17 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://github.com/martinpaljak/M2Crypto http://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-# swig-3.0.5 results in broken constants, #538920
-RDEPEND=">=dev-libs/openssl-0.9.8:0="
-DEPEND="${RDEPEND}
-	<dev-lang/swig-3.0.5
-	>=dev-lang/swig-1.3.28:0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# use pre-swigged sources
-	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
-}
-
-python_configure_all() {
-	set -- swig -python -includeall -I"${EPREFIX}"/usr/include \
-		-o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
-
-	echo "${@}"
-	"${@}" || die 'swig failed'
-}
-
-python_test() {
-	esetup.py test
-}