Version bump (bug #267817).

Package-Manager: portage-13564-svn/cvs/Linux x86_64

4 files changed, 67 insertions, 17 deletions

diff --git a/app-crypt/bcwipe/ChangeLog b/app-crypt/bcwipe/ChangeLog
index eac325635b8b..0de32bb5d1e3 100644
--- a/app-crypt/bcwipe/ChangeLog
+++ b/app-crypt/bcwipe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/bcwipe
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcwipe/ChangeLog,v 1.34 2009/04/26 19:16:16 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcwipe/ChangeLog,v 1.35 2009/04/30 20:58:58 arfrever Exp $
+
+*bcwipe-1.9.1 (30 Apr 2009)
+
+  30 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -bcwipe-1.7_p2.ebuild, +bcwipe-1.9.1.ebuild,
+  +files/bcwipe-1.9.1-fix_warnings.patch:
+  Version bump (bug #267817).
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org> bcwipe-1.7_p7.ebuild:
   stable ppc, bug 266807
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
index 686fb56a2b1b..009bcaf517db 100644
--- a/app-crypt/bcwipe/Manifest
+++ b/app-crypt/bcwipe/Manifest
@@ -1,8 +1,9 @@
 AUX bcwipe-1.7_p7-build.patch 860 RMD160 d56958a5040cca80a79461c69011913f848dfbcd SHA1 c524531d2e6ad65ae4890bc4d89514814c1a0773 SHA256 d44d58c838fefae865c8e98d984aa0e8fb83503c945d7a72e58d1b70fe0969b6
-DIST BCWipe-1.7-2.tar.gz 26818 RMD160 0e451319262459a2cb16bc0e4534e83cbb05ca84 SHA1 e0ec4fc95e977737283ea20934dc732bbbd4621a SHA256 d03da7638363f732701ccbe24fd368ca61da75d59665e927a75de0742738d328
+AUX bcwipe-1.9.1-fix_warnings.patch 806 RMD160 572a7bd289ccca3aadf1240a37fefe5822e8f057 SHA1 2907900f91df826d1c796c00908d23ebf88137a5 SHA256 f1db3d4c86053af5bece3b5af4de656d0a07539743f8ab9d66292d4b157f7d04
 DIST BCWipe-1.7-7.tar.gz 27174 RMD160 a92bd6f5c9a9ad477c873421272d19b8aadc13f9 SHA1 618d5866e93aca0495fc4d366aa966261d36937e SHA256 6581b4dd57c195c30dced675c51ac4469e4bc5d4cbef71bda8a287ee1fc6848b
+DIST BCWipe-1.9-1.tar.gz 100282 RMD160 5b608f432616da0f0447187be1b0080816698d03 SHA1 84de775f5fd4c93ee63eb1c837fe48574c87c869 SHA256 1358c5d29c56713baf1f4c25e13adfeeda556b0761a672b13a0a258262f4c418
 DIST BCWipe.doc.tgz 21218 RMD160 a38bb741c3aae7d849cc8035010644720434ac2b SHA1 a5240848e1fd3fc534aa0d62a76bb120f498fb1a SHA256 afa50bf8653bb6bee108f0ae8b3dc35d289dde3d5c513b7e9ae7fe373635df4f
-EBUILD bcwipe-1.7_p2.ebuild 1125 RMD160 1164499f48044a9c2d71f6ad4dd9a760b115bdd6 SHA1 3612b5b9438252e99f1ec3f1c710b7d7d7a94ff2 SHA256 950a270606334054609aacf95cf815435a4b8980c550d6f7ae9e25119efb8844
 EBUILD bcwipe-1.7_p7.ebuild 1295 RMD160 702bd5ab55030d94c54188da69e21de2451f95ca SHA1 a69e4476baf8ec9743793d575187a2aa314d8adb SHA256 1248783cbe71e6dd4a6dda286bac252f7ada5361dd59e9e0e69fdd81bba34781
-MISC ChangeLog 4337 RMD160 5a8df98bcbcd2e48691d6b18a414392a75e9d84b SHA1 4f99bb04e05bd590ea19845152302607045659e2 SHA256 75de2297eb992a15ae5330769afa0338407a9dd630981db06ab4e4fac9467cbd
+EBUILD bcwipe-1.9.1.ebuild 1221 RMD160 b94cdf3cac98a5458a1a3cd80a19b810ad40b07d SHA1 84945d24dfd6261f2bb3e615462a98ffeaf5a092 SHA256 851263b9f81e479a8c371906f3842b6715e55a74dcc7430cceebb92ae71904ce
+MISC ChangeLog 4561 RMD160 0aa2291d8735cdf68da70de5bf463222ab342b0f SHA1 3975c213e55c65b2259fa775476e96d19965bc67 SHA256 4b8712eedda3c12238c9b89cae60d360711151cd223a0dbfb7d9f194d13da42d
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/app-crypt/bcwipe/bcwipe-1.7_p2.ebuild b/app-crypt/bcwipe/bcwipe-1.9.1.ebuild
index 7a0718eaf470..5a9afb704d8f 100644
--- a/app-crypt/bcwipe/bcwipe-1.7_p2.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.1.ebuild
@@ -1,40 +1,44 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcwipe/bcwipe-1.7_p2.ebuild,v 1.5 2008/04/09 17:27:25 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcwipe/bcwipe-1.9.1.ebuild,v 1.1 2009/04/30 20:58:58 arfrever Exp $
 
-inherit toolchain-funcs eutils
+EAPI="2"
 
-MY_PV="${PV/_p/-}"
+inherit eutils versionator
+
+MY_PV="$(replace_version_separator 2 -)"
 
 DESCRIPTION="BCWipe secure file removal utility"
 HOMEPAGE="http://www.jetico.com/"
 SRC_URI="http://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
-	http://www.jetico.com/linux/BCWipe.doc.tgz"
+	doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )"
 
 LICENSE="bestcrypt"
 SLOT="0"
 IUSE="doc"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_compile() {
-	emake CC="$(tc-getCC)" DEFS="${CFLAGS}"|| die "Make failed"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_warnings.patch"
 }
 
 src_test() {
 	echo "abc123" >> testfile
 	./bcwipe -f testfile || die "bcwipe test failed"
-	[ -f testfile ] && die "test file still exists. bcwipe should of deleted it"
+	[ -f testfile ] && die "test file still exists. bcwipe should have deleted it"
 }
 
 src_install() {
-	dobin bcwipe
-	doman bcwipe.1
-	use doc && dohtml -r ../bcwipe-help
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc ; then
+		dohtml -r ../bcwipe-help || die "dohtml failed"
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-crypt/bcwipe/files/bcwipe-1.9.1-fix_warnings.patch b/app-crypt/bcwipe/files/bcwipe-1.9.1-fix_warnings.patch
new file mode 100644
index 000000000000..6d71638320e1
--- /dev/null
+++ b/app-crypt/bcwipe/files/bcwipe-1.9.1-fix_warnings.patch
@@ -0,0 +1,38 @@
+--- schemes.c
++++ schemes.c
+@@ -15,6 +15,7 @@
+  *
+  *******************************************************************/
+ #include "config.h"
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- wipe.c
++++ wipe.c
+@@ -773,7 +773,7 @@
+ static int do_verify_pass(int fd, wipe_info_t *ctx) 
+ {
+ 	long long int pos, len, size;
+-	time_t	cur_time, start_time;
++	time_t	start_time;
+ 	int x;
+ 	char verifyBuff[BUFFSIZE];
+ 	char buff[BUFFSIZE];
+@@ -839,7 +839,6 @@
+ {
+ 	int fd, is_dev, ret;
+ 	long long int size;
+-	char *type_str;
+ 
+ 	if (o_wipe_slacks)
+ 		return wipe_file_slack_nas( ctx, pass, verify );
+@@ -1478,7 +1477,7 @@
+ 	int fd, res, j, write_fail;
+ 	long long int file_size, ss, free_space, x;
+ 	time_t  start_time;
+-	int cnt, err;
++	int cnt;
+ 	seed_t  seed, prev_seed;
+ 
+