Apply patch from Kacper Kowalik <xarthisius@gentoo.org> to respect CC,CXX,LDFLAGS. Bug #289922

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 103 insertions, 1 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 44652dbd0829..cdf4e2325226 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.25 2010/03/09 13:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.26 2010/08/06 21:26:15 hwoarang Exp $
+
+*vigra-1.6.0-r1 (06 Aug 2010)
+
+  06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> +vigra-1.6.0-r1.ebuild,
+  +files/vigra-1.6.0-ldflags.patch:
+  Apply patch from Kacper Kowalik <xarthisius@gentoo.org> to respect
+  CC,CXX,LDFLAGS. Bug #289922
 
   09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vigra-1.6.0.ebuild:
   Fix building with libpng14.
diff --git a/media-libs/vigra/files/vigra-1.6.0-ldflags.patch b/media-libs/vigra/files/vigra-1.6.0-ldflags.patch
new file mode 100644
index 000000000000..20d957d19b88
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.6.0-ldflags.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=289922
+
+--- config/Makefile.include.in
++++ config/Makefile.include.in
+@@ -40,9 +40,9 @@
+ LIBTOOL = @LIBTOOL@
+ LIBCC = $(LIBTOOL) --mode=compile $(CC)
+ LIBCXX = $(LIBTOOL) --tag=CXX --mode=compile $(CXX)
+-LINKC = $(LIBTOOL) --mode=link $(CC)
+-LINKCXX = $(LIBTOOL) --tag=CXX --mode=link $(CXX)
++LINKC = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
++LINKCXX = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS)
+ LINKCLIB = $(LINKC) -rpath $(libdir)
+ LINKCXXLIB = $(LINKCXX) -rpath $(libdir)
+ INSTALL = @INSTALL@
diff --git a/media-libs/vigra/vigra-1.6.0-r1.ebuild b/media-libs/vigra/vigra-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..1b7da44c0920
--- /dev/null
+++ b/media-libs/vigra/vigra-1.6.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.6.0-r1.ebuild,v 1.1 2010/08/06 21:26:15 hwoarang Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
+HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
+SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${P/-}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc fftw jpeg png tiff zlib test"
+
+RDEPEND="png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	jpeg? ( media-libs/jpeg )
+	fftw? ( >=sci-libs/fftw-3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/-}"
+
+MY_DOCDIR="usr/share/doc/${PF}"
+
+pkg_setup() {
+	tc-export CC CXX
+	local flag
+	export usefail=""
+	if use test
+	then
+		for flag in png tiff jpeg fftw
+		do
+			use $flag || usefail="$usefail $flag"
+		done
+
+		if [[ -n "$usefail" ]]
+		then
+			elog "USE=test enabled but the following use-flags are disabled:"
+			elog "${usefail# }"
+			elog "Tests will be skipped, please enable the other use-flags."
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc44.patch" \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
+		src/impex/png.cxx || die
+}
+
+src_configure() {
+	./configure \
+		--docdir="${D}/${MY_DOCDIR}" \
+		--prefix=/usr \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with fftw) \
+		|| die "configure failed"
+}
+
+src_test() {
+	if [[ -z "${usefail}" ]]
+	then
+		default
+	fi
+}
+
+src_install() {
+	emake libdir="${D}/usr/$(get_libdir)" prefix="${D}/usr" install || die "emake install failed"
+	use doc || rm -Rf "${D}/${MY_DOCDIR}"
+	dodoc README.txt
+}