dev-python/pottymouth: Version bump. Drop old patch

svn path=/sunrise/; revision=12605

5 files changed, 24 insertions, 81 deletions

diff --git a/dev-python/pottymouth/ChangeLog b/dev-python/pottymouth/ChangeLog
index c4923e03a..389f83ca6 100644
--- a/dev-python/pottymouth/ChangeLog
+++ b/dev-python/pottymouth/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Dec 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+  -files/pottymouth-2.1.0-fix-setup.patch, -pottymouth-2.1.1.ebuild,
+  +pottymouth-2.1.2.ebuild, +files/pottymouth-2.1.2-fix-setup.patch:
+  Version bump. Drop old patch
+
   09 Dec 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
   -pottymouth-2.1.0.ebuild, +pottymouth-2.1.1.ebuild:
   Version bump
diff --git a/dev-python/pottymouth/Manifest b/dev-python/pottymouth/Manifest
index 6527c2c18..92f613224 100644
--- a/dev-python/pottymouth/Manifest
+++ b/dev-python/pottymouth/Manifest
@@ -1,5 +1,5 @@
-AUX pottymouth-2.1.0-fix-setup.patch 3538 RMD160 821213bc6bdae634c1575bea432da3db136493bb SHA1 4a5953587591c8b027cad460d799d02681fba3c3 SHA256 3db4a53718df3d4f2db539823f59fbb3b71ce727db9fccb15720c801c3b2a098
-DIST PottyMouth-2.1.1.tar.gz 27737 RMD160 6337fbee237df5875cee97f2afd38b0dca1e39a5 SHA1 36791910486a928a2933008c39d8fc793e7b6306 SHA256 b2b1fd9b21a3a7fbda5137f1bb41a9260d77ad849bb1de52db77bd561bb6579c
-EBUILD pottymouth-2.1.1.ebuild 758 RMD160 67eb0b1407e1466d9ccb776d94c449fdcc51fcfb SHA1 51a6566502c9a3556d6852a1404118a241f033a3 SHA256 39b3aefed705b1f1ef128cdd511bcce78f60626c9a4bd8c821d282a44d473bb2
-MISC ChangeLog 2219 RMD160 fd52837976ed2c276dcfe952528fd2293d36c6a3 SHA1 180c4b4ca9e4d98f685ac5f4c9b956834502456e SHA256 9482d20248fc3edfa9e067767ccbacc4eeb2f93d38afd742f4e1f20a8094090e
+AUX pottymouth-2.1.2-fix-setup.patch 316 RMD160 05a05cebca7c47166998f7545947335698a320cd SHA1 fcfab53bcfff81a2841b85ec09c1bd22af9b86be SHA256 3e71ce7c1400db6389ee1cbc504c0606fbcb704f6be51bfe1968981c1a152c41
+DIST PottyMouth-2.1.2.tar.gz 27658 RMD160 20a39e3ca3aaa6a09c3d99c83068e8cdf6532352 SHA1 fbe8e054d5ea807c29ba5b0fdfd5ded054c5f772 SHA256 85db3a7f377cfdbe2a5766abe02640d34c65ac148fe2d9ced00b13252bf16a06
+EBUILD pottymouth-2.1.2.ebuild 758 RMD160 67eb0b1407e1466d9ccb776d94c449fdcc51fcfb SHA1 51a6566502c9a3556d6852a1404118a241f033a3 SHA256 39b3aefed705b1f1ef128cdd511bcce78f60626c9a4bd8c821d282a44d473bb2
+MISC ChangeLog 2456 RMD160 87c133423df61223a8e6b729cd8f4dbed48e9c4d SHA1 c0fcde97599530ed1bea35e92c3aee033ed88a37 SHA256 b713c40e17940e30a4651fc970c0ec696a84f72c8e8e2ed092f3ee6f4dd8187e
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/dev-python/pottymouth/files/pottymouth-2.1.0-fix-setup.patch b/dev-python/pottymouth/files/pottymouth-2.1.0-fix-setup.patch
deleted file mode 100644
index b861dc46c..000000000
--- a/dev-python/pottymouth/files/pottymouth-2.1.0-fix-setup.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 9efac65..1024568 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1,49 +1,31 @@
--#!/usr/bin/env python
--
--try:
--    from setuptools import setup
--except ImportError:
--    from distutils.core import setup
-+from distutils.core import setup
- from pottymouth import __version__
- 
- import os
- import os.path
- import shutil
- 
--external_files = ('readme.html', 'LICENSE.txt')
--for f in external_files:
--    shutil.copy(os.path.join('..', f), f)
--
--try:
--    setup(name='PottyMouth',
--          py_modules=['pottymouth'],
--          version=__version__,
--          data_files=[('share/doc/python-pottymouth', ['readme.html',
--                                                       'LICENSE.txt',
--                                                       'test.py'    ,
--                                                       'web.py'     ,
--                                                       'profile.py' ,]),],
--          # metadata for fun
--          author='Matt Chisholm',
--          author_email='matt@theory.org',
--          description="transform unstructured, untrusted text to safe, valid XHTML",
--          license='BSD License',
--          keywords='wiki',
--          url='http://glyphobet.net/pottymouth',
--          download_url='http://glyphobet.net/pottymouth/dist/',
--          long_description="""PottyMouth transforms completely unstructured and untrusted text to valid, nice-looking, completely safe XHTML.
-+setup(name='PottyMouth',
-+      py_modules=['pottymouth'],
-+      version=__version__,
-+      # metadata for fun
-+      author='Matt Chisholm',
-+      author_email='matt@theory.org',
-+      description="transform unstructured, untrusted text to safe, valid XHTML",
-+      license='BSD License',
-+      keywords='wiki',
-+      url='http://glyphobet.net/pottymouth',
-+      download_url='http://glyphobet.net/pottymouth/dist/',
-+      long_description="""PottyMouth transforms completely unstructured and untrusted text to valid, nice-looking, completely safe XHTML.
- 
-     PottyMouth is designed to handle input text from non-technical, potentially careless or malicious users. It produces HTML that is completely safe, programmatically and visually, to include on any web page. And you don't need to make your users read any instructions before they start typing. They don't even need to know that PottyMouth is being used.""",
--          classifiers=['Development Status :: 5 - Production/Stable',
--                       'Intended Audience :: Developers',
--                       'License :: OSI Approved :: BSD License',
--                       'Operating System :: OS Independent',
--                       'Environment :: Web Environment',
--                       'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards',
--                       'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',
--                       ],
--          platforms='All',
--          )
--finally:
--    for f in external_files:
--        os.unlink(f)
-+      classifiers=['Development Status :: 5 - Production/Stable',
-+                   'Intended Audience :: Developers',
-+                   'License :: OSI Approved :: BSD License',
-+                   'Operating System :: OS Independent',
-+                   'Environment :: Web Environment',
-+                   'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards',
-+                   'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',
-+                   ],
-+      platforms='All',
-+      )
diff --git a/dev-python/pottymouth/files/pottymouth-2.1.2-fix-setup.patch b/dev-python/pottymouth/files/pottymouth-2.1.2-fix-setup.patch
new file mode 100644
index 000000000..716a0898d
--- /dev/null
+++ b/dev-python/pottymouth/files/pottymouth-2.1.2-fix-setup.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 180f378..4c39292 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1,9 +1,6 @@
+ #!/usr/bin/env python
+ 
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ from pottymouth import __version__
+ 
+ import os
diff --git a/dev-python/pottymouth/pottymouth-2.1.1.ebuild b/dev-python/pottymouth/pottymouth-2.1.2.ebuild
index fc8ec3397..fc8ec3397 100644
--- a/dev-python/pottymouth/pottymouth-2.1.1.ebuild
+++ b/dev-python/pottymouth/pottymouth-2.1.2.ebuild