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

Package-Manager: portage-2.1.5_rc10

4 files changed, 24 insertions, 63 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/Manifest b/dev-python/m2crypto/Manifest
index 508275cb3747..941e938bd312 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX m2crypto-0.18-ssize_t.patch 488 RMD160 207c25f9e0a2b71bdca9b07a3081060777ac0a14 SHA1 696dbc9d08ee1525ed61176342f372b208d2eef6 SHA256 4bb6a5e7a460a0fb816439036edc9465dd36b0b8f0adc5d6eb1a1ecd8da24c65
 AUX m2crypto-0.18.2-timeval_struct_size.patch 1018 RMD160 06c9cbdb48b30f03c404acf6f9a2e2b7414962d9 SHA1 52f7d84618994e37421de1a233cb7dae0e4a0e7e SHA256 f89bcdecbf575b9a216721209ba5fa2ceb1f8171fef07b2993aefa327e4b2f99
 DIST m2crypto-0.16.tar.gz 347250 RMD160 164f1f7b729048b5e42282a734ecb7d6e1fcde2d SHA1 21a0e4ba920a2c40256da63ccd050ada420e9f15 SHA256 9734e7b73eb538c9078fd180e9c9e386d6336bd934e53904f27fe1905746b5f9
 DIST m2crypto-0.18.2.tar.gz 386148 RMD160 9ba9b84a11eef454fb2483fdaf753b8eb39736b7 SHA1 89e1a252e69e1cf054d434793e21783e5ddc56b9 SHA256 62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
-DIST m2crypto-0.18.tar.gz 385298 RMD160 b9eb15b0d93594e264ba412cf9dfa6dc38de439b SHA1 6946bf9082250021e209bd25737c2881198ef707 SHA256 020664f96ba268c21a15295aa2bb257487c9e092309b5c0d6b8a66305f18af1f
-EBUILD m2crypto-0.16.ebuild 1399 RMD160 587622f95eeb19957fde327bbe71f4484c5de16f SHA1 3c9d343eb60f52915817649b47a919932abaf924 SHA256 cf2c44c0c3673624fd8e9d2a937e1959c364fd0fea300dd809a0f31caab7b9f2
+EBUILD m2crypto-0.16.ebuild 1426 RMD160 ebcad183f7ff2effa8f692b97d8fb6ceca3e4afa SHA1 63f4522c8c759e3ecf1a1b38262ae1ade9475317 SHA256 35595d004298db411aaf7b84da8e8587bb4e996f0800741de0ecb8b8fee597ef
 EBUILD m2crypto-0.18.2.ebuild 1367 RMD160 c1db5667b74385d7477c581aae208c900beac646 SHA1 a7b34a4190670909c0c8d8660edf53e2f0a61ae6 SHA256 942ea6817f71ef320780ee213f494215f59f39dd7349567b35fc30a9b7379897
-EBUILD m2crypto-0.18.ebuild 1337 RMD160 8ca4293221c34a0695bdbf9a669c410646028bed SHA1 4cc0009640f5d11777254a3349ed45dae6684c8e SHA256 360551ca148bb31827d3cb993db15eb62bf2a48987ae498918becd045bd073e3
-MISC ChangeLog 4563 RMD160 7831b997edc9bdc6f8f6cd756dfa07ac14dc1b02 SHA1 9faaedd53aafc8c1ce61ce1341b4bf0d52bbf7d4 SHA256 c7fc842dc42cdf8cfe093bafb1ec06941459b7301794ec6eb654773095f95580
+MISC ChangeLog 4725 RMD160 6c7452b90f571b38c083485ac098ecf4d4ab3f44 SHA1 d9b5beab73925870165d7c5b6899db2e5c06f3df SHA256 ff1a4b75808619f97f879df26fb4f50c5bb76d591b883f578bc90483e13ecf03
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgn9VIACgkQQU4yORhF8iD9OwCgj/WiIHSJKt0lnUsA6V/POJW8
+1qEAnRqoEmjRgW7dgxfpiQnhXgcSzTCu
+=Gh7z
+-----END PGP SIGNATURE-----
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"
-}