media-gfx/textext: Updated HOMEPAGE and SRC_URI, added upstream patch about deprecati...

svn path=/sunrise/; revision=10489

diff --git a/media-gfx/textext/ChangeLog b/media-gfx/textext/ChangeLog
index 5ab119a3d4c3f0da75578e4bd8c1952f81d30474..36eb7e01460e0a11b60ecf743d6c20c7adb45d34 100644 (file)
--- a/media-gfx/textext/ChangeLog
+++ b/media-gfx/textext/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-gfx/textext
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Apr 2010; Denilson (CrazyTB) <denilsonsa@gmail.com>
+  -textext-0.4.4.ebuild, +textext-0.4.4-r1.ebuild,
+  +files/textext-0.4.4-md5-to-hashlib.patch:
+  Updated HOMEPAGE and SRC_URI, added upstream patch about deprecation
+  warning, wrt bug 207690, thanks to Miguel R. Caudevilla, nao|off and
+  chithead
+
   18 Mar 2009; Oliver Borm (boroli) <oli.borm@web.de> textext-0.4.4.ebuild:
   Added virtual/latex-base dependency
 

diff --git a/media-gfx/textext/Manifest b/media-gfx/textext/Manifest
index 9d1da1cb321485edd9b0dab797901c0051375b13..684295d84759580bf384d4194d9b9d3452ab8eea 100644 (file)
--- a/media-gfx/textext/Manifest
+++ b/media-gfx/textext/Manifest
@@ -1,4 +1,5 @@
+AUX textext-0.4.4-md5-to-hashlib.patch 1113 RMD160 cf4434079f88297deae5858b8d7ee872c411de8b SHA1 a56ee72fccc4f9f20932f94c0d3b603b8ba9da03 SHA256 c6a004ebb0f27f91f40d794c95d823221b23b6f249ed6abe12316f41eae36e8c
 DIST textext-0.4.4.tar.gz 9475 RMD160 fcaf932207a5477562135b00be29445fc92e1caa SHA1 d45d7fb742ce63b18590e02cfbdc534d22810098 SHA256 4d3d262efc8b199dff407b6d153c8822ac9b30d46357e0cdc191c2c0f5fea077
-EBUILD textext-0.4.4.ebuild 817 RMD160 b3116891b141c67740bb87f705cef257f11ec43c SHA1 276e2b52853aa93472387c5af92c9ed89c9cedee SHA256 e28544dc030cd2d17fe27b73fbbb6f70faeee8b0c1cf1644430cc3cfc31b306e
-MISC ChangeLog 1993 RMD160 934df64639467bbd95c9681bd3744efd1058991b SHA1 70d8051a1c290826f1b9f5f94d88e91e3dce83cb SHA256 c3dbe1d1c321a8526c6b6c5e613b6f4927a9ee684cb7571a299d90067351a8f0
+EBUILD textext-0.4.4-r1.ebuild 898 RMD160 1ed7afaff3904de6fc26380f71f07f68dbdffe25 SHA1 c97171e4537a3c0ae71bf03a45aacad236408a25 SHA256 8d0232c340965aa27a0865b242facdfc1e631306dd6ba5cd1a666355651e9285
+MISC ChangeLog 2300 RMD160 24a51c6403a720e5b8d291d54457bb3ec89432f1 SHA1 251f38b87695256fa574e4b9e7507f1bc91fddc5 SHA256 dc00d97a327464bd59ab4d068602a737651979aa8710744056033dacb0fb0cbe
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/media-gfx/textext/files/textext-0.4.4-md5-to-hashlib.patch b/media-gfx/textext/files/textext-0.4.4-md5-to-hashlib.patch
new file mode 100644 (file)
index 0000000..b2897e7
--- /dev/null
+++ b/media-gfx/textext/files/textext-0.4.4-md5-to-hashlib.patch
@@ -0,0 +1,36 @@
+# HG changeset patch -- Bitbucket.org
+# Project textext
+# URL http://bitbucket.org/pv/textext/overview
+# User Pauli Virtanen <pav@iki.fi>
+# Date 1237138023 -7200
+# Node ID 2a376a0465a43f7492b901d0ad96fb47eadf4e17
+# Parent  6a2e35ad799a179c147833a6ba828812958b8491
+Avoid Python2.6 deprecation warning by using hashlib instead of md5
+
+--- a/textext.py
++++ b/textext.py
+@@ -52,9 +52,14 @@ sys.path.append(r'c:/Program Files/Inksc
+ sys.path.append(os.path.dirname(__file__))
+ 
+ import inkex
+-import os, sys, tempfile, traceback, glob, re, md5, copy
++import os, sys, tempfile, traceback, glob, re, copy
+ from lxml import etree
+ 
++try:
++    import hashlib
++except ImportError:
++    import md5 as hashlib
++
+ USE_GTK = False
+ try:
+     import pygtk
+@@ -871,7 +876,7 @@ class Pdf2Svg(PdfConverterBase):
+ 
+     def convert(self, *a, **kw):
+         # compute hash for generating unique ids for sub-elements
+-        self.hash = md5.new('%s%s' % (a, kw)).hexdigest()[:8]
++        self.hash = hashlib.md5('%s%s' % (a, kw)).hexdigest()[:8]
+         return PdfConverterBase.convert(self, *a, **kw)
+ 
+     def pdf_to_svg(self):

diff --git a/media-gfx/textext/textext-0.4.4.ebuild b/media-gfx/textext/textext-0.4.4-r1.ebuild
similarity index 57%
rename from media-gfx/textext/textext-0.4.4.ebuild
rename to media-gfx/textext/textext-0.4.4-r1.ebuild
index 316f2773dede402339b057a7a77020e1af0532dc..2e849290283f7f893a3baa6343cacd46ecf96084 100644 (file)
--- a/media-gfx/textext/textext-0.4.4.ebuild
+++ b/media-gfx/textext/textext-0.4.4-r1.ebuild
@@ -2,23 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=2
 
 inherit eutils
 
-DESCRIPTION="textext is an inkscape extension, which embed re-editable LaTeX objects in SVG drawings"
-HOMEPAGE="http://www.elisanet.fi/ptvirtan/software/textext/"
-SRC_URI="http://www.elisanet.fi/ptvirtan/software/textext/${P}.tar.gz"
+DESCRIPTION="Inkscape extension to embed re-editable LaTeX objects in SVG drawings"
+HOMEPAGE="http://pav.iki.fi/software/textext/"
+SRC_URI="http://pav.iki.fi/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-gfx/inkscape-0.46
+DEPEND=""
+RDEPEND="media-gfx/inkscape
        virtual/latex-base
        || ( media-gfx/pdf2svg media-gfx/pstoedit[plotutils] )"
-DEPEND="${RDEPEND}"
+
+src_prepare() {
+       # Patch from upstream
+       # http://bitbucket.org/pv/textext/changeset/2a376a0465a4
+       epatch "${FILESDIR}/${P}-md5-to-hashlib.patch"
+}
 
 src_install() {
        exeinto /usr/share/inkscape/extensions