Version bump for bug #341841 and remove old. Update HOMEPAGE and SRC_URI, use EAPI 3, add patch to fix parallel make errors (bug #295751), move variable settings to default places, and don't install useless doc files.

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

4 files changed, 59 insertions, 27 deletions

diff --git a/net-mail/safecat/ChangeLog b/net-mail/safecat/ChangeLog
index 029d93051b21..ca7e802d2d51 100644
--- a/net-mail/safecat/ChangeLog
+++ b/net-mail/safecat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/safecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/ChangeLog,v 1.17 2010/06/07 12:49:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/ChangeLog,v 1.18 2010/11/07 22:49:13 radhermit Exp $
+
+*safecat-1.13 (07 Nov 2010)
+
+  07 Nov 2010; Tim Harder <radhermit@gentoo.org> -safecat-1.12.ebuild,
+  +safecat-1.13.ebuild, +files/safecat-1.13-makefile.patch:
+  Version bump for bug #341841 and remove old. Update HOMEPAGE and SRC_URI,
+  use EAPI 3, add patch to fix parallel make errors (bug #295751), move
+  variable settings to default places, and don't install useless doc files.
 
   07 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> safecat-1.12.ebuild:
   Package fails to build with parallel make (bug #295751).
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
index ec1fa7458245..c67eb66440cd 100644
--- a/net-mail/safecat/Manifest
+++ b/net-mail/safecat/Manifest
@@ -2,16 +2,21 @@
 Hash: SHA1
 
 AUX safecat-1.11-gentoo.patch 355 RMD160 9a2a71c499dad33ac66c21a22558f469208a5800 SHA1 e43af75f7158f9bfaaa5fd03baea61299742b22a SHA256 33c339b55377d09e50e038bf6a397c36f25a8baec5063e6fbbdddc308c7a05e3
+AUX safecat-1.13-makefile.patch 562 RMD160 35f640ce7e1ce872104904a7d74a004821ba1487 SHA1 028ad1aa94f380f0678b18a9e9d624fb080f5c16 SHA256 21d8c1f020114603a71e30ac82877ac4adff14341e4c3ca1d22285c19a09f2d6
 DIST safecat-1.11.tar.gz 33011 RMD160 24a88ea02937269c397adfe895353effe394b737 SHA1 feae513ccd8dcd7968a35590d08f6a5670adb784 SHA256 cd224b17ab16f0caf9b4352c73fd496aa96abda2e70fdb7aa9e7c5b3a8b5ca68
-DIST safecat-1.12.tar.gz 33556 RMD160 6995dcd62bee012276613faedb0f59925db2f656 SHA1 7471963adc731003eca22b39f616e02c4100cfca SHA256 acf645594237435abe09df913deb42a55fc55af855169a2337e435cd648f15d4
+DIST safecat-1.13.tar.gz 33953 RMD160 614df1d43d13a638ab30a2921b66d78f3fafc4c6 SHA1 07b42cb06490abeacefce9429a1dbf96caa1629b SHA256 2e43dd88e703edb2e48cb3b1da6f8c4a8f9802bcc51ba36a58110e8a1c096e9b
 EBUILD safecat-1.11.ebuild 1212 RMD160 71d80502c25f9613d99869778a49151b5f447413 SHA1 90f1afeca1acca3665f707a950def7dca4310c18 SHA256 11b1c482b7d00aa7cebdca2383afc5625b70fd732cdc6f04b985a00810be52ab
-EBUILD safecat-1.12.ebuild 1342 RMD160 c8d41e1c9357949f0a6f446299dfad9532e60b47 SHA1 95514880a049b7b0fea2fd6cfbc1eec8362c7e33 SHA256 ed52f80f0a91e7baf25acba66957c37c92264d64f8a7048140415e2557c352f7
-MISC ChangeLog 2005 RMD160 45f44f8e04b75a0be5b73e730bd997d3a74b3a92 SHA1 60abcced03e1e2c5b184faf866926d77a773f416 SHA256 af8d8a5544e235086c53a9f95eca7cfbc7a7499830a6e8a53beca7678913dc3b
+EBUILD safecat-1.13.ebuild 1324 RMD160 f50460bdfdf80bc6f9c44cce92e2e644d13e844c SHA1 ed2fddc4fcc3f0bf1ac0b47ef0fafd2ba6c07898 SHA256 78da41a5a16a929e8200aeddd51dd97d5a3d989bd2c9f1f5c72e40199bd05bdf
+MISC ChangeLog 2390 RMD160 c3f34338806b66bc3cffa00b15a0006864448e36 SHA1 e1f81897ad40bf2efe6e2036844fbaf879c8aecc SHA256 8492668130c5ea497eaca25fc00d68198e340e9e73289f0feb49f19b07dfd336
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwM6yEACgkQAiZjviIA2Xi3kACgoeOh0WbEjrpqJH20HLNbCQwy
-J7YAoO738WLESxAfcoZD/NI/CPadCxd5
-=vyNN
+iQEcBAEBAgAGBQJM1yzzAAoJEEqz6FtPBkyjzXAH/26fD3IAfyd45VL7pY1sC5OP
+eDzV3PIz7S1gpcuXR4Jhxel/p+z0IxhGggEU6wZdEmEsOn6gYzvPvDPgF/AhocmK
+6Rs5zMsUawrtt0pzUrHahR7peWw9g9OxhKwfE5lmd4F1BFpUg8I3936q+Sf3iYf7
+o0svIydCf7NdoDzpPksRRMQKTzniAezq/2FcXQ48u7UQoIkc6tiBiU+EtTjfTDrL
+ecOgAD81AVVdvFBqonq2S0dm6JdWha8TbM/xAAaZT9f0MH3iqZAJLwA3jQCZ8VS7
+48ilHb2+QQGHuQJisuHpppK/SIfvo/fupJMJh8GdT762S/Yxau+zEjSJY6zHSQE=
+=T37F
 -----END PGP SIGNATURE-----
diff --git a/net-mail/safecat/files/safecat-1.13-makefile.patch b/net-mail/safecat/files/safecat-1.13-makefile.patch
new file mode 100644
index 000000000000..50a9d44a5988
--- /dev/null
+++ b/net-mail/safecat/files/safecat-1.13-makefile.patch
@@ -0,0 +1,20 @@
+--- safecat-1.13/Makefile.orig	2010-11-07 14:06:40.071879291 -0800
++++ safecat-1.13/Makefile	2010-11-07 14:08:38.438849840 -0800
+@@ -114,7 +114,7 @@
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
++install load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
+ 	./load instcheck hier.o auto_home.o strerr.a substdio.a \
+ 	error.a str.a
+ 
+@@ -387,7 +387,7 @@
+ 	./compile taia_tai.c
+ 
+ tempfile.o: \
+-compile tempfile.c
++compile tempfile.c uint64.h
+ 	./compile tempfile.c
+ 
+ uint32.h: \
diff --git a/net-mail/safecat/safecat-1.12.ebuild b/net-mail/safecat/safecat-1.13.ebuild
index 1f51e3737d2d..3deff137667c 100644
--- a/net-mail/safecat/safecat-1.12.ebuild
+++ b/net-mail/safecat/safecat-1.13.ebuild
@@ -1,34 +1,36 @@
 # Copyright 1999-2010 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.4 2010/06/07 12:49:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/safecat/safecat-1.13.ebuild,v 1.1 2010/11/07 22:49:13 radhermit Exp $
 
-inherit fixheadtails eutils toolchain-funcs flag-o-matic
+EAPI="3"
 
-IUSE=""
+inherit fixheadtails eutils toolchain-funcs flag-o-matic
 
-DESCRIPTION="Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory."
-HOMEPAGE="http://jeenyus.net/~budney/linux/software/safecat.html"
-SRC_URI="http://jeenyus.net/~budney/linux/software/${PN}/${P}.tar.gz"
+DESCRIPTION="Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory"
+HOMEPAGE="http://www.jeenyus.net/linux/software/safecat.html"
+SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz"
 
-DEPEND="sys-apps/groff"
-RDEPEND=""
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
+DEPEND="sys-apps/groff"
+RDEPEND=""
 
+src_prepare() {
 	# applying maildir-patch
-	epatch ${FILESDIR}/safecat-1.11-gentoo.patch
+	epatch "${FILESDIR}"/safecat-1.11-gentoo.patch
+
+	# Fix parallel make errors
+	epatch "${FILESDIR}"/${P}-makefile.patch
 
 	ht_fix_file Makefile make-compile.sh
 
 	sed -ni '/man\|doc/!p' hier.c
 }
 
-src_compile() {
+src_configure() {
 	# 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
@@ -37,15 +39,12 @@ src_compile() {
 	echo "/usr" > conf-root
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-
-	# bug #295751
-	emake -j1 it man || die
 }
 
 src_install() {
 	dodir /usr
 	echo "${D}/usr" > conf-root
-	emake -j1 man setup check || die
-	dodoc CHANGES COPYING INSTALL README
+	emake setup check || die
+	dodoc CHANGES README
 	doman maildir.1 safecat.1
 }