codegen isn't in the normal install paths; fixes bug #169343

Package-Manager: portage-2.1.2-r12

4 files changed, 38 insertions, 15 deletions

diff --git a/net-news/straw/ChangeLog b/net-news/straw/ChangeLog
index 728f3172578d..bf330299f07d 100644
--- a/net-news/straw/ChangeLog
+++ b/net-news/straw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/straw
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/straw/ChangeLog,v 1.7 2007/02/26 16:40:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/straw/ChangeLog,v 1.8 2007/03/05 16:22:03 dang Exp $
+
+  05 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/straw-0.25.1-setup-fix.patch, straw-0.25.1-r1.ebuild:
+  codegen isn't in the normal install paths; fixes bug #169343
 
 *straw-0.26 (26 Feb 2007)
 
diff --git a/net-news/straw/Manifest b/net-news/straw/Manifest
index 413e4cac87fa..f02cef663b70 100644
--- a/net-news/straw/Manifest
+++ b/net-news/straw/Manifest
@@ -5,6 +5,10 @@ AUX straw-0.21.2-convert_config.patch 407 RMD160 dc0946c807649eff9fd735174e60deb
 MD5 cf7bbdcb4ed714aba68c16b229b9fc8c files/straw-0.21.2-convert_config.patch 407
 RMD160 dc0946c807649eff9fd735174e60deb22f98cda1 files/straw-0.21.2-convert_config.patch 407
 SHA256 945e78e5b31d60deacf522c5fe898d001577b629655514a1d789112e9716d31f files/straw-0.21.2-convert_config.patch 407
+AUX straw-0.25.1-setup-fix.patch 552 RMD160 27ed14b4a16eebf25691e5d26bf132919118201c SHA1 00ec27e9406debe363d1ad4c2c09f2fa0408cab9 SHA256 55b09b3208ceb5a4de4d46f2f97f6727d41ed650fba8e3294b3de0305b2a8c1c
+MD5 bb2c58500d5c4898155977ac6e63c1d3 files/straw-0.25.1-setup-fix.patch 552
+RMD160 27ed14b4a16eebf25691e5d26bf132919118201c files/straw-0.25.1-setup-fix.patch 552
+SHA256 55b09b3208ceb5a4de4d46f2f97f6727d41ed650fba8e3294b3de0305b2a8c1c files/straw-0.25.1-setup-fix.patch 552
 DIST straw-0.19.2.tar.bz2 99639 RMD160 6983ccfc778766f6d1e1b67999513164c6dd1a90 SHA1 5ac3717027d7795e215ccaf2f7bb6fa9a14ac20e SHA256 a75e79d3371455fe6d37a26cbd867f9ef172ab912fbfca09744b0ffda1d998e6
 DIST straw-0.25.1.tar.gz 238215 RMD160 037816e37aced0b6790b50b401f7029da1930b4c SHA1 b5cf45e49901c9e750e3afa5fc67c0119285468d SHA256 b4274ced139388c577d88c2b3175915bee203e14bca99b065a7f3b1bebae5998
 DIST straw-0.26.tar.bz2 246860 RMD160 2c021e7cd32d264e5aefce55cd8e001cda843cb6 SHA1 89bac7a6e68d0e790cc443e8e1cef83282f6b569 SHA256 c4c7e017a49854ac94b8084dd0c0d6f6cc75e89978f62294ea2eae06c73518cf
@@ -12,18 +16,18 @@ EBUILD straw-0.19.2-r1.ebuild 1413 RMD160 6d8a9d53c4722ddbd445d93ac0fe543fa872a1
 MD5 c471658d26547a1b87cfc0ba41ef315e straw-0.19.2-r1.ebuild 1413
 RMD160 6d8a9d53c4722ddbd445d93ac0fe543fa872a1a4 straw-0.19.2-r1.ebuild 1413
 SHA256 63e8fc6a40ca92f3c4bf288aa95dadf8411c054afe5e81f9ae88fa09de5ddbad straw-0.19.2-r1.ebuild 1413
-EBUILD straw-0.25.1-r1.ebuild 2025 RMD160 3ca612a8ec41fbf574fb96dcaeb11962bc609f3c SHA1 7052d63e14436b40b71c825f20c85ae46b18b019 SHA256 9d4c8572d739d5a7bc5aa5f40dd0274ecf25f448673cc22659b3bd109a89236d
-MD5 eef418be7fb217ddba1e324151960773 straw-0.25.1-r1.ebuild 2025
-RMD160 3ca612a8ec41fbf574fb96dcaeb11962bc609f3c straw-0.25.1-r1.ebuild 2025
-SHA256 9d4c8572d739d5a7bc5aa5f40dd0274ecf25f448673cc22659b3bd109a89236d straw-0.25.1-r1.ebuild 2025
+EBUILD straw-0.25.1-r1.ebuild 2070 RMD160 78d11dc6659876ab52fc8c17e5ae3bcd6f33f4c9 SHA1 7acf922fb79dc3546fd5984b05fe495c529ff740 SHA256 9bf5193dad252062c670c2e2fa3001b8fd908faa51e6e782af46f3baaba0b9cb
+MD5 33ff14afaccd4fe2649ef0a97aa026a5 straw-0.25.1-r1.ebuild 2070
+RMD160 78d11dc6659876ab52fc8c17e5ae3bcd6f33f4c9 straw-0.25.1-r1.ebuild 2070
+SHA256 9bf5193dad252062c670c2e2fa3001b8fd908faa51e6e782af46f3baaba0b9cb straw-0.25.1-r1.ebuild 2070
 EBUILD straw-0.26.ebuild 1990 RMD160 bb1e1060d4d7bbd72029b51feedbd5ef39a63c64 SHA1 250ec09a0aebc0c460a5f22221dc766d77aaefb0 SHA256 b91740406e2ddd3e15f4326cd58560d4a7241437b9e9d348e2a7ab9dcf249095
 MD5 6967d39f551d873226624301678c4fe7 straw-0.26.ebuild 1990
 RMD160 bb1e1060d4d7bbd72029b51feedbd5ef39a63c64 straw-0.26.ebuild 1990
 SHA256 b91740406e2ddd3e15f4326cd58560d4a7241437b9e9d348e2a7ab9dcf249095 straw-0.26.ebuild 1990
