[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 9fe29ebea026114d4e2be50744626554b1b4219b
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Oct 10 05:51:37 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Oct 10 05:53:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe29ebe
net-misc/olsrd: add few missing deps
Signed-off-by: Joonas Niilola gentoo.org>
net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
index f79fe5d346f9..bff1915449d8 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
@@ -19,18 +19,17 @@ SLOT="0"
KEYWORDS="amd64 ~x86"
IUSE="gtk pud"
-DEPEND="
- gtk? (
+RDEPEND="gtk? (
dev-libs/glib:2
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
)
- pud? ( sci-geosciences/gpsd )
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="virtual/pkgconfig"
+ pud? ( sci-geosciences/gpsd )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="app-alternatives/yacc
+ sys-devel/flex
+ virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 108bc06495f79be2bfe5f2395a2ffc7254d5697d
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Oct 10 05:50:29 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Oct 10 05:50:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108bc064
net-misc/olsrd: Stabilize 0.9.8_p20210612-r1 amd64, #915447
Signed-off-by: Joonas Niilola gentoo.org>
net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
index 1ba8d428f242..f79fe5d346f9 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
LICENSE="BSD LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="gtk pud"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/, net-misc/olsrd/files/
commit: ab73df0b66d343f94f5c7815cbb04cb1b966b502
Author: Brahmajit Das gmail com>
AuthorDate: Tue Jun 13 15:21:22 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Fri Jun 16 05:43:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab73df0b
net-misc/olsrd: Fix incompatible pointer to integer conversion initializing int
Closes: https://bugs.gentoo.org/898090
Closes: https://bugs.gentoo.org/870748
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31242
Signed-off-by: Viorel Munteanu gentoo.org>
.../olsrd/files/olsrd-0.9.8-clang16-buildfix.patch | 53 +
net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild | 124 +
2 files changed, 177 insertions(+)
diff --git a/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch
b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch
new file mode 100644
index ..0194b17362ba
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch
@@ -0,0 +1,53 @@
+https://github.com/OLSR/olsrd/pull/124
+--- a/lib/filtergw/src/olsrd_filtergw.c
b/lib/filtergw/src/olsrd_filtergw.c
+@@ -54,6 +54,7 @@
+ #include "log.h"
+ #include "routing_table.h"
+ #include "olsr_cfg.h"
++#include "parser.h"
+
+ #include
+ #include
+@@ -75,11 +76,19 @@ struct originator_list {
+
+ struct filter_group {
+ struct originator_list * originator_list;
+- struct hna_group *next;
++ struct filter_group *next;
+ };
+
+ static struct filter_group * filter_groups = NULL;
+
++/*
++ * Delcaring function prototype here, fixes build error with clang-16.
++ * Clang 16 enables -Wimplicit-function-declaration by default, hence the
++ * error.
++ * Refer: https://bugs.gentoo.org/898090
++ */
++int should_filter(union olsr_ip_addr * originator);
++
+ /* -
+ * Function : add_to_originator_list
+ * Description: Add a new ip to originator list
+@@ -304,4 +313,4 @@ int should_filter(union olsr_ip_addr * originator)
+ }
+ }
+ return is_allowlist ? !found : found;
+-}
+\ No newline at end of file
++}
+--- a/src/linux/kernel_routes_nl.c
b/src/linux/kernel_routes_nl.c
+@@ -161,7 +161,11 @@ static void rtnetlink_read(int sock, void *data
__attribute__ ((unused)), unsign
+ sizeof(nladdr),
+ &iov,
+ 1,
++#ifndef __GLIBC__
++ 0,
++#else
+ NULL,
++#endif
+ 0,
+ 0
+ };
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
new file mode 100644
index ..1ba8d428f242
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 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
+ "${FILESDIR}"/${PN}-0.9.8-clang16-buildfix.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() {
+ # See bug #715392 re LDCONFIG
+ emake \
+ DESTDIR="${D}" \
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 706e0068f01ab889aeae11b522965acc1f9f4539 Author: Sam James gentoo org> AuthorDate: Wed Oct 5 11:27:57 2022 + Commit: Sam James gentoo org> CommitDate: Wed Oct 5 11:29:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706e0068 net-misc/olsrd: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-misc/olsrd/metadata.xml | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml index 6a2f7727d58f..421eb74f58cb 100644 --- a/net-misc/olsrd/metadata.xml +++ b/net-misc/olsrd/metadata.xml @@ -1,8 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - -Install the Node Position Update plugin - + + + Install the Node Position Update plugin + + + OLSR/olsrd +
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 1ad21549d28eefca927be1c89f935ff31d86875e
Author: Sam James gentoo org>
AuthorDate: Fri Dec 3 02:22:21 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 3 02:22:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad21549
net-misc/olsrd: don't call ldconfig (fix musl install)
We already call ldconfig post-emerge and -n is not implemented
in our musl ldconfig wrapper/script/implementation.
Closes: https://bugs.gentoo.org/715392
Signed-off-by: Sam James gentoo.org>
net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
index 3feebde88006..ebcdd8a89db8 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -80,12 +80,14 @@ src_compile() {
}
src_install() {
+ # See bug #715392 re LDCONFIG
emake \
DESTDIR="${D}" \
DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \
LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
OS=linux \
STRIP=true \
+ LDCONFIG=true \
install_all
if use gtk; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 9d981f680b7497d40662feba5edb2fd2397998a6
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Nov 11 10:24:44 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Nov 11 10:24:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d981f68
net-misc/olsrd: Stabilize 0.9.8_p20210612 amd64, #776742
Signed-off-by: Jakov Smolić gentoo.org>
net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
index 3d23d6d8aee..3feebde8800 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
LICENSE="BSD LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="gtk pud"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 83b80ba951f611d4aa79b25b9e8bb05d80aa19ae
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Nov 11 08:36:39 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Nov 11 08:36:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b80ba9
net-misc/olsrd: Stabilize 0.9.8_p20210612 x86, #776742
Signed-off-by: Jakov Smolić gentoo.org>
net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
index f106d0346a3..3d23d6d8aee 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
LICENSE="BSD LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="gtk pud"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: b102d60d6af470bfd9a8463b86722df37316fda4
Author: Sam James gentoo org>
AuthorDate: Sat Oct 9 04:29:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 9 04:29:09 2021 +
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 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 000..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 \
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: bdfd93db377a8c17f7894560e05ad48b9c8ac675
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Mar 21 08:20:48 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Mar 21 08:20:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfd93db
net-misc/olsrd: drop 0.9.6.1, 0.9.7
Signed-off-by: Joonas Niilola gentoo.org>
net-misc/olsrd/Manifest| 1 -
net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild | 101
net-misc/olsrd/olsrd-0.9.7.ebuild | 102 -
3 files changed, 204 deletions(-)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index d8df19ada1d..48e954ea147 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,3 +1,2 @@
DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B
180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9
SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
-DIST olsrd-0.9.7.tar.gz 15761465 BLAKE2B
f272bf9358b4beb1157ff0e2098413de3b81a9598453f76b27c101e370d23280928efbf7399901efd48a319437ac6717ee3496d19a7213eb6d22f50adeb7b319
SHA512
a4abe3e6ddc624725f42c8a80df880a2763d1985d3583cb010d6a01c2866fbeef4e6870cf4e4d1e4403c49bea262a2c967d64040bd36c70ed2f4fc3f4ec988dd
DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B
67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f
SHA512
cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
diff --git a/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
deleted file mode 100644
index 32a6685bd66..000
--- a/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib toolchain-funcs versionator
-
-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)/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-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}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
- "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
- VERBOSE=1 \
- LIBDIR="/usr/$(get_libdir)/${PN}" \
- OLSRD_LDFLAGS="${LDFLAGS}" \
- OS=linux \
- build_all
- if use gtk; then
- emake -C 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 gui/linux-gtk \
- LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
- fi
-
- doinitd "${FILESDIR}"/${PN}
-
- gzip -d \
- "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
- "${ED%/}"/usr/share/man/man8/olsrd.8.gz
-
- 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/txti
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 89606bf499897a0a63c3043a244d10a974d30ecf
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Oct 10 07:42:35 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Oct 10 07:55:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89606bf4
net-misc/olsrd: ${ED%/} unnecessary slash strip
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/olsrd/olsrd-0.9.7.ebuild | 4 ++--
net-misc/olsrd/olsrd-0.9.8.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/olsrd/olsrd-0.9.7.ebuild
b/net-misc/olsrd/olsrd-0.9.7.ebuild
index ee0488eaf39..fabb4f49546 100644
--- a/net-misc/olsrd/olsrd-0.9.7.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.7.ebuild
@@ -79,8 +79,8 @@ src_install() {
doinitd "${FILESDIR}"/${PN}
gzip -d \
- "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
- "${ED%/}"/usr/share/man/man8/olsrd.8.gz \
+ "${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+ "${ED}"/usr/share/man/man8/olsrd.8.gz \
|| die
dodoc CHANGELOG \
diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild
b/net-misc/olsrd/olsrd-0.9.8.ebuild
index 410f7525a7c..c9d51ba3119 100644
--- a/net-misc/olsrd/olsrd-0.9.8.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8.ebuild
@@ -86,8 +86,8 @@ src_install() {
doinitd "${FILESDIR}"/${PN}
gzip -d \
- "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
- "${ED%/}"/usr/share/man/man8/olsrd.8.gz \
+ "${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+ "${ED}"/usr/share/man/man8/olsrd.8.gz \
|| die
dodoc CHANGELOG \
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: ec9ba9b274990aa85c816286aa797d5215c18c9b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Aug 11 10:04:36 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Aug 11 10:06:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9ba9b2
net-misc/olsrd: Version 0.9.8
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/olsrd-0.9.8.ebuild | 109 ++
2 files changed, 110 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index dfc664d29c2..d8df19ada1d 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.7.tar.gz 15761465 BLAKE2B
f272bf9358b4beb1157ff0e2098413de3b81a9598453f76b27c101e370d23280928efbf7399901efd48a319437ac6717ee3496d19a7213eb6d22f50adeb7b319
SHA512
a4abe3e6ddc624725f42c8a80df880a2763d1985d3583cb010d6a01c2866fbeef4e6870cf4e4d1e4403c49bea262a2c967d64040bd36c70ed2f4fc3f4ec988dd
+DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B
67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f
SHA512
cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild
b/net-misc/olsrd/olsrd-0.9.8.ebuild
new file mode 100644
index 000..410f7525a7c
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/";
+SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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_PGR
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: ac0be9325a02bd2b2184ba61b90f3773e9796238
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Mar 16 10:21:04 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Mar 16 10:21:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0be932
net-misc/olsrd: Version 0.9.7
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/olsrd-0.9.7.ebuild | 102 ++
2 files changed, 103 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 7df3615b807..dfc664d29c2 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1 +1,2 @@
DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B
180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9
SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
+DIST olsrd-0.9.7.tar.gz 15761465 BLAKE2B
f272bf9358b4beb1157ff0e2098413de3b81a9598453f76b27c101e370d23280928efbf7399901efd48a319437ac6717ee3496d19a7213eb6d22f50adeb7b319
SHA512
a4abe3e6ddc624725f42c8a80df880a2763d1985d3583cb010d6a01c2866fbeef4e6870cf4e4d1e4403c49bea262a2c967d64040bd36c70ed2f4fc3f4ec988dd
diff --git a/net-misc/olsrd/olsrd-0.9.7.ebuild
b/net-misc/olsrd/olsrd-0.9.7.ebuild
new file mode 100644
index 000..ee0488eaf39
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/";
+SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+ build_all
+ if use gtk; then
+ emake -C 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 gui/linux-gtk \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
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
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/, net-misc/olsrd/files/
commit: 28d66bf7c10aa06b920a15612965ba3695e460f4
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 23 17:19:15 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 23 17:19:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d66bf7
net-misc/olsrd: Fix configuration warning in init script
While there, decompress manual pages, too.
Fixes: https://bugs.gentoo.org/642108
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/olsrd/files/olsrd | 4 +-
net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild | 101 +
2 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd
index aca79b9d428..34c410e9944 100644
--- a/net-misc/olsrd/files/olsrd
+++ b/net-misc/olsrd/files/olsrd
@@ -5,8 +5,8 @@ depend() {
}
checkconfig() {
- if [ ! -e /etc/olsrd.conf ]; then
- eerror "You need a /etc/olsrd.conf file to run olsrd"
+ if [ ! -e /etc/olsrd/olsrd.conf ]; then
+ eerror "You need a /etc/olsrd/olsrd.conf file to run olsrd"
eerror "There is sample file in /usr/share/doc/olsrd-version/"
return 1
fi
diff --git a/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
new file mode 100644
index 000..32a6685bd66
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
+
+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)/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+ build_all
+ if use gtk; then
+ emake -C 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 gui/linux-gtk \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
+ fi
+
+ doinitd "${FILESDIR}"/${PN}
+
+ gzip -d \
+ "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
+ "${ED%/}"/usr/share/man/man8/olsrd.8.gz
+
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/files/, net-misc/olsrd/
commit: 2336e0d0c0b0fd2709f637618275cedd67bfeef1
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 23 16:47:24 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 23 16:52:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2336e0d0
Revert "net-misc/olsrd: bump to v0.9.6.2"
Official releases can be found at http://www.olsr.org/releases/
0.9.6.2 is not an official release and does not even work properly.
This reverts commit 28a5ba525fbef8709e1972830b31ade6744e0208.
Bug: https://bugs.gentoo.org/642108
Signed-off-by: Jeroen Roovers gentoo.org>
net-misc/olsrd/Manifest | 1 -
net-misc/olsrd/files/olsrd-r1.initd | 4 --
net-misc/olsrd/olsrd-0.9.6.2.ebuild | 108
3 files changed, 113 deletions(-)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 7d58d99adbe..7df3615b807 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,2 +1 @@
DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B
180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9
SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
-DIST olsrd-0.9.6.2.tar.gz 20466227 BLAKE2B
45d90393814ac7cbd6b86fc532d560a415e80ed50be78ad9e55abe44d17a456546820897edcfb6cc8a05fbb6d8919dec9c413d0af7194cbf810bb8e621d66edd
SHA512
fb0ff8553f9f38338ec3f0d15aa7ad17ee30d38437a6e23c96f5a310ee7e1c907c8d8deea58e90181d4ed89f190e042fea6cb03d47adbf4851b6a630b810
diff --git a/net-misc/olsrd/files/olsrd-r1.initd
b/net-misc/olsrd/files/olsrd-r1.initd
deleted file mode 100644
index 9bca9b37074..000
--- a/net-misc/olsrd/files/olsrd-r1.initd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/sbin/openrc-run
-command="/usr/sbin/olsrd"
-command_background="yes"
-pidfile="/run/olsrd.pid"
diff --git a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
b/net-misc/olsrd/olsrd-0.9.6.2.ebuild
deleted file mode 100644
index f52b1c40cc9..000
--- a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/";
-SRC_URI="https://github.com/OLSR/olsrd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-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}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
- "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
- VERBOSE=1 \
- LIBDIR="/usr/$(get_libdir)/${PN}" \
- OLSRD_LDFLAGS="${LDFLAGS}" \
- OS=linux \
- build_all
- if use gtk; then
- emake -C 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 gui/linux-gtk \
- LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
- fi
-
- # decompress default compressed man pages to honor user wishes
- local compressed_man_pages=(
- "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz
- "${ED%/}"/usr/share/man/man8/olsrd.8.gz
- )
-
- local compressed_man_page=
- for compressed_man_page in ${compressed_man_pages[@]}; do
- gzip -d "${compressed_man_page}" || die
- done
-
- newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-
- dodoc CHANGELOG \
- valgrind-howto.txt files/olsrd.conf.default.rfc \
- files/olsrd.conf.default.lq \
- lib/arprefresh/README_ARPREFRESH \
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/files/, net-misc/olsrd/
commit: 28a5ba525fbef8709e1972830b31ade6744e0208
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Nov 18 00:52:36 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Nov 18 01:17:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a5ba52
net-misc/olsrd: bump to v0.9.6.2
- EAPI bumped to EAPI=7
- New run script [Bug 642108]
Closes: https://bugs.gentoo.org/642108
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/files/olsrd-r1.initd | 4 ++
net-misc/olsrd/olsrd-0.9.6.2.ebuild | 108
3 files changed, 113 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 7df3615b807..7d58d99adbe 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1 +1,2 @@
DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B
180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9
SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
+DIST olsrd-0.9.6.2.tar.gz 20466227 BLAKE2B
45d90393814ac7cbd6b86fc532d560a415e80ed50be78ad9e55abe44d17a456546820897edcfb6cc8a05fbb6d8919dec9c413d0af7194cbf810bb8e621d66edd
SHA512
fb0ff8553f9f38338ec3f0d15aa7ad17ee30d38437a6e23c96f5a310ee7e1c907c8d8deea58e90181d4ed89f190e042fea6cb03d47adbf4851b6a630b810
diff --git a/net-misc/olsrd/files/olsrd-r1.initd
b/net-misc/olsrd/files/olsrd-r1.initd
new file mode 100644
index 000..9bca9b37074
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-r1.initd
@@ -0,0 +1,4 @@
+#!/sbin/openrc-run
+command="/usr/sbin/olsrd"
+command_background="yes"
+pidfile="/run/olsrd.pid"
diff --git a/net-misc/olsrd/olsrd-0.9.6.2.ebuild
b/net-misc/olsrd/olsrd-0.9.6.2.ebuild
new file mode 100644
index 000..f52b1c40cc9
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/";
+SRC_URI="https://github.com/OLSR/olsrd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+ build_all
+ if use gtk; then
+ emake -C 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 gui/linux-gtk \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
+ fi
+
+ # decompress default compressed man pages to honor user wishes
+ local compressed_man_pages=(
+ "${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz
+ "${ED%/}"/usr/share/man/man8/olsrd.8.gz
+ )
+
+ local compressed_man_page=
+ for compressed_man_page in ${compressed_man_pages[@]}; do
+ gzip -d "${compressed_man_page}" || die
+ done
+
+ newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+
+ 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_
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: aa5e5e0f243920a7a2de9c0d1acd1435c588ed6e
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Aug 29 22:54:11 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Aug 29 22:54:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5e5e0f
net-misc/olsrd: Old.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/olsrd/Manifest | 2 -
net-misc/olsrd/olsrd-0.9.0.2.ebuild | 85
net-misc/olsrd/olsrd-0.9.6.ebuild | 97 -
3 files changed, 184 deletions(-)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 9025f8ee341..157f2e89c07 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,3 +1 @@
-DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256
cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512
a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058
WHIRLPOOL
55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
DIST olsrd-0.9.6.1.tar.bz2 908871 SHA256
9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
WHIRLPOOL
527cea2116dd390942fbada09946f8c4fcc5bb70977fb8073ecf1bda6eb95a14c37bff1e637d2031803cacce3dc3c7c0bb505273e0bbe1b847a60cbfb1d583f7
-DIST olsrd-0.9.6.tar.bz2 908597 SHA256
d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512
74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050
WHIRLPOOL
012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3
diff --git a/net-misc/olsrd/olsrd-0.9.0.2.ebuild
b/net-misc/olsrd/olsrd-0.9.0.2.ebuild
deleted file mode 100644
index b86f7d0419d..000
--- a/net-misc/olsrd/olsrd-0.9.0.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator
-
-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)/${P}.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}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
-
- # 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_compile() {
- tc-export PKG_CONFIG
- emake \
- CC="$(tc-getCC)" \
- VERBOSE=1 \
- LIBDIR="/usr/$(get_libdir)/${PN}" \
- OLSRD_LDFLAGS="${LDFLAGS}" \
- OS=linux \
- build_all
- if use gtk; then
- emake -C 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 gui/linux-gtk \
- LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
- fi
-
- doinitd "${FILESDIR}/${PN}"
-
- 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
-}
diff --git a/net-misc/olsrd/olsrd-0.9.6.ebuild
b/net-misc/olsrd/olsrd-0.9.6.ebuild
deleted file mode 100644
index fe
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: be38f540e94b9db4ab9ad0ce9308a0d1cce15cd7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 29 21:29:03 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 29 21:38:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be38f540
net-misc/olsrd: x86 stable (bug #615184)
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/olsrd/olsrd-0.9.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
index 8c8d3a912e3..1379675e09a 100644
--- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.ta
SLOT="0"
LICENSE="BSD LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk pud"
DEPEND="
gtk? (
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 5b8e5f779abc65948d17004d023c240751c4f9ef
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Aug 26 08:42:16 2017 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Aug 26 08:42:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8e5f77
net-misc/olsrd: amd64 stable wrt bug #615184
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-misc/olsrd/olsrd-0.9.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
index fe4249c7e19..8c8d3a912e3 100644
--- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.ta
SLOT="0"
LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="gtk pud"
DEPEND="
gtk? (
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 99a6c4d0e3ebd2b8c5217bca63e8163106a43520
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Mar 6 15:57:11 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Mar 6 15:57:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a6c4d0
net-misc/olsrd: Version bump.
Package-Manager: Portage-2.3.4, Repoman-2.3.1
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/olsrd-0.9.6.1.ebuild | 97 +
2 files changed, 98 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index f928580f17f..9025f8ee341 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,2 +1,3 @@
DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256
cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512
a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058
WHIRLPOOL
55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
+DIST olsrd-0.9.6.1.tar.bz2 908871 SHA256
9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 SHA512
06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
WHIRLPOOL
527cea2116dd390942fbada09946f8c4fcc5bb70977fb8073ecf1bda6eb95a14c37bff1e637d2031803cacce3dc3c7c0bb505273e0bbe1b847a60cbfb1d583f7
DIST olsrd-0.9.6.tar.bz2 908597 SHA256
d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512
74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050
WHIRLPOOL
012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3
diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
new file mode 100644
index 000..fe4249c7e19
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
+
+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)/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+ build_all
+ if use gtk; then
+ emake -C 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 gui/linux-gtk \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
+ fi
+
+ doinitd "${FILESDIR}/${PN}"
+
+ 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/READ
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/, net-misc/olsrd/files/
commit: 3725ef8908d2341b82045677eab716341efbd281
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Feb 3 21:12:52 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Feb 3 21:32:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3725ef89
net-misc/olsrd: Version bump.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch | 21 +++
net-misc/olsrd/metadata.xml | 3 +
net-misc/olsrd/olsrd-0.9.6.ebuild | 98 +
4 files changed, 123 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index b3bac27..58a18ee 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,2 +1,3 @@
DIST olsrd-0.6.4.tar.bz2 5469577 SHA256
f8ab1bbdf2e424573a5bff9f2bf6e308c1307556e95c1de72b011949db20945f SHA512
a64b27f6f8ab772e79402ea0ea9e90ea1f980f9bd1fdbb608b41c91f2f942a546757f3a17fd71bd6f4b3dba69d7e96b7b0e028e4b4dcd39c3c22cf0f802cdbcd
WHIRLPOOL
0c42e12e7e89719b8e9f7a4b931a71e0aa797bf2ba8507fa1f4dd3b6ede9cbe34ef8f3b3d819646959e54cde8cd61f165daab6b4b6f1e29560899f4bd24f9967
DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256
cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512
a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058
WHIRLPOOL
55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
+DIST olsrd-0.9.6.tar.bz2 908597 SHA256
d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512
74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050
WHIRLPOOL
012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3
diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch
b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch
new file mode 100644
index ..a70115f
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch
@@ -0,0 +1,21 @@
+--- a/lib/pud/src/gpsdclient.c
b/lib/pud/src/gpsdclient.c
+@@ -343,7 +343,6 @@
+ | POLICY_SET //
+ #ifdef GPSD_JESSIE
+ | TIMEDRIFT_SET //
+- | EOF_SET //
+ #endif
+ #ifdef GPSD_NEW
+ | TOFF_SET //
+--- a/lib/pud/Makefile
b/lib/pud/Makefile
+@@ -108,7 +108,7 @@
+
+ default_target: nmealib library $(PLUGIN_FULLNAME)
+
+-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt
++$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt
+ ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),)
+ ifeq ($(VERBOSE),0)
+ endif
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 5a1307d..05b0733 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/metadata.xml
@@ -4,4 +4,7 @@
j...@gentoo.org
+
+Install the Node Position Update plugin
+
diff --git a/net-misc/olsrd/olsrd-0.9.6.ebuild
b/net-misc/olsrd/olsrd-0.9.6.ebuild
new file mode 100644
index ..544b2ec
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator
+
+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)/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+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}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+ "${FILESDIR}"/${PN}-0.9.6-gpsd.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)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/files/, net-misc/olsrd/
commit: c4529e80fd54388055d1d50a8639d17b55725bd1
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Feb 3 21:32:27 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Feb 3 21:32:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4529e80
net-misc/olsrd: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-misc/olsrd/Manifest | 1 -
net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch | 11 ---
net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch | 22 --
net-misc/olsrd/olsrd-0.6.4-r1.ebuild | 88
4 files changed, 122 deletions(-)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 58a18ee..f928580 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,3 +1,2 @@
-DIST olsrd-0.6.4.tar.bz2 5469577 SHA256
f8ab1bbdf2e424573a5bff9f2bf6e308c1307556e95c1de72b011949db20945f SHA512
a64b27f6f8ab772e79402ea0ea9e90ea1f980f9bd1fdbb608b41c91f2f942a546757f3a17fd71bd6f4b3dba69d7e96b7b0e028e4b4dcd39c3c22cf0f802cdbcd
WHIRLPOOL
0c42e12e7e89719b8e9f7a4b931a71e0aa797bf2ba8507fa1f4dd3b6ede9cbe34ef8f3b3d819646959e54cde8cd61f165daab6b4b6f1e29560899f4bd24f9967
DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256
cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512
a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058
WHIRLPOOL
55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
DIST olsrd-0.9.6.tar.bz2 908597 SHA256
d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512
74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050
WHIRLPOOL
012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3
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
deleted file mode 100644
index 9a8683e..
--- a/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -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/files/olsrd-0.6.3-make-gtk.patch
b/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch
deleted file mode 100644
index 12e983d..
--- a/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
a/gui/linux-gtk/Makefile
-+++ b/gui/linux-gtk/Makefile
-@@ -1,8 +1,8 @@
- CC ?= gcc
-
--CFLAGS += -Wall `pkg-config --cflags gtk+-2.0`
-+CFLAGS += -Wall $(shell pkg-config --cflags gdk-pixbuf-2.0 glib-2.0 gtk+-2.0)
- LDFLAGS +=
--LIBS := `pkg-config --libs gtk+-2.0` -lm
-+LIBS := $(shell pkg-config --libs gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) -lm
-
- OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \
- src/packet.o src/nodes.o src/routes.o
-@@ -10,7 +10,7 @@
- all: olsrd-gui
-
- olsrd-gui:$(OBJS)
-- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
- clean:
- rm -f $(OBJS) olsrd-gui
diff --git a/net-misc/olsrd/olsrd-0.6.4-r1.ebuild
b/net-misc/olsrd/olsrd-0.6.4-r1.ebuild
deleted file mode 100644
index e0363f1..
--- a/net-misc/olsrd/olsrd-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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
- # 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/M
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: 7cd660116b87296406b78ae115ed12cafb6f311a
Author: Aaron Bauman gentoo org>
AuthorDate: Thu Dec 29 08:05:35 2016 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu Dec 29 08:05:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd66011
net-misc/olsrd: amd64 stable wrt bug #603672
net-misc/olsrd/olsrd-0.9.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/olsrd/olsrd-0.9.0.2.ebuild
b/net-misc/olsrd/olsrd-0.9.0.2.ebuild
index bddb54b..a46fa7b 100644
--- a/net-misc/olsrd/olsrd-0.9.0.2.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.0.2.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.ta
SLOT="0"
LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="gtk"
DEPEND="
gtk? (
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/, net-misc/olsrd/files/
commit: 3857c4a8bf1d251fd6b068278cae901afe6043df
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Jan 21 16:00:31 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Jan 21 16:00:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3857c4a8
net-misc/olsrd: Version bump.
Package-Manager: portage-2.2.27
net-misc/olsrd/Manifest | 1 +
net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch | 29 ++
net-misc/olsrd/olsrd-0.9.0.2.ebuild | 86
3 files changed, 116 insertions(+)
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index e385a22..b3bac27 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1 +1,2 @@
DIST olsrd-0.6.4.tar.bz2 5469577 SHA256
f8ab1bbdf2e424573a5bff9f2bf6e308c1307556e95c1de72b011949db20945f SHA512
a64b27f6f8ab772e79402ea0ea9e90ea1f980f9bd1fdbb608b41c91f2f942a546757f3a17fd71bd6f4b3dba69d7e96b7b0e028e4b4dcd39c3c22cf0f802cdbcd
WHIRLPOOL
0c42e12e7e89719b8e9f7a4b931a71e0aa797bf2ba8507fa1f4dd3b6ede9cbe34ef8f3b3d819646959e54cde8cd61f165daab6b4b6f1e29560899f4bd24f9967
+DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256
cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512
a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058
WHIRLPOOL
55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
diff --git a/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch
b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch
new file mode 100644
index 000..0571340
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch
@@ -0,0 +1,29 @@
+--- a/gui/linux-gtk/Makefile
b/gui/linux-gtk/Makefile
+@@ -2,14 +2,14 @@
+ include $(TOPDIR)/Makefile.inc
+
+ # hardening flags: -fPIE -Wl,-z,now -pie
+-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -fPIE -Wno-strict-prototypes \
++CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0)
-fPIE -Wno-strict-prototypes \
+ -Wno-cast-qual
+-CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0)
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0)
+ LDFLAGS += -pie
+ #LDFLAGS += -Wl,--warn-common
+
+
+-LIBS := $(shell pkg-config --libs gtk+-2.0) -lm
++LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -lm
+
+ # 32/64 cross compilation
+ ifdef M32
+@@ -30,7 +30,7 @@
+ ifeq ($(VERBOSE),0)
+ @echo "[LD] $@"
+ endif
+- $(MAKECMDPREFIX)$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++ $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ .PHONY: clean install
+
diff --git a/net-misc/olsrd/olsrd-0.9.0.2.ebuild
b/net-misc/olsrd/olsrd-0.9.0.2.ebuild
new file mode 100644
index 000..bddb54b
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.0.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator
+
+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)/${P}.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}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+
+ # 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_compile() {
+ tc-export PKG_CONFIG
+ emake \
+ CC="$(tc-getCC)" \
+ VERBOSE=1 \
+ LIBDIR="/usr/$(get_libdir)/${PN}" \
+ OLSRD_LDFLAGS="${LDFLAGS}" \
+ OS=linux \
+ build_all
+ if use gtk; then
+ emake -C 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 gui/linux-gtk \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}"
install
+ fi
+
+ doinitd "${FILESDIR}/${PN}"
+
+ dodoc CHANGELOG \
+ valgr
[gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
commit: aeb1eb5dd6116d8e6c8c7f5771995c64ecd7e97b Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jan 21 10:30:01 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jan 21 10:30:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb1eb5d net-misc/olsrd: Take up maintainership. Package-Manager: portage-2.2.27 net-misc/olsrd/metadata.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml index 19e9f85..0ffe1bf 100644 --- a/net-misc/olsrd/metadata.xml +++ b/net-misc/olsrd/metadata.xml @@ -2,7 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - maintainer-nee...@gentoo.org + j...@gentoo.org -An implementation of the Optimized Link State Routing protocol
