summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2011-05-22 23:32:08 +0000
committerMichael Weber <xmw@gentoo.org>2011-05-22 23:32:08 +0000
commitbf88658d1c518fe18b8eca6d9df770badb84cce1 (patch)
treee2af1177d66915cb109e4006c05b27d9ecece15c /net-misc/batman-vis
parentImproved sed expression and src_compile (diff)
downloadgentoo-2-bf88658d1c518fe18b8eca6d9df770badb84cce1.tar.gz
gentoo-2-bf88658d1c518fe18b8eca6d9df770badb84cce1.tar.bz2
gentoo-2-bf88658d1c518fe18b8eca6d9df770badb84cce1.zip
Improved sed expression, src_compile and updated SRC_URI
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/batman-vis')
-rw-r--r--net-misc/batman-vis/ChangeLog6
-rw-r--r--net-misc/batman-vis/batman-vis-0.3.2.ebuild17
2 files changed, 13 insertions, 10 deletions
diff --git a/net-misc/batman-vis/ChangeLog b/net-misc/batman-vis/ChangeLog
index a96be6fb011d..ec0af3e714a5 100644
--- a/net-misc/batman-vis/ChangeLog
+++ b/net-misc/batman-vis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/batman-vis
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-vis/ChangeLog,v 1.1 2011/05/20 23:37:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-vis/ChangeLog,v 1.2 2011/05/22 23:32:08 xmw Exp $
+
+ 22 May 2011; Michael Weber <xmw@gentoo.org> batman-vis-0.3.2.ebuild:
+ Improved sed expression, src_compile and updated SRC_URI, thanks to Emil
+ Langrock (bug 368213)
*batman-vis-0.3.2 (20 May 2011)
diff --git a/net-misc/batman-vis/batman-vis-0.3.2.ebuild b/net-misc/batman-vis/batman-vis-0.3.2.ebuild
index 3499dc5401ca..accedbc87134 100644
--- a/net-misc/batman-vis/batman-vis-0.3.2.ebuild
+++ b/net-misc/batman-vis/batman-vis-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-vis/batman-vis-0.3.2.ebuild,v 1.1 2011/05/20 23:37:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-vis/batman-vis-0.3.2.ebuild,v 1.2 2011/05/22 23:32:08 xmw Exp $
EAPI=3
@@ -9,7 +9,8 @@ inherit toolchain-funcs
DESCRIPTION="BATMAN visualization server for the net-misc/batmand server"
HOMEPAGE="http://www.open-mesh.org/"
MY_P=${P/batman-/}
-SRC_URI="http://downloads.open-mesh.org/batman/releases/batman-${PV}/${MY_P}.tar.gz"
+SRC_URI="
+http://downloads.open-mesh.org/batman/stable/sources/${PN/batman-/}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -22,20 +23,18 @@ RDEPEND=""
S=${WORKDIR}/${MY_P}
src_prepare() {
- sed -e "/^CFLAGS/s: -O.* : :" \
- -e "/^CFLAGS/s: -g.* : :" \
- -e "/^NUM_CPUS/d" \
- -e "/\$(MAKE)/s: -j \$(NUM_CPUS) : :" \
- -e "/BINARY_NAME=/s:vis:${PN}:" \
+ sed -e "/^CFLAGS/s: -O[^[:space:]]* : :" \
+ -e "/^CFLAGS/s: -g[^[:space:]]* : :" \
+ -e "s: -j \$(NUM_CPUS) : :" \
-i Makefile || die
}
src_compile() {
- emake CC="$(tc-getCC)" Q_CC="" Q_LD="" || die
+ emake CC="$(tc-getCC)" V=1 BINARY_NAME=${PN} || die
}
src_install() {
- emake INSTALL_PREFIX="${D}" install || die
+ emake INSTALL_PREFIX="${D}" BINARY_NAME=${PN} install || die
newinitd "${FILESDIR}"/${PN}-init.d ${PN} || die
newconfd "${FILESDIR}"/${PN}-conf.d ${PN} || die