Move compilation settings to src_compile where they belong. Refrain from

building with gcc-4.0 -Os which causes safecat to segfault on x86
Package-Manager: portage-2.1_pre4-r1

3 files changed, 48 insertions, 16 deletions

diff --git a/net-mail/safecat/ChangeLog b/net-mail/safecat/ChangeLog
index 32265edf4433..8b144b1dc651 100644
--- a/net-mail/safecat/ChangeLog
+++ b/net-mail/safecat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/safecat
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/ChangeLog,v 1.13 2005/12/12 08:22:21 robbat2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/ChangeLog,v 1.14 2006/02/22 17:39:48 agriffis Exp $
+
+  22 Feb 2006; Aron Griffis <agriffis@gentoo.org> safecat-1.12.ebuild:
+  Move compilation settings to src_compile where they belong. Refrain from
+  building with gcc-4.0 -Os which causes safecat to segfault on x86
 
 *safecat-1.12 (12 Dec 2005)
 
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
index 604e43dc4f3c..a7474c91a61d 100644
--- a/net-mail/safecat/Manifest
+++ b/net-mail/safecat/Manifest
@@ -1,7 +1,31 @@
-MD5 693b029492524defb55e721fa7685793 ChangeLog 1442
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d17156a5ef098c5c7d983c5e80c3a155 ChangeLog 1658
+RMD160 1693a3febbde25837dff6e090f43154dbe06dcef ChangeLog 1658
+SHA256 54f5e5f069ea6e090f8b1f56935c2b558a1de71145ada6d3b0eb6c1dcc74db15 ChangeLog 1658
 MD5 b8802a01bb6d1194118da7bb8f98d3f4 files/digest-safecat-1.11 63
+RMD160 f554f395eb4c861013d0aeb461899b7ffd3f5e6e files/digest-safecat-1.11 63
+SHA256 7699e03ce5a4e6be8fdf0335ee252aecd8b488680ba7a41b21533142ad0c184d files/digest-safecat-1.11 63
 MD5 19ca5054c163640ab7b96b6501ec1bb1 files/digest-safecat-1.12 63
+RMD160 906533e2f85da118de4ee7ff4ca0380a060be5fd files/digest-safecat-1.12 63
+SHA256 ed3a86f74225a292923add5ca2d1cbc6b2da7ac3f397488a5956d7bcd3286fa7 files/digest-safecat-1.12 63
 MD5 f1a0de11ad74ec86a89591c3d4de8d85 files/safecat-1.11-gentoo.patch 355
+RMD160 9a2a71c499dad33ac66c21a22558f469208a5800 files/safecat-1.11-gentoo.patch 355
+SHA256 33c339b55377d09e50e038bf6a397c36f25a8baec5063e6fbbdddc308c7a05e3 files/safecat-1.11-gentoo.patch 355
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
+RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
+SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 metadata.xml 280
 MD5 2fcfb81fd1df26ac95b6e558f9364161 safecat-1.11.ebuild 1237
-MD5 b6a3e73e90188c0c6c79d775c25f1d39 safecat-1.12.ebuild 1236
+RMD160 15e844c10d82a0bb1ba0601a2a20843d9df97ccd safecat-1.11.ebuild 1237
+SHA256 5da1b5f3905b375edb039338b2d3dc6aa955490af3dbc98aea6d281d8013e363 safecat-1.11.ebuild 1237
+MD5 6f831f36e0780a9a54b45d8eab5c7893 safecat-1.12.ebuild 1343
+RMD160 4b723cc153530c9f88eabdc53a1d42e5177592cc safecat-1.12.ebuild 1343
+SHA256 0c74f5ed6e2b0475a041e75ff598606f54445892c7624fe053d6cc0f95a4070a safecat-1.12.ebuild 1343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD/KHxJrHF4yAQTrARAjEyAKCZQ83McT4n24+CGjeLjguRcSXCzgCeMttn
+l7cgk6O0iLpOpNtR5GELsSI=
+=L6Mt
+-----END PGP SIGNATURE-----
diff --git a/net-mail/safecat/safecat-1.12.ebuild b/net-mail/safecat/safecat-1.12.ebuild
index 781f040bdf20..ac49f8499683 100644
--- a/net-mail/safecat/safecat-1.12.ebuild
+++ b/net-mail/safecat/safecat-1.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/safecat-1.12.ebuild,v 1.1 2005/12/12 08:22:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/safecat-1.12.ebuild,v 1.2 2006/02/22 17:39:48 agriffis Exp $
 
-inherit fixheadtails eutils toolchain-funcs
+inherit fixheadtails eutils toolchain-funcs flag-o-matic
 
 IUSE=""
 
@@ -19,22 +19,26 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-
-	# applying errno-patch and maildir-patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/safecat-1.11-gentoo.patch
-
 	cd ${S}
-	echo "/usr" > conf-root
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+
+	# applying maildir-patch
+	epatch ${FILESDIR}/safecat-1.11-gentoo.patch
 
 	ht_fix_file Makefile make-compile.sh
 
-	egrep -v 'man|doc' hier.c > hier.c.new
-	mv hier.c.new hier.c
+	sed -ni '/man\|doc/!p' hier.c
 }
 
 src_compile() {
+	# safecat segfaults on gcc-4.0 x86 with -Os, seems to be okay with -O2
+	if [[ $(gcc-major-version).$(gcc-minor-version) == 4.0 ]]; then
+		replace-flags -Os -O2
+	fi
+
+	echo "/usr" > conf-root
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+
 	make it man || die
 }