version bump as per bug #101904

Package-Manager: portage-2.0.51.22-r2

7 files changed, 18 insertions, 116 deletions

diff --git a/app-arch/sharutils/ChangeLog b/app-arch/sharutils/ChangeLog
index 251508d9d17d..69f98c921dc6 100644
--- a/app-arch/sharutils/ChangeLog
+++ b/app-arch/sharutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/sharutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.36 2005/08/02 22:10:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.37 2005/08/10 22:05:59 dragonheart Exp $
+
+*sharutils-4.5 (10 Aug 2005)
+
+  10 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/sharutils-4.4-r1-tempfile.patch,
+  -files/sharutils-4.4-uninitalisedvar.patch, -sharutils-4.4-r1.ebuild,
+  +sharutils-4.5.ebuild:
+  version bump as per bug #101904 thanks to Bruce Korb
 
 *sharutils-4.4-r1 (02 Aug 2005)
 
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index ad386ac2382e..4e8509daba75 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 15f142271e3b608901a2a5b5fa3f65e4 ChangeLog 6735
+MD5 7f8b433684cf0238d02adfa8a1a52495 ChangeLog 7013
 MD5 0fd81d7e999330596e70e94b4abc3907 sharutils-4.2.1-r11.ebuild 1434
-MD5 9e0d1fc45b8137d9ac371d6f51d0a325 sharutils-4.4-r1.ebuild 1005
+MD5 6719e6ff2d5d0f203dd385a59adf89eb sharutils-4.5.ebuild 775
 MD5 5c7abe1494f7d3b105dd3907b6898474 files/sharutils-4.2.1-gentoo.patch 2438
 MD5 a0ed4cfc65c5d37392c6b3816d3fbdbe files/digest-sharutils-4.2.1-r11 67
 MD5 567118e62dd91c695bdffe56281a5324 files/sharutils-4.2.1-buffer-limits.patch 1980
+MD5 72ff0d7f4ab58f8c2e2f9b0d6ad5fbc0 files/digest-sharutils-4.5 66
 MD5 aeb2dc437bac48b13e8ebc1d632013ad files/sharutils-4.2.1-buffer-check.patch 2416
-MD5 cc08d95794a6f1a1563a10ed71110d13 files/digest-sharutils-4.4-r1 66
 MD5 ca22218be478144a5275a31e4ba88e75 files/sharutils-4.2.1-tempfile.patch 3249
-MD5 8847422d5027966763908e44d213a4d1 files/sharutils-4.4-uninitalisedvar.patch 268
-MD5 43e31b2d26e3371e7c6dd83e912ff162 files/sharutils-4.4-r1-tempfile.patch 2629
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC7+9omdTrptrqvGERAtmJAKCPL4pwoDijIQRKDGLp8sQ9J0pZTACfZgLz
-la1+eWeb6gkGnu0Rn+sWihU=
-=HYzK
+iD8DBQFC+npVmdTrptrqvGERAsHPAJ9bdxFr0ptJ4FgivqO+501hkMYzAACfZGur
+qqHBhN+6QUwXEt15j6QhR5c=
+=HN+2
 -----END PGP SIGNATURE-----
