Fix building with -Werror by default, bug #469026. Fix not respecting LDFLAGS QA warning, bug #469028

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

3 files changed, 83 insertions, 1 deletions

diff --git a/net-libs/libiscsi/ChangeLog b/net-libs/libiscsi/ChangeLog
index 90a17c6b8180..70258bd12abb 100644
--- a/net-libs/libiscsi/ChangeLog
+++ b/net-libs/libiscsi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libiscsi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libiscsi/ChangeLog,v 1.6 2013/06/04 12:33:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libiscsi/ChangeLog,v 1.7 2013/06/05 19:50:10 cardoe Exp $
+
+*libiscsi-1.9.0-r1 (05 Jun 2013)
+
+  05 Jun 2013; Doug Goldstein <cardoe@gentoo.org> +files/libiscsi-1.9.0-0001-All
+  ow-users-to-disable-Werror-at-configure-time.patch, +libiscsi-1.9.0-r1.ebuild:
+  Fix building with -Werror by default, bug #469026. Fix not respecting LDFLAGS
+  QA warning, bug #469028
 
   04 Jun 2013; Agostino Sarubbo <ago@gentoo.org> libiscsi-1.9.0.ebuild:
   Stable for x86, wrt bug #466092
diff --git a/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch b/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
new file mode 100644
index 000000000000..31868ceab099
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
@@ -0,0 +1,35 @@
+From 2d43a056a9e7b57bc03d580a850a8dca534e61d5 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <doug.goldstein@pikewerks.com>
+Date: Wed, 5 Jun 2013 14:28:48 -0500
+Subject: [PATCH] Allow users to disable -Werror at configure time
+
+Some users and distro packagers might not want to build with -Werror,
+this allows them to disable using -Werror but enables it in the default
+case so as to maintain the current behavior.
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9d06e3a..6dce230 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,8 +11,14 @@ AC_CANONICAL_HOST
+ AM_CONDITIONAL(LD_ISCSI,
+                [expr "$host_os" : linux > /dev/null 2>&1])
+ 
++AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror],
++              [Disables building with -Werror by default])])
++
+ if test "$ac_cv_prog_gcc" = yes; then
+-   WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror -Wno-strict-aliasing"
++   WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Wno-strict-aliasing"
++   if test "x$enable_werror" != "xno"; then
++       WARN_CFLAGS="$WARN_CFLAGS -Werror"
++   fi
+ fi
+ AC_SUBST(WARN_CFLAGS)
+ 
+-- 
+1.8.2.1
+
diff --git a/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..aa1e5960ca39
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild,v 1.1 2013/06/05 19:50:10 cardoe Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit eutils autotools-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/ld_iscsi.so"
+
+myeconfargs=( "--disable-werror" )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-00*.patch
+
+	epatch_user
+
+	autotools-utils_src_prepare
+}