Fix for bug #201568

Package-Manager: portage-2.1.3.19

4 files changed, 38 insertions, 11 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 91e4377b92ed..56ca34dacfda 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/olsrd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.12 2007/10/21 12:00:10 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.13 2007/12/07 16:54:40 cedk Exp $
+
+  07 Dec 2007; Cédric Krier <cedk@gentoo.org>
+  +files/olsrd-0.5.4-build_fix.patch, olsrd-0.5.4.ebuild:
+  Fix for bug #201568
 
 *olsrd-0.5.4 (21 Oct 2007)
 
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index cc868238e0a8..3a5026448762 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -18,6 +18,10 @@ AUX olsrd-0.5.2-bmf.patch 1867 RMD160 78b46f8f6518836924ab02eb376bc8c096b7f498 S
 MD5 997098a997daf6163204a63b0b484671 files/olsrd-0.5.2-bmf.patch 1867
 RMD160 78b46f8f6518836924ab02eb376bc8c096b7f498 files/olsrd-0.5.2-bmf.patch 1867
 SHA256 fe689e94b9fdd8a52413233cfb0a42d8d4ec90c693c7e9a41cb36ae28d69dd8f files/olsrd-0.5.2-bmf.patch 1867
+AUX olsrd-0.5.4-build_fix.patch 401 RMD160 b402a682942d77b557e3cff2d18ec574fe9e3033 SHA1 46c098cfcf4ad40bb3b6a8a5f0d97e9c155f9b8c SHA256 63c5b0a024f4e534bbeea4339be64d0d8b243dcf04d0f3fb63be4c41ec4151ad
+MD5 e85c5f219055b031fa7ced464bd971f1 files/olsrd-0.5.4-build_fix.patch 401
+RMD160 b402a682942d77b557e3cff2d18ec574fe9e3033 files/olsrd-0.5.4-build_fix.patch 401
+SHA256 63c5b0a024f4e534bbeea4339be64d0d8b243dcf04d0f3fb63be4c41ec4151ad files/olsrd-0.5.4-build_fix.patch 401
 DIST olsrd-0.4.10.tar.bz2 490519 RMD160 a0432cb885efdf93ce36e7367a1346b6744c9f90 SHA1 78325658657c6b1aeebe106d02cabcc6eed2571c SHA256 af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
 DIST olsrd-0.5.0.tar.bz2 479433 RMD160 a54c43226fa5f6c7a65dcea7ab325d39ddc4d7b6 SHA1 c95df003a8bd3169315662d50f20830ddd7d563e SHA256 5ff2ffb325ccb5b592b08d30b3f9a843fa938a3af78c2c50946aa2229d1d9162
 DIST olsrd-0.5.1.tar.bz2 529916 RMD160 d83282a5ebecdb7599c84e3e4f1175eb78fed2a6 SHA1 77e8ecdcfc8e5a1316d1fd5601e76446ba9aa9bc SHA256 42fda56ebd5a876346fc6efb8fff751c9ac28b485da545299d0513a594cfebeb
@@ -48,14 +52,14 @@ EBUILD olsrd-0.5.3.ebuild 1509 RMD160 8fbbb24668ca583a8e14285dc70d4c3a871df67b S
 MD5 78c2af95790c12f1d5447d9088980a6f olsrd-0.5.3.ebuild 1509
 RMD160 8fbbb24668ca583a8e14285dc70d4c3a871df67b olsrd-0.5.3.ebuild 1509
 SHA256 b6a8f86cbab9fffbf668c291fb9818757288614ac47730f247a5933c92b1e124 olsrd-0.5.3.ebuild 1509
