Version bump. Add LICENSE+=LGPL-2.1 for lib/pud/nmealib/. Build verbose. Respect LDFLAGS and AR. Fix parallel make.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

2 files changed, 93 insertions, 1 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index c1ee2988b928..dd6e260fe248 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/olsrd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.31 2012/08/21 15:40:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.32 2012/11/15 16:50:37 jer Exp $
+
+*olsrd-0.6.4 (15 Nov 2012)
+
+  15 Nov 2012; Jeroen Roovers <jer@gentoo.org> +olsrd-0.6.4.ebuild:
+  Version bump. Add LICENSE+=LGPL-2.1 for lib/pud/nmealib/. Build verbose.
+  Respect LDFLAGS and AR. Fix parallel make.
 
   21 Aug 2012; Johannes Huber <johu@gentoo.org> olsrd-0.6.3.ebuild:
   Stable for x86, wrt bug #429184
diff --git a/net-misc/olsrd/olsrd-0.6.4.ebuild b/net-misc/olsrd/olsrd-0.6.4.ebuild
new file mode 100644
index 000000000000..4ddd25b36515
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.6.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.4.ebuild,v 1.1 2012/11/15 16:50:37 jer Exp $
+
+EAPI=4
+inherit eutils multilib 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 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+"
+RDEPEND=$DEPEND
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.6.1-build_fix.patch" \
+		"${FILESDIR}/${PN}-0.6.3-make-gtk.patch"
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		$( find . -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		build_all
+	if use gtk; then
+		emake -C "${S}/gui/linux-gtk" LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		DESTDIR="${D}" STRIP=true install_all
+	if use gtk; then
+		emake -C "${S}/gui/linux-gtk" \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
+	fi
+
+	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
+}