Do not call "which" to check for dia (bug #128688).

Package-Manager: portage-2.1.1_pre1-r2

5 files changed, 74 insertions, 9 deletions

diff --git a/dev-python/twisted-lore/ChangeLog b/dev-python/twisted-lore/ChangeLog
index 83ee9a13300d..cee78e1d1814 100644
--- a/dev-python/twisted-lore/ChangeLog
+++ b/dev-python/twisted-lore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-lore
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.10 2006/05/26 18:43:37 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.11 2006/06/26 22:18:10 marienz Exp $
+
+*twisted-lore-0.1.0-r2 (26 Jun 2006)
+
+  26 Jun 2006; Marien Zwart <marienz@gentoo.org>
+  +files/twisted-lore-0.1.0-which.patch, +twisted-lore-0.1.0-r2.ebuild:
+  Do not call "which" to check for dia (bug #128688).
 
 *twisted-lore-0.2.0 (26 May 2006)
 
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index 475310c0ab5a..28b68ee12299 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST TwistedLore-0.1.0.tar.bz2 58386 RMD160 755df5830fab00d71bcdf4878d77fcec533a1eac SHA256 5a2a61423ab091ac4f7e2877987c420d3701c8960d2312ddd17f410dd5b7fe92
+AUX twisted-lore-0.1.0-which.patch 684 RMD160 8d772ad56c7e48fbde460dd1cc772d64d62f2b26 SHA1 b2b5acfd7eafcf6a05804e0f6423d37395ec28cd SHA256 a088d74ccce5c812faeed60dc881595a850bcc419ba53c79bc157d5fb4e64544
+MD5 90eb6b89791ba09387c995b1f08c2539 files/twisted-lore-0.1.0-which.patch 684
+RMD160 8d772ad56c7e48fbde460dd1cc772d64d62f2b26 files/twisted-lore-0.1.0-which.patch 684
+SHA256 a088d74ccce5c812faeed60dc881595a850bcc419ba53c79bc157d5fb4e64544 files/twisted-lore-0.1.0-which.patch 684
+DIST TwistedLore-0.1.0.tar.bz2 58386 RMD160 755df5830fab00d71bcdf4878d77fcec533a1eac SHA1 97452a22efe96e068e7537ca572028c6e97e3901 SHA256 5a2a61423ab091ac4f7e2877987c420d3701c8960d2312ddd17f410dd5b7fe92
 DIST TwistedLore-0.2.0.tar.bz2 61194 RMD160 b6b6390af3e945657817d3e059bf377580e7df35 SHA1 e4a7eb4132388a211eaa5b559b60f00005916226 SHA256 7b4cac320680dc1f5c84b93021b7eaf7cd646ca63e3556c7360f53e0f3e3acf9
 EBUILD twisted-lore-0.1.0-r1.ebuild 435 RMD160 72ebde7d49762dedf30ee22000718d8834b751da SHA1 895d0159a3a655db2fb0ecc1f8d9610bc9b9ccd4 SHA256 8906329169054fa2808e0f4d3f9883a4fa755440b6922cdf98f9a5623f9ffba2
 MD5 9c368d3f194cfec451d03cbded4ff0df twisted-lore-0.1.0-r1.ebuild 435
 RMD160 72ebde7d49762dedf30ee22000718d8834b751da twisted-lore-0.1.0-r1.ebuild 435
 SHA256 8906329169054fa2808e0f4d3f9883a4fa755440b6922cdf98f9a5623f9ffba2 twisted-lore-0.1.0-r1.ebuild 435
+EBUILD twisted-lore-0.1.0-r2.ebuild 601 RMD160 0f87bbc133318abc800631bc26ca6aa74cf8d845 SHA1 f8d53b4d4357d3fdb9ffafc1c865d667296eafd9 SHA256 ed513ae4d5da3ab2d1fdd4689b8d8fa615f0409685090c413506fed545ac3b61
+MD5 ade9092275032fe9f4139e254ae6c9f4 twisted-lore-0.1.0-r2.ebuild 601
+RMD160 0f87bbc133318abc800631bc26ca6aa74cf8d845 twisted-lore-0.1.0-r2.ebuild 601
+SHA256 ed513ae4d5da3ab2d1fdd4689b8d8fa615f0409685090c413506fed545ac3b61 twisted-lore-0.1.0-r2.ebuild 601
 EBUILD twisted-lore-0.2.0.ebuild 411 RMD160 ba85b398d64df51b0fe24949e2ac35c42a51d1a9 SHA1 12cc696a83eda56ec49e4e800212237c617a4dfc SHA256 22af05d9fa2c302e63f091786d4d5b16a21dae2604f650646fed0f9bbf61650b
 MD5 a8391ab80b0d6f16c324ee7b2047b690 twisted-lore-0.2.0.ebuild 411
 RMD160 ba85b398d64df51b0fe24949e2ac35c42a51d1a9 twisted-lore-0.2.0.ebuild 411
 SHA256 22af05d9fa2c302e63f091786d4d5b16a21dae2604f650646fed0f9bbf61650b twisted-lore-0.2.0.ebuild 411
-MISC ChangeLog 1483 RMD160 248056ca2b594260dc6ac7d7393234ff6435daa1 SHA1 38b5ac80451b7688d0a83968dbf50baa0f3238b0 SHA256 e4caf476bc85d0754e6ae37c8ff6c077fea4dade61cc5ca5f47023b79a3c21f8
-MD5 690ca5272ef29539e6c38e44cb2afe20 ChangeLog 1483
-RMD160 248056ca2b594260dc6ac7d7393234ff6435daa1 ChangeLog 1483
-SHA256 e4caf476bc85d0754e6ae37c8ff6c077fea4dade61cc5ca5f47023b79a3c21f8 ChangeLog 1483
+MISC ChangeLog 1697 RMD160 c1ee221e7ccb9588493f335f0c798cb4c9da4c0e SHA1 08c429b884399e377914e05c47487765ce51c697 SHA256 c46a809258defd713c4c1a80b17228dce5b0ed02e936b5bf5c29ee5a401bc11f
+MD5 332cfc3e6ffa51dbbddb76428be8f36e ChangeLog 1697
+RMD160 c1ee221e7ccb9588493f335f0c798cb4c9da4c0e ChangeLog 1697
+SHA256 c46a809258defd713c4c1a80b17228dce5b0ed02e936b5bf5c29ee5a401bc11f ChangeLog 1697
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -22,13 +30,16 @@ SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata
 MD5 33b435ccd6caadc52b7c4df89d24ec75 files/digest-twisted-lore-0.1.0-r1 253
 RMD160 72c6664f03270ab626c1c9a16c0113287c256bde files/digest-twisted-lore-0.1.0-r1 253
 SHA256 45e52953a394ccc91d9604325ea073b771bca13b4d7f3c3258006812466f09ee files/digest-twisted-lore-0.1.0-r1 253
+MD5 33b435ccd6caadc52b7c4df89d24ec75 files/digest-twisted-lore-0.1.0-r2 253
+RMD160 72c6664f03270ab626c1c9a16c0113287c256bde files/digest-twisted-lore-0.1.0-r2 253
+SHA256 45e52953a394ccc91d9604325ea073b771bca13b4d7f3c3258006812466f09ee files/digest-twisted-lore-0.1.0-r2 253
 MD5 554aafe337e5ba3fed8908b17c8d2c04 files/digest-twisted-lore-0.2.0 253
 RMD160 742f86b25024cf4b36919e172794d510a0f020af files/digest-twisted-lore-0.2.0 253
 SHA256 844c198a856920e43e58f16f0e52121b846e6e9aa27b1795300a8c631152a194 files/digest-twisted-lore-0.2.0 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEd0xgW78445TWHXcRAjKHAKCHiX/+LHhWATqpj73E1d7N1uPBOwCeOZNA
-kiLyTaatQ7BeUjO22Ni45Vw=
-=QrkT
+iD8DBQFEoF0oUElL7eJpfEQRAoBtAJwLGpayiBgaKZviLj9yT8fVFNRx3ACZAbrN
+frtMOsOYCFVB6FoPz+2jnvo=
+=ZSqQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-lore/files/digest-twisted-lore-0.1.0-r2 b/dev-python/twisted-lore/files/digest-twisted-lore-0.1.0-r2
new file mode 100644
index 000000000000..082c1b572f8c
--- /dev/null
+++ b/dev-python/twisted-lore/files/digest-twisted-lore-0.1.0-r2
@@ -0,0 +1,3 @@
+MD5 c38eea006be598081778d79c98fc8a42 TwistedLore-0.1.0.tar.bz2 58386
+RMD160 755df5830fab00d71bcdf4878d77fcec533a1eac TwistedLore-0.1.0.tar.bz2 58386
+SHA256 5a2a61423ab091ac4f7e2877987c420d3701c8960d2312ddd17f410dd5b7fe92 TwistedLore-0.1.0.tar.bz2 58386
diff --git a/dev-python/twisted-lore/files/twisted-lore-0.1.0-which.patch b/dev-python/twisted-lore/files/twisted-lore-0.1.0-which.patch
new file mode 100644
index 000000000000..cae970f2dd09
--- /dev/null
+++ b/dev-python/twisted-lore/files/twisted-lore-0.1.0-which.patch
@@ -0,0 +1,22 @@
+Index: /trunk/twisted/lore/latex.py

+===================================================================

+--- /trunk/twisted/lore/latex.py (revision 11450)

++++ /trunk/twisted/lore/latex.py (revision 13880)

+@@ -5,5 +5,5 @@

+ 

+ from twisted.web import microdom, domhelpers

+-from twisted.python import text

++from twisted.python import text, procutils

+ import os, os.path, re, string

+ from cStringIO import StringIO

+@@ -104,9 +104,5 @@

+ 

+     baseLevel = 0

+-    try:

+-        diaHack = not not os.popen('which dia').read()

+-    except:

+-        # That's a no, then.

+-        diaHack = 0

++    diaHack = bool(procutils.which("dia"))

+ 

+     def writeNodeData(self, node):

diff --git a/dev-python/twisted-lore/twisted-lore-0.1.0-r2.ebuild b/dev-python/twisted-lore/twisted-lore-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..eda785ae335a
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-0.1.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-0.1.0-r2.ebuild,v 1.1 2006/06/26 22:18:10 marienz Exp $
+
+MY_PACKAGE=Lore
+
+inherit twisted eutils
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-python/twisted-2
+	<dev-python/twisted-2.4
+	dev-python/twisted-web"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use python to figure out if dia is available instead of calling "which"
+	epatch "${FILESDIR}/${P}-which.patch"
+}