Fixes bug #388959.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 74 insertions, 6 deletions

diff --git a/app-misc/srm/ChangeLog b/app-misc/srm/ChangeLog
index 41e970154e8a..2cbaec8706dc 100644
--- a/app-misc/srm/ChangeLog
+++ b/app-misc/srm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/srm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.21 2011/11/02 14:56:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.22 2011/11/06 16:59:50 titanofold Exp $
+
+*srm-1.2.11-r2 (06 Nov 2011)
+
+  06 Nov 2011; Aaron W. Swenson <titanofold@gentoo.org> +srm-1.2.11-r2.ebuild,
+  +files/srm-1.2.11-cflags.patch:
+  Fixes bug #388959.
 
   02 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> srm-1.2.11-r1.ebuild:
   x86 stable wrt bug #388955
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 6847d2ce7bc4..c164c3334c93 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cflags.patch 473 RMD160 421ff9ca0e891776893545368dc40b8da519261b SHA1 c77e93dba6772a8f73eee93fb3829b7244c1f5d1 SHA256 49747e59754595932523a67dfa3fd4825da548783ffcff6cc366b039fff94d89
+AUX srm-1.2.11-cflags.patch 572 RMD160 633c0775104471f91b50ebcc68574ac3fd5bd6e1 SHA1 4f8aab848edd574ec9c51e306937c9a409092b51 SHA256 e2215079b437013171e9ab2d76dce9f648b3f27d964b39b678051a68f87f16df
 AUX srm-1.2.8-remove-mount.patch 298 RMD160 a94da1b7abff7cdc26bb53d3b37bcf0768febf36 SHA1 1851503a2919521bcf2998c387bc594f85f16acf SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b
 DIST srm-1.2.10.tar.bz2 94795 RMD160 2c1aa3da25ceece746ce6635214a311a9fc5d380 SHA1 0c373e473dfc3bb4c4440eb7cc57078a15f3c2a0 SHA256 f6d80401508ec96cfd398952a7ffd25e49fd4bda999942584d72600a0e0883c8
 DIST srm-1.2.11.tar.gz 124982 RMD160 243cc8f02174cf78856f1f4a66aa76e38490e1f5 SHA1 eb3a653484d5906fdb32b0f2e48bfd7eedefe419 SHA256 5105152d1d8e6166a5b1bef6b4ec945fd9dcc03289ff8916e98f44bfa8f25a8a
 DIST srm-1.2.8.tar.gz 88067 RMD160 d1ce5fe2ec13e45c5620e6a71c1f2dfcb49ab1bc SHA1 8b7aafc95b3ef67e2c737030567222bf50082188 SHA256 3be77158b62873659de9d458f87993537c93bbd32a86d5543290a0cf4ab24f61
 EBUILD srm-1.2.10.ebuild 829 RMD160 4bb2776ebb3781f1383812ec5ac29d24bd72f92e SHA1 ae900d16460c0db088eb037135ea1672b5009215 SHA256 3e5020d00c2579062ec3912fe0026290fc95bbea3e35c75460455d8bf1ed1f19
 EBUILD srm-1.2.11-r1.ebuild 904 RMD160 ee3118efe3c28f119082ed9d58b354a81e602b40 SHA1 c4760489f679781f094271815fbc9cab22c2d21d SHA256 7e2be1094e0880d105e34f55298d38c5c211145da18f520d3aeca291621e988b
+EBUILD srm-1.2.11-r2.ebuild 928 RMD160 db0ef5b1b01a852ff22ebf8f6fac67cd16d64f3c SHA1 b9cf6b9b6fbc8c7619f5420588cb60213aa9ae0e SHA256 da7459a24eeb51b87088d4f0f0a716b1469e7f5b00ce907356629622a0a21bf0
 EBUILD srm-1.2.11.ebuild 802 RMD160 29301c282359f3f9b254da1a70fa6a33cd511dae SHA1 a9f7668b311806b61f05f81ac4751b67eed0aa6a SHA256 8814cada3ef3fe9711ddbb7ad9dc8286fddf13ac6eec18fab771156c8bc45623
 EBUILD srm-1.2.8-r1.ebuild 912 RMD160 6a4ccd114643fc1be9dec93e1760b50bcdbcfd67 SHA1 4974b4b95ec01dd258cf8d38cf202cc3a5f13b0c SHA256 230653645287b1fb0adbd6f8285adb52a7e031bad104e32b29a7bb93c91a7718
