Version bump, respect compiler, CFLAGS and LDFLAGS, wrt bug #377757. Drop old version

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

2 files changed, 30 insertions, 8 deletions

diff --git a/sys-fs/iprutils/ChangeLog b/sys-fs/iprutils/ChangeLog
index b80cde9f947a..f34250efa1e8 100644
--- a/sys-fs/iprutils/ChangeLog
+++ b/sys-fs/iprutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/iprutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.40 2014/11/04 09:31:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.41 2014/12/25 13:02:26 pinkbyte Exp $
+
+*iprutils-2.3.18 (25 Dec 2014)
+
+  25 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> -iprutils-2.3.0.ebuild,
+  +iprutils-2.3.18.ebuild:
+  Version bump, respect compiler, CFLAGS and LDFLAGS, wrt bug #377757. Drop old
+  version
 
   04 Nov 2014; Mikle Kolyada <zlogene@gentoo.org> iprutils-2.3.0.ebuild,
   iprutils-2.3.13.ebuild, iprutils-2.3.9.ebuild:
diff --git a/sys-fs/iprutils/iprutils-2.3.0.ebuild b/sys-fs/iprutils/iprutils-2.3.18.ebuild
index d502e252fe60..21405effa662 100644
--- a/sys-fs/iprutils/iprutils-2.3.0.ebuild
+++ b/sys-fs/iprutils/iprutils-2.3.18.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.0.ebuild,v 1.4 2014/11/04 09:31:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.3.18.ebuild,v 1.1 2014/12/25 13:02:26 pinkbyte Exp $
 
-inherit eutils
+EAPI=5
+
+inherit eutils toolchain-funcs
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
 SRC_URI="mirror://sourceforge/iprdd/${P}-src.tgz"
 HOMEPAGE="http://sourceforge.net/projects/iprdd/"
@@ -12,7 +13,6 @@ HOMEPAGE="http://sourceforge.net/projects/iprdd/"
 SLOT="0"
 LICENSE="IBM"
 KEYWORDS="~ppc ~ppc64"
-IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.4-r5
 	>=sys-apps/pciutils-2.1.11-r1
@@ -22,9 +22,25 @@ DEPEND=">=sys-libs/ncurses-5.4-r5
 RDEPEND="${DEPEND}
 	virtual/logger"
 
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Respect CFLAGS and LDFLAGS, bug #377757
+	sed -i \
+		-e '/^CFLAGS/s/= -g/+=/' \
+		-e 's/$(CFLAGS)/\0 $(LDFLAGS)/g' \
+		Makefile || die
+
+	epatch_user
+}
+
+src_compile() {
+	# Respect CC, bug #377757
+	emake CC="$(tc-getCC)"
+}
+
 src_install () {
-	make INSTALL_MOD_PATH="${D}" install || die
-	dodoc ChangeLog
+	emake INSTALL_MOD_PATH="${D}" install
 
 	newinitd "${FILESDIR}"/iprinit iprinit
 	newinitd "${FILESDIR}"/iprupdate iprupdate
@@ -37,5 +53,4 @@ pkg_postinst() {
 	einfo "rc-update add iprinit default"
 	einfo "rc-update add iprdump default"
 	einfo "rc-update add iprupdate default"
-	ebeep 5
 }