[gentoo-commits] gentoo-x86 commit in net-analyzer/masscan: masscan-1.0.3-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in net-analyzer/masscan: masscan-1.0.3-r1.ebuild ChangeLog

[Jeroen Roovers (jer)]

jer         14/07/13 13:31:10

  Modified:             masscan-1.0.3-r1.ebuild ChangeLog
  Log:
  Respect CC even better. mv should die().
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  net-analyzer/masscan/masscan-1.0.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild?r1=1.1&r2=1.2

Index: masscan-1.0.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- masscan-1.0.3-r1.ebuild	2 Mar 2014 15:30:07 -0000	1.1
+++ masscan-1.0.3-r1.ebuild	13 Jul 2014 13:31:10 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild,v 1.1 2014/03/02 15:30:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild,v 1.2 2014/07/13 13:31:10 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -19,7 +19,8 @@
 src_prepare(){
 	sed -i \
 		-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-		-e "/^GITVER :=/s!= .(.*!=!g" \
+		-e '/^GITVER :=/s!= .(.*!=!g' \
+		-e '/^SYS/s|gcc|$(CC)|g' \
 		-e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
 		-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
 		Makefile || die
@@ -30,13 +31,13 @@
 }
 
 src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
+	emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
 
 	insinto /etc/masscan
 	doins data/exclude.conf
 	doins "${FILESDIR}"/masscan.conf
 
-	[ -f doc/bot.hml ] && mv doc/bot.{hml,html}
+	mv doc/bot.{hml,html} || die
 	dohtml doc/bot.html
 	doman doc/masscan.8
 	dodoc *.md



1.3                  net-analyzer/masscan/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/masscan/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/masscan/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	2 Mar 2014 15:30:07 -0000	1.2
+++ ChangeLog	13 Jul 2014 13:31:10 -0000	1.3
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/masscan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/ChangeLog,v 1.2 2014/03/02 15:30:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/ChangeLog,v 1.3 2014/07/13 13:31:10 jer Exp $
+
+  13 Jul 2014; Jeroen Roovers <jer@gentoo.org> masscan-1.0.3-r1.ebuild:
+  Respect CC even better. mv should die().
 
 *masscan-1.0.3-r1 (02 Mar 2014)