-EBUILD olsrd-0.5.4.ebuild 1614 RMD160 ec3e797456fb7a9db719d37949a00c3c169b5a4b SHA1 c08f3651e7a80319c8aa2787fa45c9bad8db727a SHA256 b1f0a7653108ff7560137bc2254388f38463ac90bef7fe8433cbbf4828ef0c33
-MD5 41006d4198b3a72998478517b6dd241e olsrd-0.5.4.ebuild 1614
-RMD160 ec3e797456fb7a9db719d37949a00c3c169b5a4b olsrd-0.5.4.ebuild 1614
-SHA256 b1f0a7653108ff7560137bc2254388f38463ac90bef7fe8433cbbf4828ef0c33 olsrd-0.5.4.ebuild 1614
-MISC ChangeLog 1813 RMD160 bd26b52abd5a5e5d9b7bba35df4eb258dba6db07 SHA1 04d0fa760fc85448ebe0ecaca9b9adab869c1556 SHA256 9849090b35fd9d9539449cb175055ab0e3f8758ccc9c20656129499c76da0bde
-MD5 88d0567ac356f64d22ea62bf3c786eeb ChangeLog 1813
-RMD160 bd26b52abd5a5e5d9b7bba35df4eb258dba6db07 ChangeLog 1813
-SHA256 9849090b35fd9d9539449cb175055ab0e3f8758ccc9c20656129499c76da0bde ChangeLog 1813
+EBUILD olsrd-0.5.4.ebuild 1689 RMD160 9e2bbe5ad88ded35600b86da8049ebf4f4950883 SHA1 f88e5a7b1a30277bfd5adc374fd4b29d9b18f0f6 SHA256 01f68cbfee8797835614a20a52391b3046ac7be1c1911dd5c238f06a52b8c6c3
+MD5 a31b538fcd0b85884486784613d0403a olsrd-0.5.4.ebuild 1689
+RMD160 9e2bbe5ad88ded35600b86da8049ebf4f4950883 olsrd-0.5.4.ebuild 1689
+SHA256 01f68cbfee8797835614a20a52391b3046ac7be1c1911dd5c238f06a52b8c6c3 olsrd-0.5.4.ebuild 1689
+MISC ChangeLog 1941 RMD160 33107101e198b762d16a69d46df7467c51f975ca SHA1 390dce7d3fcde573b6de78303ea87a1a99368bc4 SHA256 0f90d855b871207880cf9fc9c4c89e21a542928dd06901af8c2d50e7b22ff3e7
+MD5 ba3612dfd2e0a2bb8f85b60ecda7fbde ChangeLog 1941
+RMD160 33107101e198b762d16a69d46df7467c51f975ca ChangeLog 1941
+SHA256 0f90d855b871207880cf9fc9c4c89e21a542928dd06901af8c2d50e7b22ff3e7 ChangeLog 1941
 MISC metadata.xml 318 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 SHA1 88b2535f03b3c5813cefde5695118f3deae79b1a SHA256 07b3287dfd5e9ca43a84158f0e93297e8ccad36fa7ea4c707c446ce6c62070b3
 MD5 b5ecb6bd430598cb6e660c05f895e6bc metadata.xml 318
 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 metadata.xml 318
diff --git a/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
new file mode 100644
index 000000000000..ae229a8b3e4d
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
@@ -0,0 +1,13 @@
+Index: olsrd-0.5.4/Makefile
+===================================================================
+--- olsrd-0.5.4.orig/Makefile	2007-11-03 11:33:37.075400513 +0100
++++ olsrd-0.5.4/Makefile	2007-11-03 11:33:47.171975883 +0100
+@@ -71,8 +71,6 @@
+ $(CFGOBJS):
+ 		$(MAKECMD) -C $(CFGDIR)
+ 
+-# generate it always
+-.PHONY: src/builddata.c
+ src/builddata.c:
+ 	@$(RM) "$@"
+ 	@echo "#include \"defs.h\"" >> "$@" 
diff --git a/net-misc/olsrd/olsrd-0.5.4.ebuild b/net-misc/olsrd/olsrd-0.5.4.ebuild
index 0422992874db..0b77ae1b84f0 100644
--- a/net-misc/olsrd/olsrd-0.5.4.ebuild
+++ b/net-misc/olsrd/olsrd-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.4.ebuild,v 1.1 2007/10/21 12:00:10 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.4.ebuild,v 1.2 2007/12/07 16:54:40 cedk Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,8 +15,14 @@ IUSE="gtk"
 
 DEPEND="gtk? ( =x11-libs/gtk+-2* )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-build_fix.patch"
+}
+
+src_compile() {
 	emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
 
 	if use gtk ; then