Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/olsrd/
Date: Mon, 06 Mar 2017 15:57:22
Message-Id: 1488815831.99a6c4d0e3ebd2b8c5217bca63e8163106a43520.jer@gentoo
1 commit: 99a6c4d0e3ebd2b8c5217bca63e8163106a43520
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 6 15:57:11 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 6 15:57:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a6c4d0
7
8 net-misc/olsrd: Version bump.
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.1
11
12 net-misc/olsrd/Manifest | 1 +
13 net-misc/olsrd/olsrd-0.9.6.1.ebuild | 97 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 98 insertions(+)
15
16 diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
17 index f928580f17f..9025f8ee341 100644
18 --- a/net-misc/olsrd/Manifest
19 +++ b/net-misc/olsrd/Manifest
20 @@ -1,2 +1,3 @@
21 DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256 cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512 a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058 WHIRLPOOL 55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89
22 +DIST olsrd-0.9.6.1.tar.bz2 908871 SHA256 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a WHIRLPOOL 527cea2116dd390942fbada09946f8c4fcc5bb70977fb8073ecf1bda6eb95a14c37bff1e637d2031803cacce3dc3c7c0bb505273e0bbe1b847a60cbfb1d583f7
23 DIST olsrd-0.9.6.tar.bz2 908597 SHA256 d68f59f26f8bcf7136e622759b6ec14f806ea1afd0d2c68818dcb7ec6461c1b0 SHA512 74f08a0261795b828d47823088ef44cdb0ddccc99c304e10af6859716a2267ddc905a2f10904021ed79742d483e87e5e8b4a035cd1eea9d9266231090a7ff050 WHIRLPOOL 012b08b4b759646ab863909dba311fc46274843a998f56412e3f0fcfcae15e1950e97b9463210bfe5b6734f1456a2ea018b5bbab67480b8ad803d267b8ef81a3
24
25 diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
26 new file mode 100644
27 index 00000000000..fe4249c7e19
28 --- /dev/null
29 +++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild
30 @@ -0,0 +1,97 @@
31 +# Copyright 1999-2017 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI=6
35 +inherit eutils multilib toolchain-funcs versionator
36 +
37 +DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
38 +HOMEPAGE="http://www.olsr.org/"
39 +SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2"
40 +
41 +SLOT="0"
42 +LICENSE="BSD LGPL-2.1"
43 +KEYWORDS="~amd64 ~x86"
44 +IUSE="gtk pud"
45 +DEPEND="
46 + gtk? (
47 + dev-libs/glib:2
48 + x11-libs/gdk-pixbuf:2
49 + x11-libs/gtk+:2
50 + )
51 + pud? ( sci-geosciences/gpsd )
52 +"
53 +RDEPEND="
54 + ${DEPEND}
55 +"
56 +PATCHES=(
57 + "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
58 + "${FILESDIR}"/${PN}-0.9.6-gpsd.patch
59 +)
60 +src_prepare() {
61 + default
62 +
63 + # fix parallel make
64 + # respect AR
65 + # verbose build
66 + # fix default prefix, bug #453440
67 + sed -i \
68 + -e '/@echo "\[/d' \
69 + -e 's|$(MAKECMD)|$(MAKE)|g' \
70 + -e 's|@$(CC)|$(CC)|g' \
71 + -e 's|@ar |$(AR) |g' \
72 + -e '/^prefix/s:/usr/local:/usr:' \
73 + $( find . -name 'Makefile*' ) || die
74 +
75 + # respect LDFLAGS
76 + sed -i \
77 + -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
78 + lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
79 +}
80 +
81 +src_configure() {
82 + if ! use pud; then
83 + sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
84 + fi
85 +}
86 +
87 +src_compile() {
88 + tc-export PKG_CONFIG
89 + emake \
90 + CC="$(tc-getCC)" \
91 + VERBOSE=1 \
92 + LIBDIR="/usr/$(get_libdir)/${PN}" \
93 + OLSRD_LDFLAGS="${LDFLAGS}" \
94 + OS=linux \
95 + build_all
96 + if use gtk; then
97 + emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
98 + fi
99 +}
100 +
101 +src_install() {
102 + emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
103 + DESTDIR="${D}" STRIP=true install_all
104 + if use gtk; then
105 + emake -C gui/linux-gtk \
106 + LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
107 + fi
108 +
109 + doinitd "${FILESDIR}/${PN}"
110 +
111 + dodoc CHANGELOG \
112 + valgrind-howto.txt files/olsrd.conf.default.rfc \
113 + files/olsrd.conf.default.lq \
114 + lib/arprefresh/README_ARPREFRESH \
115 + lib/bmf/README_BMF \
116 + lib/dot_draw/README_DOT_DRAW \
117 + lib/dyn_gw/README_DYN_GW \
118 + lib/dyn_gw_plain/README_DYN_GW_PLAIN \
119 + lib/httpinfo/README_HTTPINFO \
120 + lib/mini/README_MINI \
121 + lib/nameservice/README_NAMESERVICE \
122 + lib/pgraph/README_PGRAPH \
123 + lib/quagga/README_QUAGGA \
124 + lib/secure/README_SECURE \
125 + lib/txtinfo/README_TXTINFO \
126 + lib/watchdog/README_WATCHDOG
127 +}