Works only with python-2 (#315331). Thanks to arfrever for the patch and ohnobinki for testing. More docdir workarounds

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 27 insertions, 23 deletions

diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog
index 7769ed640c20..9b70c9d7c15b 100644
--- a/net-mail/getmail/ChangeLog
+++ b/net-mail/getmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/getmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.175 2010/01/06 08:07:31 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.176 2010/04/17 17:06:46 tove Exp $
+
+*getmail-4.16.0-r1 (17 Apr 2010)
+
+  17 Apr 2010; Torsten Veller <tove@gentoo.org> -getmail-4.16.0.ebuild,
+  +getmail-4.16.0-r1.ebuild:
+  Works only with python-2 (#315331). Thanks to arfrever for the patch and
+  ohnobinki for testing. More docdir workarounds
 
 *getmail-4.16.0 (06 Jan 2010)
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 4c4cbaa0e12a..c7d9782a56c5 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -6,15 +6,15 @@ DIST getmail-4.16.0.tar.gz 155568 RMD160 9cf6f408d50597a5935ed27c9d1de872a673e45
 DIST getmail-4.9.1.tar.gz 153575 RMD160 e81ffd7345ac58f5bb3c6ebba214d3df92c1ed80 SHA1 6352cf5115e8792c6b7d3b4dcb6c89f88abf290b SHA256 3f06e459000be57d72ccb634bdc26dc1a4788112e5c428a09bdf4d98d6287f19
 DIST getmail-4.9.2.tar.gz 153697 RMD160 cfde806c5ea66ea40d35735df693261dee2c4ac3 SHA1 cf7f822908f4d951054b8e4c07829341d0a8eee4 SHA256 11e04f0b1bbabb48dbba36a4c6c92f97f65c7dbd2d8d360427c2120e755a5648
 EBUILD getmail-4.13.0.ebuild 1000 RMD160 1f5aca8c7b940d473d30f4d43793281fa8055b20 SHA1 9d4f309d8f1152740c4b474f39b19eb1081c7b9b SHA256 4b3fcce55739052d81241b941a7f6b1a6fa305397ef0c638edd7571b583b36d7
-EBUILD getmail-4.16.0.ebuild 997 RMD160 89ff7c6352d5bbb43dca24d322aaff0e30a19639 SHA1 be6d70c3beab5a9b0169c07cf8d383598135a550 SHA256 a71806f2f65680afae1c180c47a9117bef83486aaab992ee02b9ddb0abbca135
+EBUILD getmail-4.16.0-r1.ebuild 818 RMD160 bf4a20c4175dd609e6fc3b2f4591efd4f6ec1e88 SHA1 9bedf42c1634429ae21cb55eda663cadc08b5c0f SHA256 19ff230cc37883c96c496612b431303161b823864ac98aac9692e9727ee4516b
 EBUILD getmail-4.9.1.ebuild 923 RMD160 722e58a0d21bfca954f4eec0b8b2dd2f09528d10 SHA1 ed34edddde5aab4605b68fba44e9f79b81a3922c SHA256 d900df2ee1b8345bcfce9ad1cfe5dc166e8dcca16f7bb5d376e0c18cabc71ca7
 EBUILD getmail-4.9.2.ebuild 999 RMD160 55317bdcc74e947d3af751abe968adfc9ed0be03 SHA1 fefaee7c499eb544d3f3bfbbd381e6bb2f93810b SHA256 e60f6b8984c6c4822a5d68410f8fcfe96525993ae8605c1bd79a16f4720011c6
-MISC ChangeLog 22688 RMD160 9bf66c9d52af821f8637635c864882ff1170dd90 SHA1 1f307158e29f16171bb5d5f7697fe084161f2811 SHA256 6dcae3e310b8988353700a690659923021f858e294b29192de27c701752c073d
+MISC ChangeLog 22948 RMD160 ddef266d422553872f0793310bed01591b4f8b02 SHA1 92af6eb07b74e0e4c9728c47e1649bdb6435cee6 SHA256 06221cd3cf4c3666e8f99d2faff0929bba3816a7ab09aca77b3d8ce992fcd5c7
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktERM4ACgkQV3J2n04EauxttQCeOiIeCY9w+1uokPVZGfZVglqB
-f7EAoI8OazxFUbJtVVmuQNfavjUbXOSk
-=WGBE
+iEYEARECAAYFAkvJ6q4ACgkQV3J2n04EauythACfTeplyx1evMWnP9tZGEkMcQRq
+lM8An0LZ3m8ShOywguxQfUF+g4a5EJok
+=pmxi
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/getmail-4.16.0.ebuild b/net-mail/getmail/getmail-4.16.0-r1.ebuild
index c444a107a45c..35791ce7e71f 100644
--- a/net-mail/getmail/getmail-4.16.0.ebuild
+++ b/net-mail/getmail/getmail-4.16.0-r1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.16.0.ebuild,v 1.1 2010/01/06 08:07:31 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.16.0-r1.ebuild,v 1.1 2010/04/17 17:06:46 tove Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
@@ -13,21 +17,14 @@ SLOT="4"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.3.3"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME=getmailcore
-
-src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_src_install
+DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
 
-	# handle docs the gentoo way
-	rm "${ED}"/usr/share/doc/${P}/COPYING || die
-	if [[ ${P} != ${PF} ]] ; then
-		mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
-	fi
+PYTHON_MODNAME="getmailcore"
 
-	dodir /usr/share/doc/${PF}/html
-	mv "${ED}"/usr/share/doc/${PF}/*.{html,css} "${ED}"/usr/share/doc/${PF}/html || die
+src_prepare() {
+	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+		-e "/docs\/COPYING/d" "${S}"/setup.py || die
+	distutils_src_prepare
 }