diff options
| -rw-r--r-- | net-misc/batman-vis/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/batman-vis/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/batman-vis/batman-vis-0.3.2.ebuild | 17 |
3 files changed, 18 insertions, 15 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/Manifest b/net-misc/batman-vis/Manifest index 40d8ef6ce5a4..71816d3e7b0b 100644 --- a/net-misc/batman-vis/Manifest +++ b/net-misc/batman-vis/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 AUX batman-vis-conf.d 231 RMD160 d53ec5123477f263417d5c8d415a8bf0ec158342 SHA1 b0a2a1e6b2e0b0128f1f3cceb9a0b43b7f7f112e SHA256 538f21685f1a480f62e318865d9013f9ba7f8895cfa8cec190672f91eb96fdc8 AUX batman-vis-init.d 335 RMD160 9d028c0649828a725275334a21e4369e69ffc4bc SHA1 e1faa4bd0adb11b193900be4e6fdc70244e32c02 SHA256 2df36b559e349baff7a86060aa0fc59a1c0d3c894f5b5665ed0d757ed0725f37 DIST vis-0.3.2.tar.gz 16094 RMD160 3f68daad1b25fa17b12c69d8f9bb5be6feb01545 SHA1 f7154b52a7321315d91653918e535eaeb2603b03 SHA256 00052790c1a51c27fca398b3d2c741fcba48acececcf33fb5925dd8f81c4ce76 -EBUILD batman-vis-0.3.2.ebuild 1027 RMD160 f7e976bf68f55d2db0defce2f6c938e40e496ef8 SHA1 a4b6e931f30c03a253db7bccd1efebfefe0d2c9c SHA256 85eec353ac5e6216b18826e15ed2d4a6d167f96fdbc84c261656df79de88f0de -MISC ChangeLog 487 RMD160 3c24324a45225a883fb626f77c5dcc69be652d2e SHA1 b71ec689f3529ee49910976478f22f19c1b77472 SHA256 b4a3a60d55bab5c40285a7c54c7eb00f40ffbb926139db506cd0a43409df321c +EBUILD batman-vis-0.3.2.ebuild 1014 RMD160 6a492bddfc81f134611fb484251d135fe0b6686e SHA1 1a526d0de1a9056e3f18cf9d5567380adf4a2c8d SHA256 83a0a37c68cb80c539d628454dff86e8f89c6ef1c4cd7ce631159aba421b767b +MISC ChangeLog 658 RMD160 73797d65fb15c6f42976a2d2dad88c4ff90e4515 SHA1 013486dea42899788f0a74f918f6fdae5f8d7ac1 SHA256 b273bbd010e9e5b068c6dc7101a98e96a4a4a30815bf23efc06e8eeb124aac4e MISC metadata.xml 244 RMD160 ba31bc851ce5d8e007b223b4f799d84d4c6699d0 SHA1 2192e855054fb7016488afba3eda6d938fdf925d SHA256 1022f65be1952b5197408dfbf61543b61557601ce3a9f15acabeb3e9d84a0fbe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk3W+1sACgkQknrdDGLu8JAgSgD+K21kAHc5xkTjn/HY052UvVC6 -FbmHkFCAKAfu6AS/BVIA/A8D8uaHQHduWRDGVjLs/o6kE7dqzd2ZDpSZiMwYoqTi -=NV3S +iF4EAREIAAYFAk3ZnQMACgkQknrdDGLu8JC4OgD+K6cj9H+9LnkTE8xDEamfUKgn +4lhTTjn4ZjrXa0zvJpMA/03xh4P8LhcCfg/cp2rlKNZykTJWdPCf36fTrB+mS/GW +=lH9o -----END PGP SIGNATURE----- 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 |