sci-mathematics/spass: Respect CFLAGS, #430676; add missing USE=examples

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 36 insertions, 34 deletions

diff --git a/sci-mathematics/spass/ChangeLog b/sci-mathematics/spass/ChangeLog
index 25ab86f80a91..298e8b0b4fa6 100644
--- a/sci-mathematics/spass/ChangeLog
+++ b/sci-mathematics/spass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/spass
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spass/ChangeLog,v 1.2 2012/08/10 00:31:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spass/ChangeLog,v 1.3 2012/08/10 05:56:51 jlec Exp $
+
+  10 Aug 2012; Justin Lecher <jlec@gentoo.org> spass-3.7.ebuild, metadata.xml:
+  Respect CFLAGS, #430676; add missing USE=examples
 
   10 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Fix metadata.
diff --git a/sci-mathematics/spass/Manifest b/sci-mathematics/spass/Manifest
index bb04160d8fa9..4239dbbcc06a 100644
--- a/sci-mathematics/spass/Manifest
+++ b/sci-mathematics/spass/Manifest
@@ -2,17 +2,14 @@
 Hash: SHA256
 
 DIST spass37.tgz 1340925 SHA256 13c67e5e09b814ba50f38a391fe653661ba714e7541ffd4951efef91274aaacc SHA512 5b4efd7b767dfee3f24e7917a6ec58ac240ab33bf601722eabd50af57637d8fdd62de9e34e7cd1cd98b8b7e371c9e2d47c8fa3e07c6e7ce2fa616a76646a4e12 WHIRLPOOL 2fa8881b08a0fcdb9f1a6e7d27849f5c900a32f2cb27d878fbdae4986d0854608fd137e4608349c4eb612f4e1981142e63af8462ab904f7d08c3e2758f319835
