summaryrefslogtreecommitdiff
path: root/net-misc/olsrd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /net-misc/olsrd
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'net-misc/olsrd')
-rw-r--r--net-misc/olsrd/Manifest4
-rw-r--r--net-misc/olsrd/olsrd-0.9.6.1.ebuild13
-rw-r--r--net-misc/olsrd/olsrd-0.9.8.ebuild14
3 files changed, 23 insertions, 8 deletions
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 1abda5708623..e13c6495fa55 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -3,6 +3,6 @@ AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625
AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
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
-EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
-EBUILD olsrd-0.9.8.ebuild 2385 BLAKE2B 80f609c1c1a297231670e734a42bb941ff5ea70f45daca826a1c1aa6cae83b9c4665ce491c7a828489425371f13e10d21f09036dd9ed75f02b14b52712b63de5 SHA512 9895cd6623c23fd5213e761803d7974681ddda924a91f9027cd8fd3ccc250764fc1d37e1da26ff4c897a689c1cde798649506ab67c66d8346fcefd30e8d542fa
+EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48
+EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e
MISC metadata.xml 243 BLAKE2B abda82f67bcaba5ce8d982effdcacbe18ac652918f14d3da341781d95cc22f48028d82571b66208263086adcece8809ee7b1f63159250de042766cd6d87efdad SHA512 703cf9330497469fc7feca884347f9b9cba7dd2f36beaf5b9901091eedad49fbd98399f1fab759d198850cffb979df1d2ed87267679afba07dba9f1f7c752226
diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
index 1379675e09a0..8e8f409db132 100644
--- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils multilib toolchain-funcs versionator
+
+inherit 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"
+SLOT="0"
KEYWORDS="amd64 x86"
IUSE="gtk pud"
+
DEPEND="
+ virtual/pkgconfig
gtk? (
dev-libs/glib:2
x11-libs/gdk-pixbuf:2
@@ -23,10 +26,12 @@ DEPEND="
RDEPEND="
${DEPEND}
"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
)
+
src_prepare() {
default
@@ -63,6 +68,7 @@ src_compile() {
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
@@ -71,6 +77,7 @@ src_compile() {
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
diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild
index c9d51ba3119a..bede675037e3 100644
--- a/net-misc/olsrd/olsrd-0.9.8.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib toolchain-funcs
+
+inherit 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"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gtk pud"
+
DEPEND="
gtk? (
dev-libs/glib:2
@@ -23,10 +25,13 @@ DEPEND="
RDEPEND="
${DEPEND}
"
+BDEPEND="virtual/pkgconfig"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
)
+
src_prepare() {
default
@@ -56,6 +61,7 @@ src_configure() {
src_compile() {
tc-export PKG_CONFIG
+
emake \
CC="$(tc-getCC)" \
LIBDIR="/usr/$(get_libdir)/${PN}" \
@@ -63,6 +69,7 @@ src_compile() {
OS=linux \
VERBOSE=1 \
build_all
+
if use gtk; then
emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
fi
@@ -76,6 +83,7 @@ src_install() {
OS=linux \
STRIP=true \
install_all
+
if use gtk; then
emake -C gui/linux-gtk \
DESTDIR="${D}" \