diff --git a/app-arch/sharutils/files/digest-sharutils-4.4-r1 b/app-arch/sharutils/files/digest-sharutils-4.4-r1
deleted file mode 100644
index ef8161e1f768..000000000000
--- a/app-arch/sharutils/files/digest-sharutils-4.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ad657c2dd04793b1dcd8b8135cd6395 sharutils-4.4.tar.bz2 634676
diff --git a/app-arch/sharutils/files/digest-sharutils-4.5 b/app-arch/sharutils/files/digest-sharutils-4.5
new file mode 100644
index 000000000000..a1637a4bdd65
--- /dev/null
+++ b/app-arch/sharutils/files/digest-sharutils-4.5
@@ -0,0 +1 @@
+MD5 72d6072152c67af299e7a193bb78f258 sharutils-4.5.tar.bz2 634934
diff --git a/app-arch/sharutils/files/sharutils-4.4-r1-tempfile.patch b/app-arch/sharutils/files/sharutils-4.4-r1-tempfile.patch
deleted file mode 100644
index 0abfa71e6ec9..000000000000
--- a/app-arch/sharutils/files/sharutils-4.4-r1-tempfile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: doc/shar.1
-===================================================================
-RCS file: /cvsroot/sharutils/sharutils/doc/shar.1,v
-retrieving revision 1.3
-diff -b -B -u -p -r1.3 shar.1
---- doc/shar.1	1 Jul 2005 13:44:51 -0000	1.3
-+++ doc/shar.1	30 Jul 2005 17:08:20 -0000
-@@ -48,7 +48,9 @@ switch is especially useful when the com
- the list of files to be packed.  For example:
- .nf
- 
--find . \-type f \-print | sort | shar \-S \-Z \-L50 \-o /tmp/big
-+find . \-type f \-print | \\
-+  sort | \\
-+  shar \-S \-Z \-L50 \-o /somewhere/big
- 
- .fi
- If \f2\-p\f1 is specified on the command line, then the options
-Index: doc/sharutils.texi
-===================================================================
-RCS file: /cvsroot/sharutils/sharutils/doc/sharutils.texi,v
-retrieving revision 1.7
-diff -b -B -u -p -r1.7 sharutils.texi
---- doc/sharutils.texi	23 Jan 2005 18:49:46 -0000	1.7
-+++ doc/sharutils.texi	30 Jul 2005 17:08:20 -0000
-@@ -279,7 +279,8 @@ This switch is especially useful when th
- the list of files to be packed.  For example:
- 
- @example
--find . -type f -print | shar -S -o /tmp/big.shar
-+find . -type f -print | \
-+  shar -S -o /somewhere/big.shar
- @end example
- 
- If @code{-p} is specified on the command line, then the options
-Index: src/remsync.in
-===================================================================
-RCS file: /cvsroot/sharutils/sharutils/src/remsync.in,v
-retrieving revision 1.2
-diff -b -B -u -p -r1.2 remsync.in
---- src/remsync.in	7 Jun 2005 21:54:04 -0000	1.2
-+++ src/remsync.in	30 Jul 2005 17:08:21 -0000
-@@ -3,6 +3,8 @@
- eval "exec @PERL@ -S $0 $*"
-     if $running_under_some_shell;
- 
-+use File::Temp qw/ :mktemp  /;
-+
- # Synchronization tool for remote directories.
- # Copyright (C) 1994 Free Software Foundation, Inc.
- # François Pinard <pinard@iro.umontreal.ca>, 1994.
-@@ -1785,8 +1787,10 @@ sub maybe_study_files
- 	}
-     }
- 
-+    $findtempfile = mktemp( "./remsync.XXXXXX" );
-+
-     open (SCAN,
--	  "find$list -type f 2> /tmp/$$.find | xargs -r $checksum_command |")
-+	  "find$list -type f 2> $findtempfile | xargs -r $checksum_command |")
- 	|| &interrupt ('Cannot launch program `find\'');
- 
-     # Process each existing file in turn.
-@@ -1815,9 +1819,9 @@ sub maybe_study_files
-     }
-     close SCAN;
- 
--    # Clean out scanning for inexisting files.
-+    # Clean out scanning for non-existing files.
- 
--    open (SCAN, "/tmp/$$.find");
-+    open (SCAN, $findtempfile);
-     while (<SCAN>)
-     {
- 	chop;
-@@ -1843,7 +1847,7 @@ To get rid of this warning, delete the s
- 	}
-     }
-     close SCAN;
--    unlink "/tmp/$$.find";
-+    unlink $findtempfile;
- 
-     $study_files = 0;
- }
diff --git a/app-arch/sharutils/files/sharutils-4.4-uninitalisedvar.patch b/app-arch/sharutils/files/sharutils-4.4-uninitalisedvar.patch
deleted file mode 100644
index 1cf0ce120ddd..000000000000
--- a/app-arch/sharutils/files/sharutils-4.4-uninitalisedvar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unshar.c.orig	2005-08-03 07:53:51.000000000 +1000
-+++ src/unshar.c	2005-08-03 07:55:25.000000000 +1000
-@@ -358,7 +358,7 @@
-      char *const *argv;
- {
-   FILE *file;
--  char* name_buffer;
-+  char* name_buffer=NULL;
-   int optchar;
- 
-   program_name = argv[0];
diff --git a/app-arch/sharutils/sharutils-4.4-r1.ebuild b/app-arch/sharutils/sharutils-4.5.ebuild
index 3efc68b19aa2..876710dfc874 100644
--- a/app-arch/sharutils/sharutils-4.4-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.4-r1.ebuild,v 1.1 2005/08/02 22:10:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.5.ebuild,v 1.1 2005/08/10 22:05:59 dragonheart Exp $
 
 inherit eutils
 
@@ -16,15 +16,6 @@ IUSE="nls"
 DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#87939 - thanks to Bruce Korb (maintainer)
-	epatch "${FILESDIR}/${PF}"-tempfile.patch
-	#101100 - thanks to bug #101100 by Ivan Yosifov
-	epatch "${FILESDIR}/${P}"-uninitalisedvar.patch
-}
-
 src_compile() {
 	econf $(use_enable nls) || die
 	emake || die "emake failed"