Convert to distutils-r1. Rename script to pyhtml2text to avoid file collision, bug 421647.

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 62 insertions, 4 deletions

diff --git a/dev-python/html2text/ChangeLog b/dev-python/html2text/ChangeLog
index 02ebbf14b33b..fd44a8ae3847 100644
--- a/dev-python/html2text/ChangeLog
+++ b/dev-python/html2text/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/html2text
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/ChangeLog,v 1.9 2012/06/08 11:33:53 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/ChangeLog,v 1.10 2013/02/15 02:39:33 floppym Exp $
+
+*html2text-3.200.3-r1 (15 Feb 2013)
+
+  15 Feb 2013; Mike Gilbert <floppym@gentoo.org> +files/html2text-rename.patch,
+  +html2text-3.200.3-r1.ebuild:
+  Convert to distutils-r1. Rename script to pyhtml2text to avoid file collision,
+  bug 421647.
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   html2text-3.200.3.ebuild:
@@ -39,4 +46,3 @@
   25 Nov 2010; Sebastian Pipping <sping@gentoo.org> +html2text-2.39.ebuild,
   +metadata.xml:
   New package
-
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 9ccd3c47fc84..0de985bac759 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX html2text-rename.patch 365 SHA256 2d52db36c3f8588986759a2358ba0a05635fe6e8bdf0d7f5cfd310bf6b4a1712 SHA512 ab2405b73ec9ee49fdb8e74bcb27bb258ec584e66674eaf62ecc11a18aed5b6b0bd88d18be0ab06e70d5cdcff8e7980c4d79aa8f15cf9121c25ecf38da42c4b7 WHIRLPOOL 73e18b943ee3fe4edd53a001d0c6f5ba09fec01491bda5d65b90c522d3a19b14c0d050ba62f68dea97c4b2fb35b938fe55efc4200c8626c0db2b8d6b8cc116ff
 DIST html2text-3.02.tar.gz 5067 SHA256 8a440067b95569ac705e2ea056bb6dfebaedf7992cbb6b4e4b830811368f8111 SHA512 3962b848a77b727036ece8879b8d533aaeef1ac4795bd946bdc36906d4c3d8b433cd192f6773e71c2620aa590b007aaa112723e23a2c829b1bc1baf7d20513de WHIRLPOOL 3160d5314496879c05267b787dd1702a4857e19d769f6c7bf1c992f0f9cee028a7d8526f7efa63587c26e2bb5726d8a37ed5e9306c89e3e92395783c36bbd4c6
 DIST html2text-3.200.3.tar.gz 21446 SHA256 040a4ace61446ab1e323e71e95e8ce16a5f0cc889027f17974ef8be1391721df SHA512 4e0d4a422c9aeae92431180ad3fb86ff37adf4dfb3d6bfff288a653b18f20d1b596fb201da0c60637d186700ca6cc84caf705f390bd3260e79a18938d81a93f1 WHIRLPOOL 0bac76c72f4d6cc233e9b8f938560b45df40c0ba891fc9f2bfcc83491d0cca77e12d31626c8e34735f1a3ce09683d6ea72e5833448af68918392275e0794b0cb
 EBUILD html2text-3.02.ebuild 794 SHA256 06cb5766ddc86d2268013407bd5af3a8b732ab1bab58b97ce7980571a9bcd269 SHA512 710a8548e4c4d09bf60e97ca344b4ea17effc8c365a1602e67853c3a659edf28742b094bcb31551d09aa74bcfe8fc7c95ac80df9cd90950bee25d90419183466 WHIRLPOOL 56b202875387a5649601f37264e4b08bcd9617e552103ced96ebc0ddeaa0e0313d8d8d15b9262be19a8b0b3cd8537e44e1b9abc3c8def0d64d8de481c3c42e37
