Version bump

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

4 files changed, 87 insertions, 3 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 02d9dc23c42b..991c725d9759 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/olsrd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.22 2010/04/06 07:21:23 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.23 2011/01/06 22:43:26 cedk Exp $
+
+*olsrd-0.6.1 (06 Jan 2011)
+
+  06 Jan 2011; Cédric Krier <cedk@gentoo.org> +olsrd-0.6.1.ebuild,
+  +files/olsrd-0.6.1-build_fix.patch:
+  Version bump
 
   06 Apr 2010; Markos Chandras <hwoarang@gentoo.org> olsrd-0.5.6.7.ebuild:
   Stable on amd64 wrt bug #307197
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 91cad789a747..583ecfdd9190 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -6,6 +6,7 @@ AUX olsrd-0.5.2-bmf.patch 1867 RMD160 78b46f8f6518836924ab02eb376bc8c096b7f498 S
 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
+AUX olsrd-0.6.1-build_fix.patch 353 RMD160 08b4d220240ce4e3bfbdf2387642814e2939ab52 SHA1 37c2495b58d16ecb39740690aa1591f6087e681b SHA256 82ab3fbc7db1a189079306bc0cae4066186281860c2189d0df0b72cb33167a7f
 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 +16,7 @@ DIST olsrd-0.5.4.tar.bz2 495872 RMD160 334ccf5054aee2c47ca1b4a93c4e550ffb543997
 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
+DIST olsrd-0.6.1.tar.bz2 643250 RMD160 fdb14e71f885bcc82d8377b32122d5231bc9e019 SHA1 1a6d00c8b48fec69353709cda7cfad7f1e260f69 SHA256 03d359b65711ef7bf235bf530d2afe61eeae3cbf3f8e60ddf2c14e68f3b48f9f
 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
 EBUILD olsrd-0.5.1-r1.ebuild 1588 RMD160 620f64d9ed9d6ae97325e5e7655f9a6e5f7342bd SHA1 c861bafc6cfb0e65002bc38cc67d4125cd1874cc SHA256 62ef2332f0fe8d9546ec543c964b6c38c1896a94615ce207039fba87ce242fa7
@@ -24,5 +26,6 @@ EBUILD olsrd-0.5.4.ebuild 1696 RMD160 d6c18bc8298c6fc98129736740d4f35490214e07 S
 EBUILD olsrd-0.5.5.ebuild 1738 RMD160 c13118b921574ad46e2cec962d17a8f406e11e0d SHA1 e41f0e1b3138ecc2255c481a05b0867396cc7554 SHA256 0c903299f132a7cdd79fb768471103c24f14b871b372dc505fbcacf19e0e1062
 EBUILD olsrd-0.5.6.7.ebuild 1891 RMD160 dadb04b289cbc3f1492ef0c4408985ac472a374f SHA1 3c70ffcf81b344c0aa2dceb2b324245e78928140 SHA256 c47f5a21ca99171a448fb0fd5d02459044fdadf57830f568efcff6e380828157
 EBUILD olsrd-0.5.6.ebuild 1711 RMD160 70b036c5424a70eb9016e56003750e3da182042b SHA1 6a5613884421e8fa198e3ab28d9215a2c44ed304 SHA256 df5f9ab99fb3aee6fe379302ca01db89509340df5987fb92a13ef0cee8e8e79e
-MISC ChangeLog 3055 RMD160 b2db9c8e90115e347d63b5a040ab6e4fdcad58a2 SHA1 64ce39aabad59afddd3d5efd51ca362a79863140 SHA256 61979bb40b3c31cff133d5d7f9884686e1f3ecd608524a728c0cb321f9c5a83f
+EBUILD olsrd-0.6.1.ebuild 1750 RMD160 4bac1363c6bf6499414e8b7a6e52f24eeaf277af SHA1 ed73eec1efc1a06148229e7d5cb2ec5a11c7de0c SHA256 8a31bd989c8b9de346cfbe7b554c2ce249508a119b60a071ac6fdea48bdfd5b0
+MISC ChangeLog 3201 RMD160 8025fc02d6eecee161e7a1687706234ed2222642 SHA1 9d46d11ce1237863ba130932f762565c7e6c5da0 SHA256 248803393010e6eb5557867b3dd47204b9ecfed745e73706af72068712eccb5f
 MISC metadata.xml 318 RMD160 50ee639035e7ddcdcf6c2a3e22e66443fcd30de5 SHA1 88b2535f03b3c5813cefde5695118f3deae79b1a SHA256 07b3287dfd5e9ca43a84158f0e93297e8ccad36fa7ea4c707c446ce6c62070b3
diff --git a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
new file mode 100644
index 000000000000..48b6b2b1d27b
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
@@ -0,0 +1,12 @@
+diff -ru olsrd-0.6.1~/Makefile olsrd-0.6.1/Makefile
+--- olsrd-0.6.1~/Makefile	2011-01-06 23:29:17.000000000 +0100
++++ olsrd-0.6.1/Makefile	2011-01-06 23:32:36.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.6.1.ebuild b/net-misc/olsrd/olsrd-0.6.1.ebuild
new file mode 100644
index 000000000000..aaa74bbe8665
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.1.ebuild,v 1.1 2011/01/06 22:43:26 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}/${P}-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 \
+		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
+}