Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/olsrd: ChangeLog olsrd-0.6.4-r1.ebuild olsrd-0.6.4.ebuild
Date: Sat, 01 Jun 2013 23:03:38
Message-Id: 20130601230333.7DA882171D@flycatcher.gentoo.org
1 pinkbyte 13/06/01 23:03:33
2
3 Modified: ChangeLog
4 Added: olsrd-0.6.4-r1.ebuild
5 Removed: olsrd-0.6.4.ebuild
6 Log:
7 Revision bump: EAPI 5, fix minor QA issues, set proper prefix, wrt bug #453440, drop old broken revision
8
9 (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
10
11 Revision Changes Path
12 1.34 net-misc/olsrd/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/ChangeLog?rev=1.34&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/ChangeLog?rev=1.34&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/ChangeLog?r1=1.33&r2=1.34
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v
21 retrieving revision 1.33
22 retrieving revision 1.34
23 diff -u -r1.33 -r1.34
24 --- ChangeLog 1 Jun 2013 12:22:39 -0000 1.33
25 +++ ChangeLog 1 Jun 2013 23:03:33 -0000 1.34
26 @@ -1,6 +1,13 @@
27 # ChangeLog for net-misc/olsrd
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.33 2013/06/01 12:22:39 pacho Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.34 2013/06/01 23:03:33 pinkbyte Exp $
31 +
32 +*olsrd-0.6.4-r1 (01 Jun 2013)
33 +
34 + 01 Jun 2013; Sergey Popov <pinkbyte@g.o> -olsrd-0.6.4.ebuild,
35 + +olsrd-0.6.4-r1.ebuild:
36 + Revision bump: EAPI 5, fix minor QA issues, set proper prefix, wrt bug
37 + #453440, drop old broken revision
38
39 01 Jun 2013; Pacho Ramos <pacho@g.o> -olsrd-0.6.2-r1.ebuild,
40 metadata.xml:
41
42
43
44 1.1 net-misc/olsrd/olsrd-0.6.4-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/olsrd-0.6.4-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/olsrd-0.6.4-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: olsrd-0.6.4-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.6.4-r1.ebuild,v 1.1 2013/06/01 23:03:33 pinkbyte Exp $
54
55 EAPI=5
56 inherit eutils multilib toolchain-funcs versionator
57
58 MY_PV="$(replace_version_separator 3 '-r')"
59 DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
60 HOMEPAGE="http://www.olsr.org/"
61 SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${PN}-${MY_PV}.tar.bz2"
62
63 SLOT="0"
64 LICENSE="BSD LGPL-2.1"
65 KEYWORDS="~amd64 ~x86"
66 IUSE="gtk"
67 DEPEND="
68 gtk? (
69 dev-libs/glib:2
70 x11-libs/gdk-pixbuf:2
71 x11-libs/gtk+:2
72 )
73 "
74 RDEPEND="${DEPEND}"
75 S="${WORKDIR}/${PN}-${MY_PV}"
76
77 src_prepare() {
78 epatch \
79 "${FILESDIR}/${PN}-0.6.1-build_fix.patch" \
80 "${FILESDIR}/${PN}-0.6.3-make-gtk.patch"
81
82 # fix parallel make
83 # respect AR
84 # verbose build
85 # fix default prefix, bug #453440
86 sed -i \
87 -e '/@echo "\[/d' \
88 -e 's|$(MAKECMD)|$(MAKE)|g' \
89 -e 's|@$(CC)|$(CC)|g' \
90 -e 's|@ar |$(AR) |g' \
91 -e '/^prefix/s:/usr/local:/usr:' \
92 $( find . -name 'Makefile*' ) || die
93
94 # respect LDFLAGS
95 sed -i \
96 -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
97 lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
98 }
99
100 src_compile() {
101 emake \
102 CC="$(tc-getCC)" \
103 LIBDIR="/usr/$(get_libdir)/${PN}" \
104 OLSRD_LDFLAGS="${LDFLAGS}" \
105 OS=linux \
106 build_all
107 if use gtk; then
108 emake -C "${S}/gui/linux-gtk" LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
109 fi
110 }
111
112 src_install() {
113 emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
114 DESTDIR="${D}" STRIP=true install_all
115 if use gtk; then
116 emake -C "${S}/gui/linux-gtk" \
117 LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
118 fi
119
120 doinitd "${FILESDIR}/${PN}"
121
122 dodoc CHANGELOG \
123 valgrind-howto.txt files/olsrd.conf.default.rfc \
124 files/olsrd.conf.default.lq files/olsrd.conf.default.lq-fisheye \
125 lib/arprefresh/README_ARPREFRESH \
126 lib/bmf/README_BMF \
127 lib/dot_draw/README_DOT_DRAW \
128 lib/dyn_gw/README_DYN_GW \
129 lib/dyn_gw_plain/README_DYN_GW_PLAIN \
130 lib/httpinfo/README_HTTPINFO \
131 lib/mini/README_MINI \
132 lib/nameservice/README_NAMESERVICE \
133 lib/pgraph/README_PGRAPH \
134 lib/quagga/README_QUAGGA \
135 lib/secure/README_SECURE \
136 lib/txtinfo/README_TXTINFO \
137 lib/watchdog/README_WATCHDOG
138 }