4 files changed, 96 insertions, 13 deletions
diff --git a/app-misc/secure-delete/ChangeLog b/app-misc/secure-delete/ChangeLog
index b3032839d1e0..c4c34f00e4e5 100644
--- a/app-misc/secure-delete/ChangeLog
+++ b/app-misc/secure-delete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/secure-delete
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.26 2008/12/30 20:20:14 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/ChangeLog,v 1.27 2010/08/10 19:09:54 hwoarang Exp $
+
+*secure-delete-3.1-r1 (10 Aug 2010)
+
+  10 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +secure-delete-3.1-r1.ebuild, +files/secure-delete-3.1-makefile.patch:
+  Fix LDFLAGS,parallel build, QA fixes, ebuild clean up. Patch from Dane
+  Smith <smithdanea@gmail.com>. Bug #332097
 
   30 Dec 2008; Christoph Mende <angelos@gentoo.org>
   secure-delete-3.1.ebuild:
diff --git a/app-misc/secure-delete/Manifest b/app-misc/secure-delete/Manifest
index 03c3bc7e66f2..ae0987d136a9 100644
--- a/app-misc/secure-delete/Manifest
+++ b/app-misc/secure-delete/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX secure-delete-3.1-do-not-use-the-kernel-module.patch 1493 RMD160 3a33fdf3361768d5c6af93def4bd50b9a53c08e3 SHA1 044569e03af0ac63fab8bd67c4142a2fe7a5d9db SHA256 76e2987c590f0e40455d0d4aec87fca97a7b55ae348fc8d9eeeacaec4b665849
+AUX secure-delete-3.1-makefile.patch 744 RMD160 b4c3f9230e4d1ee4acb0ed977bf7f0bf8cb64e2c SHA1 6ca07ecf5ceb6257bb87179e3c093a6a8729f7e7 SHA256 e19c26df9fc8ad91ee4742428f642531a8f0dfad5c63f4699b0c623f4af2eeca
 DIST secure_delete-3.1.tar.gz 62073 RMD160 923807f99bcc7eed7f0e7f8823ef110b2d0070bc SHA1 ce6391003587b37bd3713a967de04de1f0759107 SHA256 a9d846d1dce3f1bdf13bbb306e8596bc1f263198a086f6beecd90ccf7bddf8d5
+EBUILD secure-delete-3.1-r1.ebuild 1557 RMD160 4f632193689028847655ce14256ca9469f970c6c SHA1 1c6e9a6fc974da01fe0f6f8afb0c2ae523b47630 SHA256 d9cb8dff7cc4f4e351f541878b2f5a05d074ff8c234899e3ffa7b1d63af8b009
 EBUILD secure-delete-3.1.ebuild 1495 RMD160 2599ecbc68441132249dbc9f3d982f735daf2e0e SHA1 bc9dded6cb6c86dff2ba8b27b89b0ea279a62fd5 SHA256 5570ecc752ae254279d855e70d289ffee9cdf5a9248a1f245797a69f98673b71
-MISC ChangeLog 3122 RMD160 9a6aa61497b9bf740fe7db7aa1a5611b8ffc82e0 SHA1 6bb1b0b85a7753ae9907ebc83ca2dab69ee58f99 SHA256 699bef257ba97192c315435767462760ecae533f20ab5aa6554b11d85be4abff
+MISC ChangeLog 3404 RMD160 b378945ec2a3a192ab92dd273b8e7923278d7b86 SHA1 72470eba2d9a82dbac5443a3d780875c9380302a SHA256 4f7d0f12c7d6a3448334db691c2173449aca6c5cd680ddf7fac8d8ed6450320f
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklagoYACgkQKhnDs22gwa9wAQCgoECD66FZgLyOmwErsoGh/6mf
-AwwAnj9ejWGv91NWtZfXMtSgzliP2FBD
-=fLN9
------END PGP SIGNATURE-----
diff --git a/app-misc/secure-delete/files/secure-delete-3.1-makefile.patch b/app-misc/secure-delete/files/secure-delete-3.1-makefile.patch
new file mode 100644
index 000000000000..b9aad3d04a9d
--- /dev/null
+++ b/app-misc/secure-delete/files/secure-delete-3.1-makefile.patch
@@ -0,0 +1,25 @@
+--- Makefile	2010-08-10 10:44:37.000000000 -0400
++++ Makefile.secure	2010-08-10 10:44:43.000000000 -0400
+@@ -18,14 +19,14 @@
+ sdel-lib.o: sdel-lib.c
+ 	$(CC) ${OPT} -c sdel-lib.c
+ 
+-srm: srm.c
+-	$(CC) ${OPT} -o srm srm.c sdel-lib.o
+-sfill: sfill.c
+-	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
+-sswap: sswap.c
+-	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
+-smem: smem.c
+-	$(CC) ${OPT} -o smem smem.c sdel-lib.o
++srm: srm.o sdel-lib.o
++	$(CC) $(LDFLAGS) srm.o sdel-lib.o -o srm
++sfill: sfill.o sdel-lib.o
++	$(CC) $(LDFLAGS) sfill.o sdel-lib.o -o sfill
++sswap: sswap.o sdel-lib.o
++	$(CC) $(LDFLAGS) sswap.o sdel-lib.o -o sswap
++smem: smem.o sdel-lib.o
++	$(CC) $(LDFLAGS) smem.o sdel-lib.o -o smem
+ 
+ clean:
+ 	rm -f sfill srm sswap smem sdel sdel-lib.o 
diff --git a/app-misc/secure-delete/secure-delete-3.1-r1.ebuild b/app-misc/secure-delete/secure-delete-3.1-r1.ebuild
new file mode 100644
index 000000000000..46cb5d4965bf
--- /dev/null
+++ b/app-misc/secure-delete/secure-delete-3.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.1-r1.ebuild,v 1.1 2010/08/10 19:09:54 hwoarang Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P=${PN//-/_}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Secure file/disk/swap/memory erasure utilities"
+HOMEPAGE="http://www.thc.org/"
+SRC_URI="http://www.thc.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!app-misc/srm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod u+w .
+
+	sed -i \
+		-e 's|mktemp|mkstemp|g' \
+		sfill.c
+
+	sed -i -e "/strip/d" Makefile
+
+	# the kernel module will not compile without smp support and there is no
+	# good way to ensure that a user has it
+	epatch "${FILESDIR}"/${PN}-3.1-do-not-use-the-kernel-module.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	append-flags "-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	emake \
+		INSTALL_DIR="${D}"/usr/bin \
+		MAN_DIR="${D}"/usr/share/man \
+		DOC_DIR="${D}"/usr/share/doc/${PF} \
+		install || die "emake install failed"
+
+	dodoc secure_delete.doc usenix6-gutmann.doc || die
+}
+
+pkg_postinst() {
+	ewarn "sfill and srm are useless on journaling filesystems,"
+	ewarn "such as reiserfs or XFS."
+	ewarn "See documentation for more information."
+
+	elog "The kernel module has been removed since it does not compile"
+	elog "for non-smp kernels."
+}