Drop old. Swig is not a runtime dependency, bug 221471. Quoting.

(Portage version: 2.1.5_rc10)

3 files changed, 12 insertions, 59 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 36b2c31d2727..6f03d4595a4e 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.31 2008/02/24 11:34:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.32 2008/05/12 07:44:11 hawking Exp $
+
+  12 May 2008; Ali Polatel <hawking@gentoo.org> m2crypto-0.16.ebuild,
+  -m2crypto-0.18.ebuild:
+  Drop old. Swig is not a runtime dependency, bug 221471. Quoting.
 
 *m2crypto-0.18.2 (24 Feb 2008)
 
diff --git a/dev-python/m2crypto/m2crypto-0.16.ebuild b/dev-python/m2crypto/m2crypto-0.16.ebuild
index 2ee24a382753..bdd10697d456 100644
--- a/dev-python/m2crypto/m2crypto-0.16.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.16.ebuild,v 1.2 2007/01/12 12:15:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.16.ebuild,v 1.3 2008/05/12 07:44:11 hawking Exp $
 
 inherit distutils portability eutils
 
@@ -18,11 +18,12 @@ IUSE="doc"
 
 #S="${WORKDIR}/${MY_P}"
 
-DEPEND=">=dev-libs/openssl-0.9.7
-	>=dev-lang/swig-1.3.25
+RDEPEND=">=dev-libs/openssl-0.9.7
 	app-arch/unzip
 	virtual/python
 	doc? ( dev-python/epydoc )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.25"
 
 PYTHON_MODNAME="M2Crypto"
 
@@ -47,9 +48,9 @@ src_install() {
 	dohtml -r doc/*
 
 	if use doc; then
-		cd ${S}/doc/
+		cd "${S}"/doc/
 		epydoc --html --parse-only --output=api --name=M2Crypto M2Crypto
 		dohtml -r "${S}-doc"/*
-		cd ${S}/demo && treecopy . "${D}/usr/share/doc/${PF}/example"
+		cd "${S}"/demo && treecopy . "${D}/usr/share/doc/${PF}/example"
 	fi
 }
diff --git a/dev-python/m2crypto/m2crypto-0.18.ebuild b/dev-python/m2crypto/m2crypto-0.18.ebuild
deleted file mode 100644
index 3af9f4c56c58..000000000000
--- a/dev-python/m2crypto/m2crypto-0.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.ebuild,v 1.2 2007/09/20 01:18:51 hawking Exp $
-
-inherit distutils portability eutils multilib
-
-MY_P="${PN}-${PV%.*}"
-
-DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-SRC_URI="http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/openssl-0.9.8"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.25
-	doc? ( dev-python/epydoc )
-	dev-python/setuptools"
-
-PYTHON_MODNAME="M2Crypto"
-
-src_unpack() {
-	distutils_src_unpack
-
-	epatch "${FILESDIR}/${P}-ssize_t.patch"
-}
-
-src_install() {
-	DOCS="CHANGES INSTALL"
-	distutils_src_install
-
-	if use doc; then
-		cd "${S}/demo"
-		treecopy . "${D}/usr/share/doc/${PF}/example"
-
-		einfo "Generating API docs as requested..."
-		cd "${S}/doc"
-		distutils_python_version
-		export PYTHONPATH="${PYTHONPATH}:${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
-		einfo "${PYTHONPATH}"
-		epydoc --html --output=api --name=M2Crypto M2Crypto
-	fi
-	dohtml -r *
-}
-
-src_test() {
-	"${python}" setup.py test || die "test failed"
-}