+EBUILD html2text-3.200.3-r1.ebuild 819 SHA256 65557864c3baff84230868d5c99b4662ba2fd76689b6419667b4ad8d7a032784 SHA512 7039564d2b278012e752cf80c94ffbf525cc60fb579cdd8df9d67bb3968d1efff9dadb8ea67881372b2b3837f1bf588f2477f3c3a4d9f4b5ce6a8fe45c5d6113 WHIRLPOOL 6350ddf6c8e01b17e6c6f3b7d176ba38289c3a98d648926e5cdaac1a5c2e041b288f3195831a9afe194ac89886241617b1c852cc6df8821ac25ccd1aa4d4b5f2
 EBUILD html2text-3.200.3.ebuild 738 SHA256 b0353f366be8b6c900a519843787263f5d5cf33ac7f4e94fc0fdac1e0bfaf350 SHA512 1af28cf8b1080aef5cb138e7ee797c8598e9c745e9c9582dc27c701cf9eefc75ff280c576fcce457e0c2aef18123c5de276e8d29e6c2454233ea30142620727e WHIRLPOOL 346bf6e4895693db5e97cc863cc2c368df29c85efa93f6998aca41239ef4e736b7ca3af60798f4b11600b653c5923d80e57e3f86eb5244d222f09ce62d902ed7
-MISC ChangeLog 1531 SHA256 c2f6a7353ef742ab0993758e004babba80a1e3718a6d85c1a92833b70880bf43 SHA512 aabf8c039b4eb4cc4c9773f2d0218bb60629dd37da344b54dc7c71ee5dfada863aea1121058c4c2177332c53e01a6d78b398eae0c6ecc87883174653898e506c WHIRLPOOL d2a26d0bac78d7fb4a7d98c69bdad7c2d21c08d8829662786bb00845f05f5e9692c2ce7de3c35474167d08d0e2e5b75d96ebfc046b4ea1b2f1a8478a23d79412
+MISC ChangeLog 1773 SHA256 a433900adf41bbf608eb9f2181ab45460769692830c80d69c68f0b4fd8bdf3ba SHA512 dab5047ab7e91517792ca8c6a11da937c5d74858c65526d36ca717247c3b9039f4207cc76a037e0631965a71ce8cd92ce2e1d520eaa9093d08aef185e1ed47e7 WHIRLPOOL da00f25bad486876935daac0132fefa83bca222ed9ca2d7a94c9c2ccc5b80f6c1a765c1ea891eded3bdd81678780b2e9b13375281dd23b4c1b8cc95b724a24c9
 MISC metadata.xml 256 SHA256 e98eecd4398c42ea2c07ffc155fc034105ea45c3261a0894ef86116c064896ba SHA512 d28821cdedfe932affa2925f42c2caba251903aa938688e1bf436b602525cbc3fd6734bb02ba707fa14beb8f282f9038b657fb65193508c899f18511bf7e3de7 WHIRLPOOL a674ad3cf20ff9a3c02e8150e17d298d6ddadc5df66db8bb62bbd89a7a83b962c583d046d17185749bb5cb1df3f6c90031df6bbe76f1312d22d7af4286e98ed8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlEdn+YACgkQC77qH+pIQ6TZxQD+Nu3TiqDV+iJR86KLoAMNn/9O
+X764cpTsyqbcPwEu21wBAImKnPwmy9eAuNHD4YSTyg1WvRm4zUvu35LeplsSN5UO
+=7O8J
+-----END PGP SIGNATURE-----
diff --git a/dev-python/html2text/files/html2text-rename.patch b/dev-python/html2text/files/html2text-rename.patch
new file mode 100644
index 000000000000..5857ef4957b9
--- /dev/null
+++ b/dev-python/html2text/files/html2text-rename.patch
@@ -0,0 +1,15 @@
+Naming conflict with app-text/html2text, bug 421647.
+
+diff --git a/setup.py b/setup.py
+index dd3d9bc..cd28b49 100644
+--- a/setup.py
++++ b/setup.py
+@@ -26,7 +26,7 @@ setup(
+      ],
+     entry_points="""
+         [console_scripts]
+-        html2text=html2text:main
++        pyhtml2text=html2text:main
+     """,
+    license='GNU GPL 3',
+    packages=find_packages(),
diff --git a/dev-python/html2text/html2text-3.200.3-r1.ebuild b/dev-python/html2text/html2text-3.200.3-r1.ebuild
new file mode 100644
index 000000000000..9b6080b623b4
--- /dev/null
+++ b/dev-python/html2text/html2text-3.200.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-3.200.3-r1.ebuild,v 1.1 2013/02/15 02:39:33 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text."
+HOMEPAGE="http://www.aaronsw.com/2002/html2text/
+	https://github.com/aaronsw/html2text http://pypi.python.org/pypi/html2text"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-rename.patch" )