Set more dependencies for GTK+. Fix multilib-strict requirements. Install plugins in /usr/lib*/olsrd. Remove testing cruft.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 80 insertions, 5 deletions

diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 758f1471de2b..7aebf9b88d31 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2011/10/09 16:52:38 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.26 2012/02/15 14:58:31 jer Exp $
+
+*olsrd-0.6.2-r1 (15 Feb 2012)
+
+  15 Feb 2012; Jeroen Roovers <jer@gentoo.org> olsrd-0.6.2.ebuild,
+  +olsrd-0.6.2-r1.ebuild:
+  Set more dependencies for GTK+. Fix multilib-strict requirements. Install
+  plugins in /usr/lib*/olsrd. Remove testing cruft.
 
   09 Oct 2011; Jeroen Roovers <jer@gentoo.org> -olsrd-0.4.10.ebuild,
   -files/olsrd-0.4.10-makefile.patch,
diff --git a/net-misc/olsrd/olsrd-0.6.2-r1.ebuild b/net-misc/olsrd/olsrd-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..297a0e1c31ba
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.2-r1.ebuild,v 1.1 2012/02/15 14:58:31 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"
+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"
+	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 LIBDIR="/usr/$(get_libdir)/${PN}" OS=linux CC="$(tc-getCC)" 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
+}
diff --git a/net-misc/olsrd/olsrd-0.6.2.ebuild b/net-misc/olsrd/olsrd-0.6.2.ebuild
index 383aa533cee1..e4b6ba401c40 100644
--- a/net-misc/olsrd/olsrd-0.6.2.ebuild
+++ b/net-misc/olsrd/olsrd-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2.ebuild,v 1.1 2011/10/07 17:01:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.2.ebuild,v 1.2 2012/02/15 14:58:31 jer Exp $
 
 EAPI="4"
 
@@ -21,7 +21,6 @@ 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' \