[gentoo-commits] gentoo-x86 commit in sys-process/lsof: ChangeLog lsof-4.82.ebuild

[Mike Frysinger (vapier)]

vapier      09/05/11 18:08:24

  Modified:             ChangeLog lsof-4.82.ebuild
  Log:
  Improve how we past build flags/settings to avoid custom patches.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.63                 sys-process/lsof/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/ChangeLog?r1=1.62&r2=1.63

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog	11 May 2009 06:09:07 -0000	1.62
+++ ChangeLog	11 May 2009 18:08:24 -0000	1.63
@@ -1,6 +1,9 @@
 # ChangeLog for sys-process/lsof
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.62 2009/05/11 06:09:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.63 2009/05/11 18:08:24 vapier Exp $
+
+  11 May 2009; Mike Frysinger <vapier@g.o> lsof-4.82.ebuild:
+  Improve how we past build flags/settings to avoid custom patches.
 
 *lsof-4.82 (11 May 2009)
 



1.2                  sys-process/lsof/lsof-4.82.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild?r1=1.1&r2=1.2

Index: lsof-4.82.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lsof-4.82.ebuild	11 May 2009 06:09:07 -0000	1.1
+++ lsof-4.82.ebuild	11 May 2009 18:08:24 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.1 2009/05/11 06:09:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.2 2009/05/11 18:08:24 vapier Exp $
 
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_P=${P/-/_}
 DESCRIPTION="Lists open files for running Unix processes"
@@ -26,24 +26,26 @@
 	unpack ./${MY_P}_src.tar
 	cd "${S}"
 
-	# now patch the scripts to automate everything
-	ht_fix_file Configure Customize
-	touch .neverInv
-	epatch "${FILESDIR}"/${PN}-4.78-answer-config.patch
 	sed -i \
+		-e '/LSOF_CFGF="-/s:=":="$LSOF_CFGF :' \
+		-e '/^LSOF_CFGF=/s:$:" ${CFLAGS} ${CPPFLAGS}":' \
+		-e "/^LSOF_CFGL=/s:\$:' \$(LDFLAGS)':" \
 		-e "/^LSOF_RANLIB/s:ranlib:$(tc-getRANLIB):" \
 		Configure
 }
 
+yesno() { use $1 && echo y || echo n ; }
+target() { use kernel_FreeBSD && echo freebsd || echo linux ; }
+
 src_compile() {
 	use static && append-ldflags -static
-	use selinux && export LINUX_HASSELINUX=Y
-	export LSOF_CC=$(tc-getCC)
-	export LSOF_AR="$(tc-getAR) rc"
-
-	local target="linux"
-	use kernel_FreeBSD && target=freebsd
-	./Configure ${target} || die "configure failed"
+
+	touch .neverInv
+	LINUX_HASSELINUX=$(yesno selinux) \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(tc-getAR) rc" \
+	./Configure -n $(target) || die
+
 	emake DEBUG="" all || die "emake failed"
 }