diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-11-27 14:06:43 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-11-27 14:06:43 +0000 |
| commit | 8685a26e80e4d0166d023c83d81d78ccd2ebe486 (patch) | |
| tree | d7ca5c28dce2ef32cfdd7aa13ea1742680c4d3a9 | |
| parent | new release (diff) | |
| download | gentoo-2-8685a26e80e4d0166d023c83d81d78ccd2ebe486.tar.gz gentoo-2-8685a26e80e4d0166d023c83d81d78ccd2ebe486.tar.bz2 gentoo-2-8685a26e80e4d0166d023c83d81d78ccd2ebe486.zip | |
quick fix for upgrading from older versions
| -rw-r--r-- | net-www/straw/ChangeLog | 5 | ||||
| -rw-r--r-- | net-www/straw/Manifest | 5 | ||||
| -rw-r--r-- | net-www/straw/files/straw-0.21.2-convert_config.patch | 11 | ||||
| -rw-r--r-- | net-www/straw/straw-0.21.2.ebuild | 11 |
4 files changed, 26 insertions, 6 deletions
diff --git a/net-www/straw/ChangeLog b/net-www/straw/ChangeLog index eded47fc9283..6c35bbf6d1f4 100644 --- a/net-www/straw/ChangeLog +++ b/net-www/straw/ChangeLog @@ -1,6 +1,9 @@ # 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.16 2003/11/27 12:47:59 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.17 2003/11/27 14:06:38 liquidx Exp $ + + 27 Nov 2003; Alastair Tse <liquidx@gentoo.org> straw-0.21.2.ebuild: + added fix for first time conversion from <0.21.x *straw-0.21.2 (27 Nov 2003) diff --git a/net-www/straw/Manifest b/net-www/straw/Manifest index 795e5dfe4760..5a69e32959e9 100644 --- a/net-www/straw/Manifest +++ b/net-www/straw/Manifest @@ -1,10 +1,11 @@ -MD5 ff56d890e7dd72b4fcc9b07a4b8c1770 ChangeLog 2127 +MD5 4447a050b64f7ff557168ebe617adedd ChangeLog 2249 MD5 f7653644adcb8aac56753e12ab304f51 metadata.xml 235 MD5 ef382a30e7fb91a5d9a762384916bcdd straw-0.19.1.ebuild 1028 MD5 a13e1fc2994a2c3a10caed8379031e35 straw-0.19.2.ebuild 1380 MD5 fc4a7f2349d527854fd6f3853fe659fe straw-0.21.1.ebuild 1359 -MD5 b7eaa48b5231326d5db5ae99ebd7c9d7 straw-0.21.2.ebuild 1859 +MD5 f71c4fc8c84a8abd8e6962c55d2fc627 straw-0.21.2.ebuild 2157 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 MD5 02c585d463b5069559098bf5946589d7 files/digest-straw-0.21.2 65 +MD5 cf7bbdcb4ed714aba68c16b229b9fc8c files/straw-0.21.2-convert_config.patch 407 diff --git a/net-www/straw/files/straw-0.21.2-convert_config.patch b/net-www/straw/files/straw-0.21.2-convert_config.patch new file mode 100644 index 000000000000..f627d2abdeec --- /dev/null +++ b/net-www/straw/files/straw-0.21.2-convert_config.patch @@ -0,0 +1,11 @@ +--- Config.py~ 2003-11-26 18:34:27.000000000 +0000 ++++ Config.py 2003-11-27 13:23:17.000000000 +0000 +@@ -469,7 +469,7 @@ + if not os.path.exists(config.straw_config_file): + return + +- f = open(config.straw_config_file, "rw") ++ f = open(config.straw_config_file, "r+") + cf = cPickle.load(f) + if cf.has_key('poll_frequency'): + config.poll_frequency = cf.get('poll_frequency') diff --git a/net-www/straw/straw-0.21.2.ebuild b/net-www/straw/straw-0.21.2.ebuild index 98466a9464c8..c6705ddc1b81 100644 --- a/net-www/straw/straw-0.21.2.ebuild +++ b/net-www/straw/straw-0.21.2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.21.2.ebuild,v 1.2 2003/11/27 14:06:38 liquidx Exp $ inherit gnome2 python distutils @@ -38,13 +38,18 @@ src_unpack() { -i ${S}/Makefile || die "sed failed" sed -e "s:/usr/bin/env python2.2:/usr/bin/env python${PYVER}:" \ -i ${S}/src/straw + # probably can remove in next version - fixes f.truncate() errors. + # http://savannah.nongnu.org/bugs/?func=detailitem&item_id=6816 + EPATCH_OPTS="-d ${S}/src/lib" epatch ${FILESDIR}/${P}-convert_config.patch } src_compile() { export LC_ALL="C" - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" + # disable gconftool from violating sandbox, reported upstream. + # remove in next version. + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" emake || die "make failed" - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL } src_install() { |