dev-python/pottymouth: Version bump. Switch sed to a patch and simplify setup.py...

svn path=/sunrise/; revision=12521

diff --git a/dev-python/pottymouth/ChangeLog b/dev-python/pottymouth/ChangeLog
index 1d3c4a0078d8eafa2541a783acd76a6c3b969f40..78d49fcf0618919ede071e5aa62dc3f5b9edd6be 100644 (file)
--- a/dev-python/pottymouth/ChangeLog
+++ b/dev-python/pottymouth/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-python/pottymouth
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Nov 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+  -pottymouth-1.2.2.ebuild, +pottymouth-2.1.0.ebuild,
+  +files/pottymouth-2.1.0-fix-setup.patch:
+  Version bump. Switch sed to a patch and simplify setup.py while at it .
+
   03 Apr 2010; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
   pottymouth-1.2.2.ebuild:
   Reintroduce PYTHON_DEPEND

diff --git a/dev-python/pottymouth/Manifest b/dev-python/pottymouth/Manifest
index 1eb5d404400a33c1f9204a700255f2f1cf00d128..09687a941f9e084ed1a83e8b762d548b1d074ff3 100644 (file)
--- a/dev-python/pottymouth/Manifest
+++ b/dev-python/pottymouth/Manifest
@@ -1,4 +1,5 @@
-DIST PottyMouth-1.2.2.tar.gz 27168 RMD160 752061e9b15e98e62be12bee469637f4755ba124 SHA1 dc1dd136927e32e018f568eba03871d313569998 SHA256 50e9ad1de7a86c2f32cd793827121316d459f5795159653430097139d43908e0
-EBUILD pottymouth-1.2.2.ebuild 744 RMD160 fe679ac2e972b2dcccfd3261cfe261d0b0ee6509 SHA1 5e36ad59bb1ddef920f4d81cc1d8c21a7cd859ee SHA256 c074b3bb48c6fed8bfb76301a55774b32bb853da23ed8a541789ba2297aae914
-MISC ChangeLog 1843 RMD160 efbbfc5f39d844b6ee28e915ccf7feda2332b4db SHA1 bb181244ea6ee11faaa9f59aa586fb3dade5ae1e SHA256 d135cd6e42be08d3493cad00d7d46cb0b0b29c43a75be18fd258e9af52d6ff9f
+AUX pottymouth-2.1.0-fix-setup.patch 3538 RMD160 821213bc6bdae634c1575bea432da3db136493bb SHA1 4a5953587591c8b027cad460d799d02681fba3c3 SHA256 3db4a53718df3d4f2db539823f59fbb3b71ce727db9fccb15720c801c3b2a098
+DIST PottyMouth-2.1.0.tar.gz 27420 RMD160 2d3deee71213bcaab7a87e6d8cd7357280966449 SHA1 68435035215c5c8503fd64a4a5179d4f1ffd5b9f SHA256 0a20f1553cc685bae900a670525c0054df141dac93f18bc2f3a61270953abc4f
+EBUILD pottymouth-2.1.0.ebuild 751 RMD160 560e190f1cdb56d87aead83582b6b5c0e375ccef SHA1 551f35e271c1fd412047268d7eca0efff209574a SHA256 d86e23542265fc69ed21882bbea5e7d42d04b4710012d569885c8d104e67bdb1
+MISC ChangeLog 2082 RMD160 c8c8413847251f214131370a42b01e2b6e5f09bf SHA1 38038377ade1a2271e89125d0cc17ed6a72ce35b SHA256 719eab7952d08309ccc61939e65cda0a9ecd74a29d676ddc13282ca04ce03be0
 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
new file mode 100644 (file)
index 0000000..b861dc4
--- /dev/null
+++ b/dev-python/pottymouth/files/pottymouth-2.1.0-fix-setup.patch
@@ -0,0 +1,77 @@
+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/pottymouth-1.2.2.ebuild b/dev-python/pottymouth/pottymouth-2.1.0.ebuild
similarity index 82%
rename from dev-python/pottymouth/pottymouth-1.2.2.ebuild
rename to dev-python/pottymouth/pottymouth-2.1.0.ebuild
index e6298686350ea535648231aba2c22569ec109cd0..8e083b321ee46cda9ee76d1595dce3fbae4cb61e 100644 (file)
--- a/dev-python/pottymouth/pottymouth-1.2.2.ebuild
+++ b/dev-python/pottymouth/pottymouth-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="2"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils
+inherit distutils eutils
 
 MY_P=PottyMouth-${PV}
 DESCRIPTION="A python library that scrubs untrusted text to valid, nice-looking, completely safe XHTML"
@@ -22,8 +22,10 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 S=${WORKDIR}/${MY_P}
 
+DOCS="readme.html"
+
 src_prepare() {
-       sed -i -e "s/python-pottymouth/${PF}/g" setup.py || die "sed failed"
+       epatch "${FILESDIR}/${P}-fix-setup.patch" || die
 }
 
 src_test() {