-EBUILD spass-3.7.ebuild 2065 SHA256 71d76b4c3aa90bea327cec680dce05429ac0ea869019c7e7050552f4b79e7714 SHA512 0212d2ee894efebde7c103231d00a30caa5074a13ad0164b0026f670f32c597b44bef2a481a394dbc171d335962c7aa8f2513917da6351099d3d52c585303f90 WHIRLPOOL 68296753b85268c48a815e4452f45594e216b08c429b1cfed67663c47c4d4cf2f48a0f8ae2fdfc60b853ca70cc00cf334884cfffa72391a62d82bd559e106462
-MISC ChangeLog 505 SHA256 e4c6b0aa6cd6a5954cffc2936a3158c83c566e79215775df1a89de40ce4dc0db SHA512 ae112a542f8a6c2475062df90547bf1fc36c3700a8fe1c486eb8f73041cd12edd822fdd8361b9e7b67f2ec6c34b34e44a71162235c8541ffa52fb7203c9c61a9 WHIRLPOOL 8abdb18123db57955289dc71677551db17d0e06d272b096190d1c001c6a0fb4579bd369fac4953670a4bd7c81a41897dbc51bb8df424627d6a1a32b37414079a
-MISC metadata.xml 456 SHA256 76d5ccc97fb677711edf468e9e64ca4bb72b390d2836a8ca9a333fdd4eac11e9 SHA512 1cc007d584fed10e7c9f2cff6111cc0ca1dec52d7ed494322c94e0929795cb8cc08063d06fb7e3246aaf464d55e47a96445fe7c3cc940199c548238869815d99 WHIRLPOOL 34dc32b221f57a07cec9e3cdd2c6edeb1bc1e840386c9a7466e9b1c428a8a00150563a97e1b731b715240381e7d65f1b4778f2def8cf168351382a07fdc0210c
+EBUILD spass-3.7.ebuild 2045 SHA256 3a79520c788d426d9a94aa04e606156027276f2e4cc8ea663bd3053680e987b9 SHA512 564117678fedd5f4de949ed7f3bad07e7322f700bddfe73c7601dd5489b72bc72bbe87ade61b92db88061ccc437c09ffe83f273f3d82bcfab161079ed9208aa1 WHIRLPOOL c395c707015ddeba3bbbe993b61b069cf5527c759efc0fdf07fe7901e71690c298f4b1b796cd813e89187072f10332ca891e91a8004d2e36e0b553318427b297
+MISC ChangeLog 632 SHA256 98a09b990d3e500b5bf257ba886ff0b66645f6f7d112f99b821fd917f9d0e992 SHA512 2c3b6bd89c721842bbe5ad9af0e2642087ced046eda9100a751fb06f4144948fac336bfb0ff070a52abd1a5d35f76d0083bb50e147448ef56a272132ebb7248f WHIRLPOOL 57e22900998ec7d5069987159e7097c237c228ae1f913e24c463d51e89a3d85608a7a1102ab5cbde5971e6a78567230405ead3637557a35c51fc739698c6a834
+MISC metadata.xml 462 SHA256 83974545e937fe1d3565dc23124ea3e328595d04f8e943ef95c60923b19e7044 SHA512 ed14a8564414fa2ff7669afe3c11f3741706c6f6fd09f1f3d80878227c2cab62e745b1fde2ed22bf3f61cc1bd9490de37c67921a290d61e0072563e42165412e WHIRLPOOL 4d619ef2739bc778de024de9c56937fafd8d7eb590c8a0be8ff473f3a6589f4268bb60455bed132e21710873820420a045be69e5e75875a763dfd4d357856d8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBCAAGBQJQJFaRAAoJEBzRPIrUMBNC/k0IAI6sNG7qs/TwVlkU5qlSJj/K
-RDvihYweDzbre1KlJDoPQKaodYGtCdp3RW1E775PprnksebOVko0OzakgXJhJtEX
-HoH50x3ilY6rta85FfH6kDQ6ID2BB+CVpGiKPwjUOCoeP3agKu60Zb0tQr3ppQ6C
-qDJ8A7unZPGU2X6aitQnYg2snAdUXAfwng4mM3gQg/a7AcPH01GWqBjWiODDrkmN
-QQMQVPiaNcCa0KLzcNG7S6hiOooUdtXBzxTCX7W3arSMlZcb7tw+6GL7XcIOxnYG
-3e0Y7qDho4Q1DisKW8vaeh1dNZY2MeKFVW9KcrSK3updElkJwn8my3shzmL4MAg=
-=gsd+
+iEYEAREIAAYFAlAkoqgACgkQgAnW8HDreRboDgCeJncCheSGdMwQZwRZwKnCswAS
+py8Anj9Wz9MoFqucKrTDRP4yV4B2uwla
+=X4lz
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/spass/metadata.xml b/sci-mathematics/spass/metadata.xml
index 55174776cec2..c836a3b70c4d 100644
--- a/sci-mathematics/spass/metadata.xml
+++ b/sci-mathematics/spass/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>gienah@gentoo.org</email>
-</maintainer>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+	<maintainer>
+		<email>gienah@gentoo.org</email>
+	</maintainer>
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
 SPASS: An Automated Theorem Prover for First-Order Logic with Equality.
 </longdescription>
-<use>
-  <flag name='isabelle'>Add integration support for the Isabelle/HOL
+	<use>
+		<flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/spass/spass-3.7.ebuild b/sci-mathematics/spass/spass-3.7.ebuild
index b2c167570ec6..8fa6746b9f9b 100644
--- a/sci-mathematics/spass/spass-3.7.ebuild
+++ b/sci-mathematics/spass/spass-3.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spass/spass-3.7.ebuild,v 1.1 2012/05/30 00:53:38 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spass/spass-3.7.ebuild,v 1.2 2012/08/10 05:56:51 jlec Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit versionator
 
@@ -15,32 +15,34 @@ SRC_URI="http://www.spass-prover.org/download/sources/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc isabelle"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples isabelle"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-		isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1
-		)"
+		isabelle? ( >=sci-mathematics/isabelle-2011.1-r1 )"
 
 S="${WORKDIR}/SPASS-${PV}"
 
+src_prepare() {
+	#epatch "${FILESDIR}"/${P}-fla
+	sed \
+		-e "s:-O3:${CFLAGS}:g" \
+		-i configure || die
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if use examples; then
-		dodir /usr/share/${PN}/examples
-		insinto /usr/share/${PN}/examples
+		insinto /usr/share/${PN}/
 		doins -r examples
 	fi
 
 	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		if [[ -z "${ISABELLE_HOME}" ]]; then
-			die "ISABELLE_HOME empty"
-		fi
+		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)"
+		[[ -z "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
+
 		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
 		cat <<- EOF >> "${S}/settings"
 			SPASS_HOME="${ROOT}usr/bin"