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

(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 49 insertions, 3 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/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" )