Version bump

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 88 insertions, 13 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index e5edc0d4428c..9405e817e2de 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/olsrd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.19 2008/10/27 20:30:12 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.20 2009/12/19 20:21:11 cedk Exp $
+
+*olsrd-0.5.6.7 (19 Dec 2009)
+
+  19 Dec 2009; Cédric Krier <cedk@gentoo.org> +olsrd-0.5.6.7.ebuild,
+  +files/olsrd-0.5.6.7-build_fix.patch:
+  Version bump
 
   27 Oct 2008; Markus Meier <maekke@gentoo.org> olsrd-0.5.6.ebuild:
   amd64/x86 stable, bug #244537
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 2cd6b056403f..f2a3833a4e3d 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX olsrd 478 RMD160 7de06122dcde158e14e453bfde0bf5a9e7da1d47 SHA1 b225c82ea8b78a0ec42d46397d22df61a0ddf5ea SHA256 24b7132e606e40c2d529a5b3bd2b61390925099db81687341464c20bfc597676
 AUX olsrd-0.4.10-makefile.patch 5565 RMD160 6c6ba682e1263eaf1fc3fb72b74333374305b1dd SHA1 f4cd1be23129712ca39400c002b6314c32164828 SHA256 93706579549fe6e69af188a833435ba31fe2b74a97b2698f44e06d3d4a9e9c38
 AUX olsrd-0.4.10-memleak_in_olsr_remove_scheduler_event.patch 246 RMD160 2f0414c22e559fe03ab5968fa21b8c2c4a437ff6 SHA1 b042b511094020813a6fd0e43c99e03bb3e77117 SHA256 a9a5e96a138c65b32b62a73556a62feb529e95de34bb1b450652d81825459124
@@ -8,6 +5,7 @@ AUX olsrd-0.5.1-fix-hashing.patch 529 RMD160 8ea03b1e4b59317039ef88226b6fd852c8e
 AUX olsrd-0.5.2-bmf.patch 1867 RMD160 78b46f8f6518836924ab02eb376bc8c096b7f498 SHA1 61894844f29fe07ef5ac5e91ad95814cb6e36b45 SHA256 fe689e94b9fdd8a52413233cfb0a42d8d4ec90c693c7e9a41cb36ae28d69dd8f
 AUX olsrd-0.5.4-build_fix.patch 401 RMD160 b402a682942d77b557e3cff2d18ec574fe9e3033 SHA1 46c098cfcf4ad40bb3b6a8a5f0d97e9c155f9b8c SHA256 63c5b0a024f4e534bbeea4339be64d0d8b243dcf04d0f3fb63be4c41ec4151ad
 AUX olsrd-0.5.5-build_fix.patch 381 RMD160 a54cc911f6d33f29d84f71b56ab46bf652be3558 SHA1 652019d9eedb8b00e96eb03534da399f34d2cff0 SHA256 85b3c1ee738b946cbff179843156aef82e1cbdf46242251bf68f33c25799fc05
+AUX olsrd-0.5.6.7-build_fix.patch 365 RMD160 9830c815f1fbd189a561cc6fddad3ad40c7ba40c SHA1 333d0b4f1a761131adfb7e5ea543190617d56b8d SHA256 a2e452dca945e6e667304abb9c9a90318381ceaaf6c371640ad4bfd97818b9f7
 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
@@ -15,6 +13,7 @@ DIST olsrd-0.5.2.tar.bz2 489416 RMD160 9a646b9c8bf4e57d42319de6ee058f6378555254
 DIST olsrd-0.5.3.tar.bz2 491003 RMD160 4fbdb98a2f5bfc1c170ec02fd9eb7e7595140285 SHA1 619a0b5209661e891a7ca23aa73c8e241c4770fe SHA256 9c495773e9605a67b6cdbbc3fb70449b830ed55eb6e0082778a0ccf941b4b426
 DIST olsrd-0.5.4.tar.bz2 495872 RMD160 334ccf5054aee2c47ca1b4a93c4e550ffb543997 SHA1 f9f1b549e1cae0b5ae6cc4a177691bebcfa04e11 SHA256 9a4215d52178bdd112739e3c8b46b6c72d2b63a16bad0f2bcdd9bb0d1965f34f
 DIST olsrd-0.5.5.tar.bz2 505257 RMD160 b4280ca706311024fb7d945c7aceba69c06a1e5f SHA1 1555ccc0dc60cfcb632940616e031ce094d80f1a SHA256 2fab4646166cc887a87933f52e51ce07c23f4e0395d380ee2f8557805c4884bc
+DIST olsrd-0.5.6-r7.tar.bz2 548784 RMD160 f3c8e9b70cf75ea3142c57bdc6e997a0d754e3fe SHA1 4382592309f50043e509e9b6a1024818bf749605 SHA256 ff10d93035f566ab3ed7557efb54ad88aa98b52c5835ac0fde6ba638b00c3a0c
 DIST olsrd-0.5.6.tar.bz2 543620 RMD160 85c8760484eaa4bd280a2551ff53b1f07fc7eb1b SHA1 d26051423868f33e75d8d79adc539cbfddb40574 SHA256 61e154463e43da3f3a466c773c122a439b84e37233057efda2c99bdca2d99c39
 EBUILD olsrd-0.4.10.ebuild 1528 RMD160 473f0299c07b0044542ef1236159518338c7092e SHA1 27e02fce1b52912ac39c4e5c1dae6e1c1b59a691 SHA256 c121fc756745e5db9b6341fa46eb40d49b93c5122521dbd58e6d9f4653c31dec
 EBUILD olsrd-0.5.0.ebuild 1391 RMD160 032428c5bc9fa68b0accaeb1e243d14cfeb90bf7 SHA1 32a8ac4570a5deaba5d0dc863c1b49bde7adbb32 SHA256 d7c9e70f0d1d4071c7b3f36bb14f247c3dbe6cea0f8565d7e34eac9f7e6ba1cc
