new version with various fixes

4 files changed, 79 insertions, 4 deletions

diff --git a/net-www/straw/ChangeLog b/net-www/straw/ChangeLog
index 36d98bf55269..eded47fc9283 100644
--- a/net-www/straw/ChangeLog
+++ b/net-www/straw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2003/11/15 18:02:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.16 2003/11/27 12:47:59 liquidx Exp $
+
+*straw-0.21.2 (27 Nov 2003)
+
+  27 Nov 2003; Alastair Tse <liquidx@gentoo.org> straw-0.21.2.ebuild:
+  put gconf files in the right place and use gnome2 eclass. temporary fix
+  for ${S}. will be fixed upstream in next version.
 
 *straw-0.21.1 (15 Nov 2003)
 
diff --git a/net-www/straw/Manifest b/net-www/straw/Manifest
index 2056a6c7f990..795e5dfe4760 100644
--- a/net-www/straw/Manifest
+++ b/net-www/straw/Manifest
@@ -1,9 +1,9 @@
-MD5 ccea90aabe9f80cb007eb7e8f8853107 ChangeLog 2029
+MD5 ff56d890e7dd72b4fcc9b07a4b8c1770 ChangeLog 2127
 MD5 f7653644adcb8aac56753e12ab304f51 metadata.xml 235
 MD5 ef382a30e7fb91a5d9a762384916bcdd straw-0.19.1.ebuild 1028
 MD5 a13e1fc2994a2c3a10caed8379031e35 straw-0.19.2.ebuild 1380
-MD5 3f4adab64d2cf2ecbcc1aa87e10dabf3 straw-0.21.1.ebuild 1549
-MD5 3f4adab64d2cf2ecbcc1aa87e10dabf3 straw-0.21.2.ebuild 1549
+MD5 fc4a7f2349d527854fd6f3853fe659fe straw-0.21.1.ebuild 1359
+MD5 b7eaa48b5231326d5db5ae99ebd7c9d7 straw-0.21.2.ebuild 1859
 MD5 be19a4f8ca22508621e2712473605449 files/digest-straw-0.19.1 64
 MD5 4de4ce496f2607dd3a9b38d2f30a856e files/digest-straw-0.19.2 64
 MD5 1d6b864e5be04d7349ca14f558f74613 files/digest-straw-0.21.1 65
diff --git a/net-www/straw/files/digest-straw-0.21.2 b/net-www/straw/files/digest-straw-0.21.2
new file mode 100644
index 000000000000..019eb0dc37f6
--- /dev/null
+++ b/net-www/straw/files/digest-straw-0.21.2
@@ -0,0 +1 @@
+MD5 b38a44e252078209653f90a58c9b315f straw-0.21.2.tar.bz2 111910
diff --git a/net-www/straw/straw-0.21.2.ebuild b/net-www/straw/straw-0.21.2.ebuild
new file mode 100644
index 000000000000..98466a9464c8
--- /dev/null
+++ b/net-www/straw/straw-0.21.2.ebuild
@@ -0,0 +1,68 @@
+# 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.21.2.ebuild,v 1.1 2003/11/27 12:47:59 liquidx Exp $
+
+inherit gnome2 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=""
+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
+	>=dev-python/pygtk-1.99.13-r1
+	>=dev-python/bsddb3-3.4.0
+	>=dev-python/egenix-mx-base-2
+	=dev-python/adns-python-1.0.0"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# boo-boo by upstream devs, remove in next version
+S=${WORKDIR}/${PN}
+
+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"
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"	
+	emake || die "make failed"
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL	
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	make PREFIX=${D}/usr \
+		SYSCONFDIR=${D}/etc \
+		SCHEMADIR=${D}/etc/gconf/schemas \
+		install || die "install failed"
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+	dodoc NEWS README TODO
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	gnome2_pkg_postinst # need this for gconf schemas
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	gnome2_pkg_postrm
+}