Version bump. Respect LDFLAGS, fix --as-needed in USE=gtk case.

Package-Manager: portage-2.2.0_alpha62/cvs/Linux i686

3 files changed, 73 insertions, 9 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 991c725d9759..499c1f6c9ed3 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/olsrd
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.24 2011/10/07 17:01:39 jer Exp $
+
+*olsrd-0.6.2 (07 Oct 2011)
+
+  07 Oct 2011; Jeroen Roovers <jer@gentoo.org> +olsrd-0.6.2.ebuild:
+  Version bump. Respect LDFLAGS, fix --as-needed in USE=gtk case.
 
 *olsrd-0.6.1 (06 Jan 2011)
 
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 1a020d2158b9..b8e3b11f5d34 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -20,6 +20,7 @@ DIST olsrd-0.5.5.tar.bz2 505257 RMD160 b4280ca706311024fb7d945c7aceba69c06a1e5f
 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
+DIST olsrd-0.6.2.tar.bz2 650727 RMD160 4661faaab929260bc159c725f6c834a8d0bb0003 SHA1 0babcd891d32b5d54f2708f469d2fe4e9cdd81d8 SHA256 2ebf5a1054e1cd49b54bb2b226a679328d0bd0d863dddcd01ef7e9e525b80374
 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
@@ -30,14 +31,13 @@ EBUILD olsrd-0.5.5.ebuild 1738 RMD160 c13118b921574ad46e2cec962d17a8f406e11e0d S
 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
 EBUILD olsrd-0.6.1.ebuild 1750 RMD160 4bac1363c6bf6499414e8b7a6e52f24eeaf277af SHA1 ed73eec1efc1a06148229e7d5cb2ec5a11c7de0c SHA256 8a31bd989c8b9de346cfbe7b554c2ce249508a119b60a071ac6fdea48bdfd5b0
-MISC ChangeLog 3201 RMD160 8025fc02d6eecee161e7a1687706234ed2222642 SHA1 9d46d11ce1237863ba130932f762565c7e6c5da0 SHA256 248803393010e6eb5557867b3dd47204b9ecfed745e73706af72068712eccb5f
+EBUILD olsrd-0.6.2.ebuild 1764 RMD160 19f98e00f6144b2812c664744fb4e1bac980ce93 SHA1 5ea1675c781a59c6865cb4652b7d5ddf80a06017 SHA256 87b4c18cc55bbc8882e19726352b0fa7b4403de0ce454850c1321b04062e68d7
+MISC ChangeLog 3363 RMD160 6f45175a92bafbf260b57f38fe6129db3ba5bab3 SHA1 bf8c976fc759cf2da37f93251acd3e7e7170cb65 SHA256 42a63a75c4056b60efc12fe773a8605abf875fceaaa022d0cbe47d477b95a636
 MISC metadata.xml 297 RMD160 d3d098caf90098dcf7fc21916b96d843472306df SHA1 78b005bc8c26c95e3a6fa0d82ba6adec50cee7c8 SHA256 7eb2efdb97b502f400b391fb3758ded6a0283bf514acc11efa86702fed847f5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rScACgkQfXuS5UK5QB31/gQAjdmuffPwsO12e75CTDJsuzVE
-UFKfgCujPUHjRYS1MT4OQhb8qD3MszmfezquI+5iifiwExEyLsScY2upC1mQ0B3g
-Ssq/0kiam37IdRuoMI6FEkWznkpTswu0Crwr+/M4eu/naPrV9cTRGeGmG6FGxkwA
-6kJi99mkURPnn/oJIwE=
-=LIOU
+iEYEARECAAYFAk6PMHkACgkQVWmRsqeSphPgiwCcCe76wbhoRTlz9NBVVtJjINx5
+7pcAn0+VieFKC1QqFPnHAA072ncPB5QK
+=PMR0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/olsrd/olsrd-0.6.2.ebuild b/net-misc/olsrd/olsrd-0.6.2.ebuild
new file mode 100644
index 000000000000..383aa533cee1
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.6.2.ebuild
@@ -0,0 +1,59 @@
+# 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.2.ebuild,v 1.1 2011/10/07 17:01:39 jer Exp $
+
+EAPI="4"
+
+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_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.1-build_fix.patch"
+cp -av gui/linux-gtk/Makefile{,.org}
+	sed -i gui/linux-gtk/Makefile \
+		-e 's|LFLAGS|LDFLAGS|g;' \
+		-e 's|$(CC).*|$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)|g' \
+		-e '/^LDFLAGS/s|=|+= -lm|g' \
+		|| die
+}
+
+src_compile() {
+	emake OS=linux CC="$(tc-getCC)" build_all
+	use gtk && emake -C "${S}/gui/linux-gtk" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake OS=linux DESTDIR="${D}" STRIP=true install_all
+	use gtk && emake -C "${S}/gui/linux-gtk" DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}/olsrd"
+
+	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 \
+		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
+}