@@ -23,13 +22,7 @@ EBUILD olsrd-0.5.2-r1.ebuild 1581 RMD160 d43c8106b951cde0f3b3fa68f8f7205dbce4712
 EBUILD olsrd-0.5.3.ebuild 1498 RMD160 0a5af10a724dba0d0ebac3e7920cdeb4a753c46b SHA1 fb32fae45d4a4a0b0cea3d82c057a56c786b2490 SHA256 b2c0a4fa486fe3402f8128923bceccf9519f836ca1ad1c644d12964fc46ebcbe
 EBUILD olsrd-0.5.4.ebuild 1696 RMD160 d6c18bc8298c6fc98129736740d4f35490214e07 SHA1 5ed4e6ef2f0cb11f64e453fca160812326defba0 SHA256 b0756e7f1a386d4e12f4234b5c36b40f8209d48d7d1fc0c07c948cc2eb0f913b
 EBUILD olsrd-0.5.5.ebuild 1738 RMD160 c13118b921574ad46e2cec962d17a8f406e11e0d SHA1 e41f0e1b3138ecc2255c481a05b0867396cc7554 SHA256 0c903299f132a7cdd79fb768471103c24f14b871b372dc505fbcacf19e0e1062
+EBUILD olsrd-0.5.6.7.ebuild 1889 RMD160 f2f99ee876c929f6dadc4d2776709537e9b8a430 SHA1 53020286d46822d388a6386e4df92c04e4f17adf SHA256 0f080474a00142111a4a740eca92410e1bb7594e597f7c30f882d205f9a6669e
 EBUILD olsrd-0.5.6.ebuild 1711 RMD160 70b036c5424a70eb9016e56003750e3da182042b SHA1 6a5613884421e8fa198e3ab28d9215a2c44ed304 SHA256 df5f9ab99fb3aee6fe379302ca01db89509340df5987fb92a13ef0cee8e8e79e
-MISC ChangeLog 2680 RMD160 653be6b10457ea615883c0f0d686db3b6b003d74 SHA1 147763fb7e78ccddcedf24684930198098f06293 SHA256 41453ee3eebaa8f634227fa7c3ec339d3949c5493ac607de083fab0605ac5fc9
+MISC ChangeLog 2834 RMD160 4be700fb014b9798daaa57e6699f87ce83d8ae2f SHA1 232faae4b4dd26c118b88bf9750d0c6ff7201cc6 SHA256 72245b76ea00e7e509ab23c343adfe266995f2b700925f153139ebc6bf392703
 MISC metadata.xml 318 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 SHA1 88b2535f03b3c5813cefde5695118f3deae79b1a SHA256 07b3287dfd5e9ca43a84158f0e93297e8ccad36fa7ea4c707c446ce6c62070b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkGJQIACgkQkKaRLQcq0GLUZACgodGa2DdY5IwFHwp+KViuSbES
-0ZQAn3zp9cCDmo4l3ek+n51yGsC/7wA1
-=/+zD
------END PGP SIGNATURE-----
diff --git a/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch
new file mode 100644
index 000000000000..adcea5d3bb39
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.5.6.7-build_fix.patch
@@ -0,0 +1,12 @@
+diff -ru olsrd-0.5.6-r7~/Makefile olsrd-0.5.6-r7/Makefile
+--- olsrd-0.5.6-r7~/Makefile	2009-12-19 21:03:41.000000000 +0100
++++ olsrd-0.5.6-r7/Makefile	2009-12-19 21:04:00.000000000 +0100
+@@ -71,8 +71,6 @@
+ switch:		
+ 	$(MAKECMD) -C $(SWITCHDIR)
+ 
+-# generate it always
+-.PHONY: src/builddata.c
+ src/builddata.c:
+ 	@$(RM) "$@"
+ 	@echo "#include \"defs.h\"" >> "$@" 
diff --git a/net-misc/olsrd/olsrd-0.5.6.7.ebuild b/net-misc/olsrd/olsrd-0.5.6.7.ebuild
new file mode 100644
index 000000000000..2aa43d6753fb
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.5.6.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.6.7.ebuild,v 1.1 2009/12/19 20:21:11 cedk Exp $
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(replace_version_separator 3 '-r')
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${PN}-${MY_PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+DEPEND="gtk? ( =x11-libs/gtk+-2* )"
+RDEPEND=$DEPEND
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.5.6.7-build_fix.patch"
+}
+
+src_compile() {
+	emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
+
+	if use gtk ; then
+		cd "${S}/gui/linux-gtk"
+		einfo "Building GUI ..."
+		emake CC="$(tc-getCC)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake OS=linux DESTDIR="${D}" STRIP=true install_all || die "emake install_all failed"
+
+	if use gtk; then
+		cd "${S}/gui/linux-gtk"
+		emake DESTDIR="${D}" install || die "emake install failed"
+	fi
+
+	doinitd "${FILESDIR}/olsrd"
+
+	cd "${S}"
+	dodoc CHANGELOG features.txt README README-Olsr-Switch.html \
+		README-FreeBSD-libnet README-Link-Quality-Fish-Eye.txt \
+		README-Link-Quality.html valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq files/olsrd.conf.default.lq-fisheye \
+		lib/arprefresh/README_ARPREFRESH \
+		lib/bmf/README_BMF.txt \
+		lib/dot_draw/README_DOT_DRAW \
+		lib/dyn_gw/README_DYN_GW \
+		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI \
+		lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH \
+		lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE \
+		lib/txtinfo/README_TXTINFO \
+		lib/watchdog/README_WATCHDOG
+}