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.

Package-Manager: portage-2.1.5_rc6

5 files changed, 105 insertions, 36 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/Manifest b/net-misc/jigdo/Manifest
index fafba417c200..19fbc4eb5733 100644
--- a/net-misc/jigdo/Manifest
+++ b/net-misc/jigdo/Manifest
@@ -1,5 +1,5 @@
-AUX makefile.patch 524 RMD160 04854d3a3c0962d795a2ca0036551008f7ee112d SHA1 d00399ee5ee93dcc8597e830dde1f8b88871d646 SHA256 52e216b7634388499eedfc3effc7f9451d013fea271a1d308ae5b28bb83862bd
+AUX jigdo-0.7.3-gcc43.patch 2650 RMD160 21683a2f2bdbfe007a6dd045b85e60334e93b2b7 SHA1 f1269455ba3300ec1738ee5ece9ff5e067eb6daf SHA256 57e13ca6c283cb086d1c5ceb5ed3562fab548fa19e1d14ecc045c3a23fa7d44a
 DIST jigdo-0.7.3.tar.bz2 644670 RMD160 545b4abbcb0a02636072e5acadeba7d99f59365f SHA1 7b83c35af71f908b31b9aa55b0dda9dfb4d224f0 SHA256 875c069abad67ce67d032a9479228acdb37c8162236c0e768369505f264827f0
-EBUILD jigdo-0.7.3.ebuild 1351 RMD160 6d63d8152ad7a7c6f15c6d9c6823f08d9aa75b76 SHA1 012e5bec4bccbba234b28450c0a593e30bcc4bf2 SHA256 58b311f9e4d7a7bccccb985b45ac2be3c0621c5862cc47ff7e07c03b49575c71
-MISC ChangeLog 2628 RMD160 f5f105455af4ac76f13050aea2486695e1bce1ab SHA1 6f2bde7b476402b5d3653ef3f2e9321cbe872104 SHA256 c6527f02f0cb10dca9c2327808127d46063dd34f4c31e8e7b81463f1983c18f0
+EBUILD jigdo-0.7.3.ebuild 1180 RMD160 d257e0a5307f93af3c2170fc1e17657dd2e34eba SHA1 de3b49180fc3c72f55de4ce4c973ca18a9c3f330 SHA256 8389419ad80ce1ba86b369b79c24f3be5e1ad630aa49ffc17ce1f854f8345920
+MISC ChangeLog 2915 RMD160 679cd7e7ee1eaea29c4bac4ed1c69b57b6b7052e SHA1 bbec7f85474d9e3df9deb0bcb67d9fb19640cab2 SHA256 c5bdf03660f2c50f3acb307fe9b5a25db0294b5d9777a9341c0848b953705c80
 MISC metadata.xml 643 RMD160 cfafe73c9affe9d45f6099edd0627ec2dbb74516 SHA1 9d4698043797510ff64452f11c4841a11f2b0b0c SHA256 87a52f72c9bb40669eaca322dfb8bd1112eb1477886fd57538a1a549a2c0b860
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
 }