diff options
Diffstat (limited to 'net-misc/jigdo')
| -rw-r--r-- | net-misc/jigdo/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch | 80 | ||||
| -rw-r--r-- | net-misc/jigdo/files/makefile.patch | 11 | ||||
| -rw-r--r-- | net-misc/jigdo/jigdo-0.7.3.ebuild | 36 |
4 files changed, 102 insertions, 33 deletions
diff --git a/net-misc/jigdo/ChangeLog b/net-misc/jigdo/ChangeLog index 117a032195ec..d391ed02c21a 100644 --- a/net-misc/jigdo/ChangeLog +++ b/net-misc/jigdo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/jigdo # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.20 2008/01/25 21:15:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.21 2008/04/29 19:12:02 drac Exp $ + + 29 Apr 2008; Samuli Suominen <drac@gentoo.org> + +files/jigdo-0.7.3-gcc43.patch, jigdo-0.7.3.ebuild: + Change sys-libs/db depend wrt #218467. Fix building with GCC 4.3 wrt + #218465. Thanks to Peter Alfredsen. Also use econf, and stop patching + econf generated Makefile in src_compile. 25 Jan 2008; Raúl Porcel <armin76@gentoo.org> -files/jigdo-0.7.2-64bit.patch, -files/jigdo-gentoo-db3.patch, diff --git a/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch b/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch new file mode 100644 index 000000000000..07356f0233ee --- /dev/null +++ b/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch @@ -0,0 +1,80 @@ +diff -ur jigdo-0.7.3.orig/src/compat.hh jigdo-0.7.3/src/compat.hh +--- jigdo-0.7.3.orig/src/compat.hh 2005-07-02 10:21:35.000000000 -0700 ++++ jigdo-0.7.3/src/compat.hh 2008-03-11 23:01:45.000000000 -0700 +@@ -20,6 +20,7 @@ + + #include <string> + #include <stdio.h> ++#include <stdlib.h> + #include <unistd-jigdo.h> + #include <sys/stat.h> + #include <sys/types.h> +diff -ur jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc +--- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc 2005-10-15 14:27:39.000000000 -0700 ++++ jigdo-0.7.3/src/gtk/gtk-single-url.cc 2008-03-11 23:05:48.000000000 -0700 +@@ -15,6 +15,7 @@ + + #include <time.h> + #include <errno.h> ++#include <string.h> + + #include <autoptr.hh> + #include <gtk-single-url.hh> +diff -ur jigdo-0.7.3.orig/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc +--- jigdo-0.7.3.orig/src/gtk/jigdo.cc 2005-07-09 15:21:04.000000000 -0700 ++++ jigdo-0.7.3/src/gtk/jigdo.cc 2008-03-11 23:06:26.000000000 -0700 +@@ -16,6 +16,8 @@ + # include <unistd-jigdo.h> + #endif + ++#include <string.h> ++ + #include <iostream> + #include <string> + #include <vector> +diff -ur jigdo-0.7.3.orig/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc +--- jigdo-0.7.3.orig/src/recursedir.cc 2006-05-14 11:23:31.000000000 -0700 ++++ jigdo-0.7.3/src/recursedir.cc 2008-03-11 23:04:21.000000000 -0700 +@@ -32,6 +32,7 @@ + #include <recursedir.hh> + + #include <iostream> ++#include <string.h> + #include <errno.h> + #include <sys/stat.h> + #include <sys/types.h> +diff -ur jigdo-0.7.3.orig/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc +--- jigdo-0.7.3.orig/src/util/configfile.cc 2003-09-27 14:31:04.000000000 -0700 ++++ jigdo-0.7.3/src/util/configfile.cc 2008-03-11 23:05:00.000000000 -0700 +@@ -19,6 +19,8 @@ + #include <iostream> + #include <fstream> + ++#include <string.h> ++ + #include <configfile.hh> + #include <string.hh> + //______________________________________________________________________ +diff -ur jigdo-0.7.3.orig/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh +--- jigdo-0.7.3.orig/src/util/md5sum.hh 2005-04-09 16:09:52.000000000 -0700 ++++ jigdo-0.7.3/src/util/md5sum.hh 2008-03-11 23:07:04.000000000 -0700 +@@ -28,6 +28,8 @@ + + #include <config.h> + ++#include <string.h> ++ + #include <cstdlib> + #include <iosfwd> + #include <string> +diff -ur jigdo-0.7.3.orig/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc +--- jigdo-0.7.3.orig/src/util/string-utf.cc 2004-09-11 16:26:30.000000000 -0700 ++++ jigdo-0.7.3/src/util/string-utf.cc 2008-03-11 23:07:43.000000000 -0700 +@@ -15,6 +15,7 @@ + #include <glib.h> + #include <stdarg.h> + #include <stdio.h> ++#include <string.h> + + #include <debug.hh> + #include <string-utf.hh> diff --git a/net-misc/jigdo/files/makefile.patch b/net-misc/jigdo/files/makefile.patch deleted file mode 100644 index 3dfd67524e15..000000000000 --- a/net-misc/jigdo/files/makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2003-07-29 18:50:19.000000000 -0400 -+++ Makefile 2003-07-29 18:50:45.000000000 -0400 -@@ -80,7 +80,7 @@ - $(INSTALL) -d "$(DESTDIR)$(datadir)/jigdo" - $(INSTALL_SCRIPT) "$(srcdir)/scripts/jigdo-lite" \ - "$(DESTDIR)$(bindir)" -- sed -e 's%"\(mirrors.jigdo"\)%"$(datadir)/jigdo/debian-\1%' \ -+ sed -e 's%"\(mirrors.jigdo"\)%"/usr/share/jigdo/debian-\1%' \ - <"$(srcdir)/scripts/jigdo-lite" \ - >"$(DESTDIR)$(bindir)/jigdo-lite" - $(INSTALL_DATA) "$(srcdir)/scripts/debian-mirrors.jigdo" \ diff --git a/net-misc/jigdo/jigdo-0.7.3.ebuild b/net-misc/jigdo/jigdo-0.7.3.ebuild index 7ae74b9d1b1e..7b4a96cc4a43 100644 --- a/net-misc/jigdo/jigdo-0.7.3.ebuild +++ b/net-misc/jigdo/jigdo-0.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3.ebuild,v 1.6 2008/01/25 21:15:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3.ebuild,v 1.7 2008/04/29 19:12:02 drac Exp $ inherit eutils @@ -11,38 +11,32 @@ SRC_URI="http://atterer.net/jigdo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" - IUSE="gtk nls berkdb libwww" -DEPEND="gtk? ( >=x11-libs/gtk+-2.0.6 ) - nls? ( sys-devel/gettext ) - berkdb? ( =sys-libs/db-3* ) +RDEPEND="gtk? ( >=x11-libs/gtk+-2 ) + berkdb? ( >=sys-libs/db-3.2 ) libwww? ( >=net-libs/libwww-5.3.2 )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc43.patch +} src_compile() { local myconf - use nls || myconf="${myconf} --disable-nls" use gtk && use libwww || myconf="${myconf} --without-gui" use berkdb || myconf="${myconf} --without-libdb" - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man ${myconf} \ - --datadir=/usr/share || die "./configure failed" - - # Patch the Makefile so that when jidgo is installed, jigdo-lite has - # the correct path to the debian mirrors file. - epatch "${FILESDIR}"/makefile.patch - - emake || die + econf $(use_enable nls) ${myconf} + emake || die "emake failed." } src_install() { - einstall || die - dodoc COPYING README THANKS VERSION changelog - dodoc doc/*.txt + emake DESTDIR="${D}" install || die "emake install failed." + dodoc changelog README THANKS doc/{Hacking,README-bindist,TechDetails}.txt dohtml doc/*.html } |