From c07f41eb149704e50ad28991ab53c31e5b1d4808 Mon Sep 17 00:00:00 2001 From: "John N. Laliberte" Date: Sat, 16 Jul 2005 14:35:14 +0000 Subject: add deps on gnome-python-extras because gtkhtml2 module moved. fixes #97764 Package-Manager: portage-2.0.51.22-r1 --- net-news/straw/ChangeLog | 10 +++- net-news/straw/Manifest | 10 ++-- net-news/straw/files/digest-straw-0.19.2 | 1 - net-news/straw/files/digest-straw-0.19.2-r1 | 1 + net-news/straw/files/digest-straw-0.25.1 | 1 - net-news/straw/files/digest-straw-0.25.1-r1 | 1 + net-news/straw/straw-0.19.2-r1.ebuild | 52 +++++++++++++++++++ net-news/straw/straw-0.19.2.ebuild | 50 ------------------- net-news/straw/straw-0.25.1-r1.ebuild | 77 +++++++++++++++++++++++++++++ net-news/straw/straw-0.25.1.ebuild | 76 ---------------------------- 10 files changed, 145 insertions(+), 134 deletions(-) delete mode 100644 net-news/straw/files/digest-straw-0.19.2 create mode 100644 net-news/straw/files/digest-straw-0.19.2-r1 delete mode 100644 net-news/straw/files/digest-straw-0.25.1 create mode 100644 net-news/straw/files/digest-straw-0.25.1-r1 create mode 100644 net-news/straw/straw-0.19.2-r1.ebuild delete mode 100644 net-news/straw/straw-0.19.2.ebuild create mode 100644 net-news/straw/straw-0.25.1-r1.ebuild delete mode 100644 net-news/straw/straw-0.25.1.ebuild (limited to 'net-news/straw') diff --git a/net-news/straw/ChangeLog b/net-news/straw/ChangeLog index d7108fdabb14..69630315d3ce 100644 --- a/net-news/straw/ChangeLog +++ b/net-news/straw/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-news/straw # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/straw/ChangeLog,v 1.3 2005/03/18 14:35:33 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/straw/ChangeLog,v 1.4 2005/07/16 14:35:14 allanonjl Exp $ + +*straw-0.25.1-r1 (16 Jul 2005) +*straw-0.19.2-r1 (16 Jul 2005) + + 16 Jul 2005; John N. Laliberte + -straw-0.19.2.ebuild, +straw-0.19.2-r1.ebuild, -straw-0.25.1.ebuild, + +straw-0.25.1-r1.ebuild: + add deps on gnome-python-extras because gtkhtml2 module moved. fixes #97764 *straw-0.25.1 (18 Mar 2005) *straw-0.23 (18 Mar 2005) diff --git a/net-news/straw/Manifest b/net-news/straw/Manifest index 90b10cb5bcd0..a1047c38b37f 100644 --- a/net-news/straw/Manifest +++ b/net-news/straw/Manifest @@ -1,7 +1,7 @@ -MD5 4536a40e7befd906dc1ad15c9ac0000c straw-0.19.2.ebuild 1374 -MD5 7932082a01151cf4bceb7670ea9c392e straw-0.25.1.ebuild 1959 -MD5 1a8422efb912f3f7ffc863723c7af3a6 ChangeLog 4440 +MD5 c471658d26547a1b87cfc0ba41ef315e straw-0.19.2-r1.ebuild 1413 +MD5 b51152edfa2e4fcb6f266c1e809097ac straw-0.25.1-r1.ebuild 1998 +MD5 0bc4d455ebed942c7835d59f54209ec9 ChangeLog 4739 MD5 7f4b1ac767214657b085c4951227af02 metadata.xml 178 MD5 cf7bbdcb4ed714aba68c16b229b9fc8c files/straw-0.21.2-convert_config.patch 407 -MD5 4de4ce496f2607dd3a9b38d2f30a856e files/digest-straw-0.19.2 64 -MD5 c368caef5c38e5954c5dce2e2a14fe20 files/digest-straw-0.25.1 64 +MD5 4de4ce496f2607dd3a9b38d2f30a856e files/digest-straw-0.19.2-r1 64 +MD5 c368caef5c38e5954c5dce2e2a14fe20 files/digest-straw-0.25.1-r1 64 diff --git a/net-news/straw/files/digest-straw-0.19.2 b/net-news/straw/files/digest-straw-0.19.2 deleted file mode 100644 index 0553bedf6e59..000000000000 --- a/net-news/straw/files/digest-straw-0.19.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 c0b4e58aeb47ef1546dd73771900944a straw-0.19.2.tar.bz2 99639 diff --git a/net-news/straw/files/digest-straw-0.19.2-r1 b/net-news/straw/files/digest-straw-0.19.2-r1 new file mode 100644 index 000000000000..0553bedf6e59 --- /dev/null +++ b/net-news/straw/files/digest-straw-0.19.2-r1 @@ -0,0 +1 @@ +MD5 c0b4e58aeb47ef1546dd73771900944a straw-0.19.2.tar.bz2 99639 diff --git a/net-news/straw/files/digest-straw-0.25.1 b/net-news/straw/files/digest-straw-0.25.1 deleted file mode 100644 index 8fe79ffb4b70..000000000000 --- a/net-news/straw/files/digest-straw-0.25.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 058a58e945e37cc264c562f5ca4ff781 straw-0.25.1.tar.gz 238215 diff --git a/net-news/straw/files/digest-straw-0.25.1-r1 b/net-news/straw/files/digest-straw-0.25.1-r1 new file mode 100644 index 000000000000..8fe79ffb4b70 --- /dev/null +++ b/net-news/straw/files/digest-straw-0.25.1-r1 @@ -0,0 +1 @@ +MD5 058a58e945e37cc264c562f5ca4ff781 straw-0.25.1.tar.gz 238215 diff --git a/net-news/straw/straw-0.19.2-r1.ebuild b/net-news/straw/straw-0.19.2-r1.ebuild new file mode 100644 index 000000000000..08c5be83943b --- /dev/null +++ b/net-news/straw/straw-0.19.2-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-news/straw/straw-0.19.2-r1.ebuild,v 1.1 2005/07/16 14:35:14 allanonjl Exp $ + +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="" +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/pyxml-0.8.1 + >=dev-python/egenix-mx-base-2 + =dev-python/adns-python-1.0.0 + dev-python/gnome-python-extras + " + +DEPEND="${RDEPEND} + >=sys-apps/sed-4" + +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() { + make PREFIX=${D}/usr install || die "install failed" + dodoc NEWS README TODO +} + diff --git a/net-news/straw/straw-0.19.2.ebuild b/net-news/straw/straw-0.19.2.ebuild deleted file mode 100644 index 8fd2a722da41..000000000000 --- a/net-news/straw/straw-0.19.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/straw/straw-0.19.2.ebuild,v 1.1 2005/03/18 14:22:06 seemant Exp $ - -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="" -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/pyxml-0.8.1 - >=dev-python/egenix-mx-base-2 - =dev-python/adns-python-1.0.0" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -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() { - make PREFIX=${D}/usr install || die "install failed" - dodoc NEWS README TODO -} - diff --git a/net-news/straw/straw-0.25.1-r1.ebuild b/net-news/straw/straw-0.25.1-r1.ebuild new file mode 100644 index 000000000000..fc2c744ea98f --- /dev/null +++ b/net-news/straw/straw-0.25.1-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2005 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.1 2005/07/16 14:35:14 allanonjl Exp $ + +inherit gnome2 python distutils virtualx + +DESCRIPTION="RSS/RDF News Aggregator" +HOMEPAGE="http://www.nongnu.org/straw/" +SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="x86 ~ppc ~amd64" +IUSE="" + +DEPEND=">=dev-lang/python-2.2.3-r3" + +RDEPEND="${DEPEND} + >=gnome-base/libglade-2.4 + >=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/gnome-python-extras + !ppc? ( >=dev-python/adns-python-1.0.0 )" + +# REMIND : egenix-mx-base is only needed for the conversion of +# pre 0.22 straw databases. It should be removed at some point. +# foser 18 Feb 2004 + +pkg_setup() { + export maketype="python" + if ! echo "import gtkhtml2" | virtualmake; then + eerror "The gnome-python gtkhtml2 module was not found." + eerror "Rebuild gnome-python using:" + eerror " USE=\"gtkhtml\" emerge gnome-python" + die "missing gtkhtml2 python module" + fi +} + +# This about of virtualmake in src_compile and src_install are +# pretty horrible.. why can't I compile gtk base modules in +# distutils without that (ps. I'm the upstream guy to blame) +# Olivier Crete + +src_compile() { + export maketype="distutils_src_compile" + virtualmake || die "compilation failed" +} + +src_install() { + # work around bug in straw's install script + export maketype="distutils_src_install" + virtualmake \ + --prefix=/usr \ + --sysconfdir=${D}/etc \ + --disable-schemas-install +} + +pkg_postinst() { + + distutils_pkg_postinst + gnome2_pkg_postinst # need this for gconf schemas + + echo + einfo "Consult the README if you have database conversion problems on startup." + echo + +} + +pkg_postrm() { + + distutils_pkg_postrm + gnome2_pkg_postrm + +} diff --git a/net-news/straw/straw-0.25.1.ebuild b/net-news/straw/straw-0.25.1.ebuild deleted file mode 100644 index 353e5d5d1243..000000000000 --- a/net-news/straw/straw-0.25.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2005 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.ebuild,v 1.2 2005/06/21 13:52:53 foser Exp $ - -inherit gnome2 python distutils virtualx - -DESCRIPTION="RSS/RDF News Aggregator" -HOMEPAGE="http://www.nongnu.org/straw/" -SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="x86 ~ppc ~amd64" -IUSE="" - -DEPEND=">=dev-lang/python-2.2.3-r3" - -RDEPEND="${DEPEND} - >=gnome-base/libglade-2.4 - >=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 - !ppc? ( >=dev-python/adns-python-1.0.0 )" - -# REMIND : egenix-mx-base is only needed for the conversion of -# pre 0.22 straw databases. It should be removed at some point. -# foser 18 Feb 2004 - -pkg_setup() { - export maketype="python" - if ! echo "import gtkhtml2" | virtualmake; then - eerror "The gnome-python gtkhtml2 module was not found." - eerror "Rebuild gnome-python using:" - eerror " USE=\"gtkhtml\" emerge gnome-python" - die "missing gtkhtml2 python module" - fi -} - -# This about of virtualmake in src_compile and src_install are -# pretty horrible.. why can't I compile gtk base modules in -# distutils without that (ps. I'm the upstream guy to blame) -# Olivier Crete - -src_compile() { - export maketype="distutils_src_compile" - virtualmake || die "compilation failed" -} - -src_install() { - # work around bug in straw's install script - export maketype="distutils_src_install" - virtualmake \ - --prefix=/usr \ - --sysconfdir=${D}/etc \ - --disable-schemas-install -} - -pkg_postinst() { - - distutils_pkg_postinst - gnome2_pkg_postinst # need this for gconf schemas - - echo - einfo "Consult the README if you have database conversion problems on startup." - echo - -} - -pkg_postrm() { - - distutils_pkg_postrm - gnome2_pkg_postrm - -} -- cgit v1.2.3-65-gdbad