Fix build so it respects CXXFLAGS, thanks to Diego E. 'Flameeyes' Pettenò <flameeyes AT gentoo DOT org> for reporting; bug #240229

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 107 insertions, 3 deletions

diff --git a/dev-libs/tvmet/ChangeLog b/dev-libs/tvmet/ChangeLog
index abe0fe4aca1e..0da8eb2d4359 100644
--- a/dev-libs/tvmet/ChangeLog
+++ b/dev-libs/tvmet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/tvmet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/ChangeLog,v 1.2 2008/06/07 15:11:49 dev-zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/ChangeLog,v 1.3 2009/04/19 20:53:36 halcy0n Exp $
+
+*tvmet-1.7.2-r1 (19 Apr 2009)
+
+  19 Apr 2009; Mark Loeser <halcy0n@gentoo.org>
+  +files/tvmet-1.7.2-respect-cxxflags.patch, +tvmet-1.7.2-r1.ebuild:
+  Fix build so it respects CXXFLAGS, thanks to Diego E. 'Flameeyes' Pettenò
+  <flameeyes AT gentoo DOT org> for reporting; bug #240229
 
   07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
   files/1.7.2-docs_missing_destdir.patch, tvmet-1.7.2.ebuild:
diff --git a/dev-libs/tvmet/Manifest b/dev-libs/tvmet/Manifest
index da17770d7a6d..9e6b943c792f 100644
--- a/dev-libs/tvmet/Manifest
+++ b/dev-libs/tvmet/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.7.2-docs_missing_destdir.patch 1437 RMD160 ffeb20b9bf2c88c444de4c2916f3c7a11dfc436e SHA1 33e649c70657b14a6198965d46006273629a6491 SHA256 e5001eb1c60c61a55edc6f122e62bd8033a09f9580579293e168255d08cddfe1
+AUX tvmet-1.7.2-respect-cxxflags.patch 1112 RMD160 a240db4d1d35ca010ae991f252fa82390185a644 SHA1 32210d0e750e21540801804eaf9269dba0d9582a SHA256 311aa4f05ed2f4198dc607a184dd25297da9b765a4cbe802376b8a9588d0ba19
 DIST tvmet-1.7.2.tar.bz2 532599 RMD160 f777cfe42e221d3cb09172dfb4de67b360cb0acd SHA1 aea83958968cce70e9b9cd9ed34b83019be8f619 SHA256 ca4a1e72afb70ca34bbd7cb0500a159003f5c270903f1b303af48a883dbe13ae
+EBUILD tvmet-1.7.2-r1.ebuild 1075 RMD160 7fc7a5290ba7feabb66dff0cba24de56e2f50a6d SHA1 9254174778eb548851c9432af10c656e9fb221f6 SHA256 a1cf1363fe09d7fcc6304383e29b7b2735470f6eabcfd9613cd3eeeb42460423
 EBUILD tvmet-1.7.2.ebuild 1023 RMD160 8225d14df05469c6399e7474909d9b776ad6efdc SHA1 d3a931be9d21fc03207940767373504ca4549fe4 SHA256 4774072d261062dae4dea75493372c0f06b23c198067e94a2dc4471e92bf0a00
-MISC ChangeLog 715 RMD160 41bf69a3b080095ab2e441fd674dbf323c68130e SHA1 869fa895155b2946df6e010699039714c609ff82 SHA256 ed518c5ac3ece74f5e03801af04d396ac18893857a3302c579d4942160aba788
+MISC ChangeLog 999 RMD160 5340eb57564c999ca8918bce5d243a55e181f89a SHA1 a5556d77b9de12b3c7c2dba3f84fe19fef22fc6b SHA256 c10a46699215b41d5e81dbf42f7bd2ad8449d47b19348f25e3dc1414628c0fcd
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknrj1UACgkQCRZPokWLroTpYACgyVnmVFKaSe31aCi7TZ2E/v/E
+IBwAniyoz5i30oshKKpfmOZFNLQ9YA7t
+=mpzk
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
new file mode 100644
index 000000000000..2749c9131349
--- /dev/null
+++ b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
@@ -0,0 +1,42 @@
+diff -ur tvmet-1.7.2-orig/configure tvmet-1.7.2/configure
+--- tvmet-1.7.2-orig/configure	2009-04-19 16:27:20.000000000 -0400
++++ tvmet-1.7.2/configure	2009-04-19 16:48:52.000000000 -0400
+@@ -2659,11 +2659,9 @@
+      ;;
+      *:*)                   # Simple initialization syntax
+        CXX=`echo "$cxxwith" | sed  -n -e 's/.*:\(.*\)/\1/p'`
+-       CXXFLAGS=""
+      ;;
+      *)                     # Default values
+        CXX="g++"
+-       CXXFLAGS=""
+      ;;
+    esac
+        CXX_OPTIMIZE_FLAGS="-DTVMET_OPTIMIZE -O2 -finline-limit=5000 -ftemplate-depth-200 -fomit-frame-pointer"
+@@ -3704,7 +3702,6 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	CXXFLAGS=""
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3799,15 +3796,9 @@
+   CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+   if test "$GXX" = yes; then
+-    CXXFLAGS="-g -O2"
++    CXXFLAGS+="$CXXFLAGS -g -O2"
+   else
+-    CXXFLAGS="-g"
+-  fi
+-else
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-O2"
+-  else
+-    CXXFLAGS=
++    CXXFLAGS+="$CXXFLAGS -g"
+   fi
+ fi
+ ac_ext=cpp
+
diff --git a/dev-libs/tvmet/tvmet-1.7.2-r1.ebuild b/dev-libs/tvmet/tvmet-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..564270427feb
--- /dev/null
+++ b/dev-libs/tvmet/tvmet-1.7.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvmet/tvmet-1.7.2-r1.ebuild,v 1.1 2009/04/19 20:53:36 halcy0n Exp $
+
+inherit eutils
+
+DESCRIPTION="Tiny Vector Matrix library using Expression Templates"
+HOMEPAGE="http://tvmet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+DEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-respect-cxxflags.patch"
+	epatch "${FILESDIR}/${PV}-docs_missing_destdir.patch"
+
+	sed -i \
+		-e 's|^GENERATE_LATEX.*|GENERATE_LATEX = NO|' \
+		doc/Doxyfile.in || die "sed failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc docs) \
+		$(use_enable test cppunit) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}