[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/

[Sam James]

commit:     b102d60d6af470bfd9a8463b86722df37316fda4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 04:29:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 04:29:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b102d60d

net-misc/olsrd: add 20210612 snapshot

Fixes build failure with >= bison 3.7.

Thanks-to: Christoph Loesc
Closes: https://bugs.gentoo.org/735572
Bug: https://bugs.gentoo.org/715392
Bug: https://bugs.gentoo.org/776742
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/olsrd/Manifest                     |   1 +
 net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild | 121 ++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 48e954ea147..4c66dece256 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,2 +1,3 @@
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
 DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
+DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e

diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
new file mode 100644
index 00000000000..f106d0346a3
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Snapshot to fix build failure with >= bison 3.7
+# bug #735572
+MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78"
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk pud"
+
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+)
+
+src_prepare() {
+	default
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	# fix default prefix, bug #453440
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		-e '/^prefix/s:/usr/local:/usr:' \
+		$( find -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+	if ! use pud; then
+		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		VERBOSE=1 \
+		build_all
+
+	if use gtk; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \
+		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		OS=linux \
+		STRIP=true \
+		install_all
+
+	if use gtk; then
+		emake -C gui/linux-gtk \
+			DESTDIR="${D}" \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+			install
+	fi
+
+	doinitd "${FILESDIR}"/${PN}
+
+	gzip -d \
+		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED}"/usr/share/man/man8/olsrd.8.gz \
+		|| die
+
+	dodoc CHANGELOG \
+		valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq \
+		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
+}