fix python2.3 support and other .py/.pyc issues

3 files changed, 30 insertions, 22 deletions

diff --git a/net-www/straw/ChangeLog b/net-www/straw/ChangeLog
index ad823c42fb8a..5ec909574d39 100644
--- a/net-www/straw/ChangeLog
+++ b/net-www/straw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/straw
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.11 2003/10/08 21:24:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.12 2003/10/26 19:58:20 liquidx Exp $
+
+  17 Oct 2003; Alastair Tse <liquidx@gentoo.org> straw-0.19.2.ebuild:
+  various fixes to support python-2.3, installs .py's and post processes
+  .pyc/.pyo
 
 *straw-0.19.2 (08 Oct 2003)
 
diff --git a/net-www/straw/Manifest b/net-www/straw/Manifest
index 50926ce305d6..dca042007ad5 100644
--- a/net-www/straw/Manifest
+++ b/net-www/straw/Manifest
@@ -1,6 +1,6 @@
-MD5 05c7b1884e0ec5cee8e7b318bbe365ed straw-0.19.2.ebuild 1034
-MD5 ef382a30e7fb91a5d9a762384916bcdd straw-0.19.1.ebuild 1028
-MD5 c481ea72dae41ec0be446e079b85788e ChangeLog 1437
+MD5 02d4ffb2713c42fd22ba2abdd234937f ChangeLog 1595
 MD5 f7653644adcb8aac56753e12ab304f51 metadata.xml 235
+MD5 ef382a30e7fb91a5d9a762384916bcdd straw-0.19.1.ebuild 1028
+MD5 ead35f95f2a274336728ccaac5108303 straw-0.19.2.ebuild 1383
 MD5 be19a4f8ca22508621e2712473605449 files/digest-straw-0.19.1 64
 MD5 4de4ce496f2607dd3a9b38d2f30a856e files/digest-straw-0.19.2 64
diff --git a/net-www/straw/straw-0.19.2.ebuild b/net-www/straw/straw-0.19.2.ebuild
index 0d8d7140a68d..9c56421ac61e 100644
--- a/net-www/straw/straw-0.19.2.ebuild
+++ b/net-www/straw/straw-0.19.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.19.2.ebuild,v 1.1 2003/10/08 21:24:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.19.2.ebuild,v 1.2 2003/10/26 19:58:20 liquidx Exp $
 
-DESCRIPTION="RSS news aggregator"
-HOMEPAGE="http://www.nongnu.org/straw/"
-LICENSE="GPL-2"
+inherit python distutils
 
+DESCRIPTION="RSS/RDF News Aggregator"
+HOMEPAGE="http://www.nongnu.org/straw/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-
-DEPEND="virtual/python
+RDEPEND=">=dev-lang/python-2.2.3-r3
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2.0.1
 	>=dev-python/gnome-python-1.99.13
@@ -21,26 +21,30 @@ DEPEND="virtual/python
 	>=dev-python/egenix-mx-base-2
 	=dev-python/adns-python-1.0.0"
 
-src_unpack() {
-
-	unpack ${A}
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:-d \$(BINDIR) \$(LIBDIR) \$(DATADIR):-d \$(BINDIR) \$(LIBDIR) \$(DATADIR) \$(APPLICATIONSDIR) \$(ICONDIR):" Makefile.orig > Makefile || die
+MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	unpack ${A}
+	python_version
+	sed -e "s:-d \$(BINDIR) \$(LIBDIR) \$(DATADIR):-d \$(BINDIR) \$(LIBDIR) \$(DATADIR) \$(APPLICATIONSDIR) \$(ICONDIR):" \
+		-e "s:^\(PYTHON.*\)python2.2:\1python${PYVER}:" \
+		-e "s:^\(LIBDIR.*\)python2.2\(.*\):\1python${PYVER}\2:" \
+		-e "s:py\[co\]:py:" \
+		-i ${S}/Makefile || die "sed failed"
+	sed -e "s:/usr/bin/env python2.2:/usr/bin/env python${PYVER}:" \
+		-i ${S}/src/straw
 }
 
 src_compile() {
-
+	export LC_ALL="C"
 	emake || die
-
 }
 
 src_install() {
-
-	emake PREFIX=${D}/usr install || die
-
+	make PREFIX=${D}/usr install || die "install failed"
 	dodoc NEWS README TODO
-
 }
+