-MISC ChangeLog 2924 RMD160 05fa3f6f9a08393afb918824bea0350467fc6926 SHA1 96577cd401f3458600ff4f42cb28fa217f8f86a0 SHA256 5a9302cd71b3e4cb6c72413341659ebdaa2febf01437e2e9f31b54fa88a628ef
+MISC ChangeLog 3089 RMD160 ac8109fc2778b4474ee77eaf23397eca27a70f74 SHA1 dc5fa791c7bd46c75510253cc180738824fff51f SHA256 f478382de56e48ed8beb1f174a9cb98b909433a98b0e61fa9d1badac197cf703
 MISC metadata.xml 413 RMD160 6ee620dc97cb641006011cc0c042739c845a42a9 SHA1 54e064c7f161e3df80877b49114e8c2a08a46925 SHA256 0081207754f51a341ff8e272b80e708d4051e707e9a5320e9c79aec3b9993b7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk6xWjgACgkQuUQtlDBCeQJQWQCeOUzwDNCeW+hQc4qvyQTx7edS
-pwMAn1E42E/X2JkTEtwDM7jLimDFq5CW
-=vE84
+iF4EAREIAAYFAk62vM8ACgkQVxOqA9G7/aAESQD/VRVG4OssIvG1RG6zUV0aoefc
+GdjgzP9DPhHF0dStn8EA/iU2yDcQaTDHdzX1GX8LUEeNHAOJo/8VRSMtraq2cphn
+=W/qr
 -----END PGP SIGNATURE-----
diff --git a/app-misc/srm/files/srm-1.2.11-cflags.patch b/app-misc/srm/files/srm-1.2.11-cflags.patch
new file mode 100644
index 000000000000..7f05c5d2aa9d
--- /dev/null
+++ b/app-misc/srm/files/srm-1.2.11-cflags.patch
@@ -0,0 +1,23 @@
+--- configure.in	2010-06-06 13:22:08.000000000 -0400
++++ configure.in	2011-11-06 11:36:37.684800151 -0500
+@@ -6,8 +6,6 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-dnl reset CFLAGS
+-CFLAGS=
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+@@ -39,10 +37,9 @@
+ AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
+                        [default=$debug_default]],, enable_debug=$debug_default)
+ if test "x$enable_debug" = "xyes"; then
+-  CFLAGS="$CFLAGS -g"
+   AC_MSG_RESULT(yes)
+ else
+-  CFLAGS="$CFLAGS -O2 -DNDEBUG"
++  CFLAGS="$CFLAGS -DNDEBUG"
+   AC_MSG_RESULT(no)
+ fi
+ 
diff --git a/app-misc/srm/srm-1.2.11-r2.ebuild b/app-misc/srm/srm-1.2.11-r2.ebuild
new file mode 100644
index 000000000000..9d2b1dfbda01
--- /dev/null
+++ b/app-misc/srm/srm-1.2.11-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.11-r2.ebuild,v 1.1 2011/11/06 16:59:50 titanofold Exp $
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking."
+HOMEPAGE="http://sourceforge.net/projects/srm/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="!app-misc/secure-delete
+		sys-kernel/linux-headers
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.11-cflags.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+pkg_postinst() {
+	ewarn "Please note that srm will not work as expected with any journaled file"
+	ewarn "system (e.g., reiserfs, ext3)."
+	ewarn "See: ${EROOT%/}/usr/share/doc/${PF}/README"
+}