-MISC ChangeLog 5339 RMD160 6e1c4366647b88fc6181038ad42e7ad507caa2fe SHA1 20bc132f039fe58c19b4633ced3a908514c58c15 SHA256 20fcfe69b6af49dc92820cee7ed751721a26f620673de09bf0d36f5c9752c3f9
-MD5 7c5fe9f1ad91789d2d2968f434b3f48d ChangeLog 5339
-RMD160 6e1c4366647b88fc6181038ad42e7ad507caa2fe ChangeLog 5339
-SHA256 20fcfe69b6af49dc92820cee7ed751721a26f620673de09bf0d36f5c9752c3f9 ChangeLog 5339
+MISC ChangeLog 5517 RMD160 ae37dcfcb32db01cc05bd6f14af17e8837b9daef SHA1 ba33f6a176fd13cb8c611edd651a2a0b76302fe5 SHA256 cda3efd06313bfcd836427ab2eba0b7935594c7f28350fe4e751e9656e67e532
+MD5 9b38f2c24e0841a610c0e009fe4e023c ChangeLog 5517
+RMD160 ae37dcfcb32db01cc05bd6f14af17e8837b9daef ChangeLog 5517
+SHA256 cda3efd06313bfcd836427ab2eba0b7935594c7f28350fe4e751e9656e67e532 ChangeLog 5517
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
 MD5 7f4b1ac767214657b085c4951227af02 metadata.xml 178
 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 metadata.xml 178
@@ -40,7 +44,7 @@ SHA256 dd8f2d96a61d249f5ca2f4b1442f0e45e972c5696c4111093a604b9f35aa35c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF4w0OomPajV0RnrERAq90AJ4vZSKtz7HRinlwVuZPWU/djfQbmwCeOMh4
-kp9h1QclXLrsmMSvmQuVp2k=
-=g/YF
+iD8DBQFF7EOQomPajV0RnrERAhpUAJ9VSHOBTqp/v5+/7ZT6rTJs+N3FuACfakXZ
+9cnR/iWO3vyP60WwqTG3zbg=
+=W3T0
 -----END PGP SIGNATURE-----
diff --git a/net-news/straw/files/straw-0.25.1-setup-fix.patch b/net-news/straw/files/straw-0.25.1-setup-fix.patch
new file mode 100644
index 000000000000..6e079d34988f
--- /dev/null
+++ b/net-news/straw/files/straw-0.25.1-setup-fix.patch
@@ -0,0 +1,14 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN straw-0.25.1.orig/setup.py straw-0.25.1/setup.py
+--- straw-0.25.1.orig/setup.py	2004-07-15 15:15:58.000000000 -0400
++++ straw-0.25.1/setup.py	2007-03-05 11:17:38.000000000 -0500
+@@ -9,6 +9,10 @@ import sys
+ import glob
+ import os.path
+ 
++# dang@gentoo.org: codegen (needed by TemplateExtension, below) isn't in the
++# standard paths
++sys.path.append('/usr/share/pygtk/2.0')
++
+ from tools.straw_distutils import setup
+ try:
+     from dsextras import TemplateExtension, getoutput, GLOBAL_MACROS
diff --git a/net-news/straw/straw-0.25.1-r1.ebuild b/net-news/straw/straw-0.25.1-r1.ebuild
index 73eaeef1be37..a92261cf3231 100644
--- a/net-news/straw/straw-0.25.1-r1.ebuild
+++ b/net-news/straw/straw-0.25.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/straw/straw-0.25.1-r1.ebuild,v 1.2 2005/08/21 19:28:17 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/straw/straw-0.25.1-r1.ebuild,v 1.3 2007/03/05 16:22:03 dang Exp $
 
-inherit gnome2 python distutils virtualx
+inherit gnome2 python distutils virtualx eutils
 
 DESCRIPTION="RSS/RDF News Aggregator"
 HOMEPAGE="http://www.nongnu.org/straw/"
@@ -45,6 +45,7 @@ pkg_setup() {
 # Olivier Crete <tester@gentoo.org> 
 
 src_compile() {
+	epatch "${FILESDIR}"/${P}-setup-fix.patch
 	export maketype="distutils_src_compile"
 	virtualmake || die "compilation failed"
 }