Version bump.

9 files changed, 17 insertions, 255 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 833a8e1a681a..77e1bdf8eead 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/tar
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.39 2005/01/01 11:59:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.40 2005/01/05 15:20:37 vapier Exp $
+
+*tar-1.15.1 (05 Jan 2005)
+
+  05 Jan 2005; Mike Frysinger <vapier@gentoo.org> +tar-1.15.1.ebuild:
+  Version bump.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-arch/tar/files/1.14.90-gnulib.patch b/app-arch/tar/files/1.14.90-gnulib.patch
deleted file mode 100644
index 44cce2704f35..000000000000
--- a/app-arch/tar/files/1.14.90-gnulib.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: argp.h
-===================================================================
-RCS file: /cvsroot/gnulib/gnulib/lib/argp.h,v
-retrieving revision 1.5
-retrieving revision 1.8
-diff -u -b -B -r1.5 -r1.8
---- lib/argp.h	4 Oct 2003 12:28:07 -0000	1.5
-+++ lib/argp.h	30 Sep 2004 16:41:57 -0000	1.8
-@@ -1,5 +1,5 @@
- /* Hierarchial argument parsing, layered over getopt.
--   Copyright (C) 1995,1996,1997,1998,1999,2003 Free Software Foundation, Inc.
-+   Copyright (C) 1995-1999,2003,2004 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Miles Bader <miles@gnu.ai.mit.edu>.
- 
-@@ -34,6 +34,9 @@
- #ifndef __THROW
- # define __THROW
- #endif
-+#ifndef __NTH
-+# define __NTH(fct) fct __THROW
-+#endif
- 
- #ifndef __attribute__
- /* This feature is available in gcc versions 2.5 and later.  */
-@@ -48,6 +51,18 @@
- # endif
- #endif
- 
-+/* GCC 2.95 and later have "__restrict"; C99 compilers have
-+   "restrict", and "configure" may have defined "restrict".  */
-+#ifndef __restrict
-+# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
-+#  if defined restrict || 199901L <= __STDC_VERSION__
-+#   define __restrict restrict
-+#  else
-+#   define __restrict
-+#  endif
-+# endif
-+#endif
-+
- #ifndef __error_t_defined
- typedef int error_t;
- # define __error_t_defined
-@@ -111,11 +126,12 @@
-    should be displayed in much the same manner as the options.  If this flag
-    is set, then the option NAME field is displayed unmodified (e.g., no `--'
-    prefix is added) at the left-margin (where a *short* option would normally
--   be displayed), and the documentation string in the normal place.  For
--   purposes of sorting, any leading whitespace and punctuation is ignored,
--   except that if the first non-whitespace character is not `-', this entry
--   is displayed after all options (and OPTION_DOC entries with a leading `-')
--   in the same group.  */
-+   be displayed), and the documentation string in the normal place. The NAME
-+   field will be translated using gettext, unless OPTION_NO_TRANS is set (see
-+   below). For purposes of sorting, any leading whitespace and punctuation is
-+   ignored, except that if the first non-whitespace character is not `-', this
-+   entry is displayed after all options (and OPTION_DOC entries with a leading
-+   `-') in the same group.  */
- #define OPTION_DOC		0x8
- 
- /* This option shouldn't be included in `long' usage messages (but is still
-@@ -127,6 +143,11 @@
-    OPTION_NO_USAGE.  */
- #define OPTION_NO_USAGE		0x10
- 
-+/* Valid only in conjunction with OPTION_DOC. This option disables translation
-+   of option name. */
-+#define OPTION_NO_TRANS         0x20
-+
-+
- struct argp;			/* fwd declare this type */
- struct argp_state;		/* " */
- struct argp_child;		/* " */
-@@ -545,13 +566,13 @@
- # endif
- 
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__NTH (__argp_usage (__const struct argp_state *__state))
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__NTH (__option_is_short (__const struct argp_option *__opt))
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -563,7 +584,7 @@
- }
- 
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__NTH (__option_is_end (__const struct argp_option *__opt))
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
diff --git a/app-arch/tar/files/1.14.90-optimize.patch b/app-arch/tar/files/1.14.90-optimize.patch
deleted file mode 100644
index 37e9c1d58c4b..000000000000
--- a/app-arch/tar/files/1.14.90-optimize.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-01 Nov 2004 jcouzens
-
-This patch fixes the stupid bug in argp-fs-xinl.c
---- lib/argp-fs-xinl.c.orig 2004-10-29 13:45:06.806318952 +0100
-+++ lib/argp-fs-xinl.c      2004-10-29 13:45:26.385342488 +0100
-@@ -22,8 +22,9 @@
- #endif
-
- #define ARGP_FS_EI
--#undef __OPTIMIZE__
--#define __OPTIMIZE__
-+#ifndef __OPTIMIZE__
-+#define __OPTIMIZE__ 1
-+#endif
- #include "argp-fmtstream.h"
-
- #if 0
diff --git a/app-arch/tar/files/1.14.90-remote-shell.patch b/app-arch/tar/files/1.14.90-remote-shell.patch
deleted file mode 100644
index c5dd6e699c47..000000000000
--- a/app-arch/tar/files/1.14.90-remote-shell.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/tar.c.orig	2004-10-10 21:39:07.872276960 -0400
-+++ src/tar.c	2004-10-10 21:39:52.512490616 -0400
-@@ -544,10 +544,18 @@
- show_default_settings (FILE *stream)
- {
-   fprintf (stream,
--	   "--format=%s -f%s -b%d --rmt-command=%s --rsh-command=%s\n",
-+	   "--format=%s -f%s -b%d --rmt-command=%s"
-+#ifdef REMOTE_SHELL
-+" --rsh-command=%s"
-+#endif
-+	   "\n",
- 	   archive_format_string (DEFAULT_ARCHIVE_FORMAT),
- 	   DEFAULT_ARCHIVE, DEFAULT_BLOCKING,
--	   DEFAULT_RMT_COMMAND, REMOTE_SHELL);
-+	   DEFAULT_RMT_COMMAND
-+#ifdef REMOTE_SHELL
-+	   ,REMOTE_SHELL
-+#endif
-+	   );
- }
- 
- static void
diff --git a/app-arch/tar/files/1.14.90-scripts.patch b/app-arch/tar/files/1.14.90-scripts.patch
deleted file mode 100644
index 4d79d4033874..000000000000
--- a/app-arch/tar/files/1.14.90-scripts.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-16 Oct 2004 agriffis
-
-This patch enables compilation and installation of the backup and
-restore scripts that are supposed to be delivered with GNU tar.  The
-ebuild then moves them somewhere more appropriate so they don't
-conflict with other backup/restore stuff.
-
---- tar-1.14/scripts/Makefile.am.agriffis	2004-05-10 07:49:06.000000000 -0400
-+++ tar-1.14/scripts/Makefile.am	2004-10-15 23:56:42.411451159 -0400
-@@ -15,11 +15,9 @@
- ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- ## 02111-1307, USA.
- 
--BACKUP_LIBEXEC_SCRIPTS_LIST=backup.sh dump-remind
--BACKUP_SBIN_SCRIPTS_LIST=backup restore
--libexec_SCRIPTS=@BACKUP_LIBEXEC_SCRIPTS@
-+libexec_SCRIPTS=backup.sh dump-remind
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=backup.sh dump-remind
--sbin_SCRIPTS=@BACKUP_SBIN_SCRIPTS@
-+sbin_SCRIPTS=backup restore
- EXTRA_SCRIPTS=
- EXTRA_DIST=\
-  backup.sh.in\
-@@ -46,4 +44,4 @@
- 	sed $(SED_CMD) $? > $@
- 
- dump-remind: $(srcdir)/dump-remind.in
--	sed $(SED_CMD) $? > $@
-\ No newline at end of file
-+	sed $(SED_CMD) $? > $@
---- tar-1.14/scripts/Makefile.in.agriffis	2004-05-11 04:13:26.000000000 -0400
-+++ tar-1.14/scripts/Makefile.in	2004-10-15 23:57:43.353652590 -0400
-@@ -105,8 +105,6 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
--BACKUP_LIBEXEC_SCRIPTS = @BACKUP_LIBEXEC_SCRIPTS@
--BACKUP_SBIN_SCRIPTS = @BACKUP_SBIN_SCRIPTS@
- BACKUP_SED_COND = @BACKUP_SED_COND@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -204,9 +202,9 @@
- target_alias = @target_alias@
- BACKUP_LIBEXEC_SCRIPTS_LIST = backup.sh dump-remind
- BACKUP_SBIN_SCRIPTS_LIST = backup restore
--libexec_SCRIPTS = @BACKUP_LIBEXEC_SCRIPTS@
-+libexec_SCRIPTS = backup.sh dump-remind
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = backup.sh dump-remind
--sbin_SCRIPTS = @BACKUP_SBIN_SCRIPTS@
-+sbin_SCRIPTS = backup restore
- EXTRA_SCRIPTS = 
- EXTRA_DIST = \
-  backup.sh.in\
diff --git a/app-arch/tar/files/1.14.90-tests.patch b/app-arch/tar/files/1.14.90-tests.patch
deleted file mode 100644
index d17e2447da39..000000000000
--- a/app-arch/tar/files/1.14.90-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tests/listed02.sh	2004-10-11 00:39:45.443303624 +0200
-+++ tests/listed02.sh	2004-10-11 00:38:02.566943208 +0200
-@@ -69,7 +69,10 @@
- echo Extracting main archive
- tar -x -v --listed-incremental=tart.incr1 -f archive.1
- echo Extracting incremental archive
--tar -x -v --listed-incremental=tart.incr2 -f archive.2
-+# This command should produce three messages about deletion
-+# of the existing files, that may appear in any order. Piping
-+# to sort makes sure we don't depend on any particular ordering.
-+tar -x -v --listed-incremental=tart.incr2 -f archive.2 | sort
- 
- echo Final files:
- find tart|sort
-@@ -120,13 +123,13 @@
- tart/c1/ca1
- tart/c1/ca2
- Extracting incremental archive
--tart/
--tar: Deleting \`tart/c1'
- tar: Deleting \`tart/a1'
- tar: Deleting \`tart/b1'
-+tar: Deleting \`tart/c1'
-+tart/
-+tart/b2
- tart/c0/
- tart/c2/
--tart/b2
- tart/c2/ca1
- tart/c2/ca2
- tart/c2/ca3
diff --git a/app-arch/tar/files/digest-tar-1.14.90-r1 b/app-arch/tar/files/digest-tar-1.14.90-r1
deleted file mode 100644
index 7b1ccdf80dfa..000000000000
--- a/app-arch/tar/files/digest-tar-1.14.90-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd816b09dadaf6a4e9a46d22993f6d44 tar-1.14.90.tar.bz2 1309070
diff --git a/app-arch/tar/files/digest-tar-1.15.1 b/app-arch/tar/files/digest-tar-1.15.1
new file mode 100644
index 000000000000..7fc760a2bc45
--- /dev/null
+++ b/app-arch/tar/files/digest-tar-1.15.1
@@ -0,0 +1 @@
+MD5 57da3c38f8e06589699548a34d5a5d07 tar-1.15.1.tar.bz2 1611489
diff --git a/app-arch/tar/tar-1.14.90-r1.ebuild b/app-arch/tar/tar-1.15.1.ebuild
index 695218fe69a8..1b2ae5742942 100644
--- a/app-arch/tar/tar-1.14.90-r1.ebuild
+++ b/app-arch/tar/tar-1.15.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90-r1.ebuild,v 1.4 2005/01/01 11:59:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v 1.1 2005/01/05 15:20:37 vapier Exp $
 
-inherit flag-o-matic eutils gnuconfig
+inherit flag-o-matic eutils
 
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://dev.gentoo.org/~seemant/distfiles/${P}.tar.bz2
+SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
 	http://alpha.gnu.org/gnu/tar/${P}.tar.bz2
 	mirror://gnu/tar/${P}.tar.bz2"
 
@@ -22,50 +22,30 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-remote-shell.patch #66959
-	epatch ${FILESDIR}/${PV}-tests.patch #67023
-	epatch ${FILESDIR}/${PV}-gnulib.patch #67038
-	epatch ${FILESDIR}/${PV}-scripts.patch
-	epatch ${FILESDIR}/${PV}-optimize.patch #69395
-	gnuconfig_update
-}
-
 src_compile() {
 	use static && append-ldflags -static
 	# Work around bug in sandbox #67051
 	gl_cv_func_chown_follows_symlink=yes \
 	econf \
-		--disable-dependency-tracking \
+		--enable-backup-scripts \
 		--bindir=/bin \
 		--libexecdir=/usr/sbin \
-		$(use_enable nls) || die
+		$(use_enable nls) \
+		|| die
 	emake || die "emake failed"
 }
 
-src_test() {
-	if [ "${ARCH}" == "x86" ] ; then
-		einfo "Skipping make test due to a glibc bug (See #67051)."
-		einfo "Then again, it probably would have worked anyways."
-		einfo "So have some faith and pretend everything is OK."
-	else
-		make test || die "make test failed"
-	fi
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	# a nasty yet required symlink:
 	dodir /etc
 	dosym ../usr/sbin/rmt /etc/rmt
 	if use build ; then
-		rm -rf ${D}/usr
+		rm -r "${D}"/usr
 	else
 		dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-		doman "${FILESDIR}/tar.1"
-		mv ${D}/usr/sbin/backup{,-tar}
-		mv ${D}/usr/sbin/restore{,-tar}
+		doman "${FILESDIR}"/tar.1
+		mv "${D}"/usr/sbin/backup{,-tar}
+		mv "${D}"/usr/sbin/restore{,-tar}
 	fi
 }