old

7 files changed, 5 insertions, 504 deletions

diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 8d193171f6ea..e3c8f5cfd04a 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,9 +3,9 @@ DIST dpkg_1.15.6.1.tar.bz2 4841958 RMD160 f69942f73c450fab16df999ea11567dd90830c
 DIST dpkg_1.15.8.3.tar.bz2 5043688 RMD160 53e7f41a57b077cab48e887dd988324b33fb55af SHA1 b3662c901450d5dc5ab5f682eee757e6e80f9402 SHA256 1ed72e493354647b3669e04124fdb33d3db05501fba005de3a6c9d1200d5de5c
 DIST dpkg_1.15.8.4.tar.bz2 5046836 RMD160 d487e4eb4c4888fcc7fad06ab4220a02ccfd5919 SHA1 aff67eda19c1cbdfb29de6e292d8e556dcccd72a SHA256 9ee9431fe4fd93b80af8005de492a196b7fee1346225ee3522ee1cd758c3ad21
 DIST dpkg_1.15.8.5.tar.bz2 5174315 RMD160 6f488a6c3dcc410476a22d952c3c5b195cb15d29 SHA1 a520d5454da0af80a1dd10b3d58c5d1b17f5a042 SHA256 2ef55e8eb6c1e8c3dfb54c8ccc9a883fec7540b705c5179ca7a198bebe2f18bc
-EBUILD dpkg-1.15.6.1.ebuild 2386 RMD160 b436d9cd306bdafa6748d62f64774ff5eb5689e0 SHA1 b68241a1fa9d2519f695b50aa2e37122fb417d1c SHA256 b11ce24e01ca2251ad1b741f230aaad5a2559e3fabcd6f6ab823b1ba359f5c79
-EBUILD dpkg-1.15.8.3.ebuild 2446 RMD160 c8c85c46e5dfe7aec6b9782bc9143c7e5782918e SHA1 758c0165e8b570ce76de64c693f5e6541aa8902a SHA256 4d7b030b9c93e62cc914434f825bf75574259d7e1e555d38b82f05be9eafe1ec
-EBUILD dpkg-1.15.8.4.ebuild 2478 RMD160 f44de7e87add2d3e34a7d42e4b2a57635d4c40a2 SHA1 3e8b7df82fe2188e0b1406da1c4664fe26abd8ae SHA256 64ed3248faaf6193079627e7ef84245d6f057684a25bb2483308f4d1cb57c81b
-EBUILD dpkg-1.15.8.5.ebuild 2478 RMD160 b7157c1907eb90584fcf5c3dd2b509864a81d712 SHA1 afdd89722f67ec924cea8f6a9606ef7ad7579c3d SHA256 14dd16071d89d1e31e874ff3329a340a12f3097da0de15b60298ff02c31ca8ed
-MISC ChangeLog 18964 RMD160 734c41fe62668f30fa72c003d0269a2a859839fb SHA1 70da86a24baa9959bddcf0e8a8bd9a1dae9f23df SHA256 c258e857cc8f33b204d01b10c61a96996b359328a7877f40e8e7956a3cd0a5fb
+EBUILD dpkg-1.15.6.1.ebuild 2403 RMD160 edd027b1ba976dfc98127f4b844a262adef981fa SHA1 88d8481c464c45c01423c69544c5d1baadd676e7 SHA256 0c937186298a54720db798d5c88a1fc0097634ddd00c0d2d2d46d47fb7049322
+EBUILD dpkg-1.15.8.3.ebuild 2466 RMD160 87f389f3ecbe9895d0b36b37db68ba9aae9dda70 SHA1 3bbfe6b9e7924a8fcf575c068cd3e37b8c021404 SHA256 cdec8b4e1fc9eecc9a357d08a68a374d3f8b7a772b2e37928a6df3a49aac6c71
+EBUILD dpkg-1.15.8.4.ebuild 2498 RMD160 6cfb9c1f65b87ff64ba619dd7ce4f37d86897e24 SHA1 77bb32013bec000c84d74cde4dda437c99948282 SHA256 cd2954bd87e85d234ed79f45e74c014c06b2021c5273b814a78b78a8193d9e79
+EBUILD dpkg-1.15.8.5.ebuild 2498 RMD160 73fe10a19c122c705aa4b67dd54a3232f9ea7ddf SHA1 3cabc5bcbd2b8d65e7afd62db4a90c97b98c5408 SHA256 f08152fd667d5fa61a05190a56266a88c41f3ebd73540f3f2dbc32a8774d1a34
+MISC ChangeLog 19169 RMD160 5e93c924ce27e81006e4adb05a9656c9e9aebdc5 SHA1 99c645b777896fdc52f4b3c8f6e660d0c6d0e6cd SHA256 de836e4223e609c55052f2021e7f64d44df94bef875cf748239fdc9186985db7
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/tar/files/tar-1.21-revert-pipe.patch b/app-arch/tar/files/tar-1.21-revert-pipe.patch
deleted file mode 100644
index c8bd653415bb..000000000000
--- a/app-arch/tar/files/tar-1.21-revert-pipe.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-http://bugs.gentoo.org/252680
-http://lists.gnu.org/archive/html/bug-tar/2008-12/msg00028.html
-
-revert this change:
-
-2008-11-25  Sergey Poznyakoff  <gray@gnu.org.ua>
-
-	Do not try to drain the input pipe before closing the
-	archive. 
-	
-	* src/buffer.c (close_archive): Remove call to
-	sys_drain_input_pipe. Pass hit_eof as the second
-	argument to sys_wait_for_child.
-	* src/common.h (sys_drain_input_pipe): Remove
-	(sys_wait_for_child): Declare second argument.
-	* src/system.c (sys_drain_input_pipe): Remove.
-	(sys_wait_for_child): Take two arguments. The second one helps to
-	decide whether to tolerate child termination on SIGPIPE.
-
-diff --git a/src/buffer.c b/src/buffer.c
-index 5f5457a..02a3e4c 100644
---- a/src/buffer.c
-+++ b/src/buffer.c
-@@ -848,6 +848,8 @@ close_archive (void)
-         flush_archive ();
-     }
- 
-+  sys_drain_input_pipe ();
-+
-   compute_duration ();
-   if (verify_option)
-     verify_volume ();
-@@ -855,7 +857,7 @@ close_archive (void)
-   if (rmtclose (archive) != 0)
-     close_error (*archive_name_cursor);
- 
--  sys_wait_for_child (child_pid, hit_eof);
-+  sys_wait_for_child (child_pid);
- 
-   tar_stat_destroy (&current_stat_info);
-   if (save_name)
-diff --git a/src/common.h b/src/common.h
-index 9897b46..cc3483e 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -699,7 +699,8 @@ char *xheader_format_name (struct tar_stat_info *st, const char *fmt,
- 
- void sys_detect_dev_null_output (void);
- void sys_save_archive_dev_ino (void);
--void sys_wait_for_child (pid_t, bool);
-+void sys_drain_input_pipe (void);
-+void sys_wait_for_child (pid_t);
- void sys_spawn_shell (void);
- bool sys_compare_uid (struct stat *a, struct stat *b);
- bool sys_compare_gid (struct stat *a, struct stat *b);
-diff --git a/src/system.c b/src/system.c
-index c90a40d..e57e6da 100644
---- a/src/system.c
-+++ b/src/system.c
-@@ -1,7 +1,6 @@
- /* System-dependent calls for tar.
- 
--   Copyright (C) 2003, 2004, 2005, 2006, 2007,
--   2008 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-@@ -52,7 +51,12 @@ sys_detect_dev_null_output (void)
- }
- 
- void
--sys_wait_for_child (pid_t child_pid, bool eof)
-+sys_drain_input_pipe (void)
-+{
-+}
-+
-+void
-+sys_wait_for_child (pid_t child_pid)
- {
- }
- 
-@@ -156,8 +160,26 @@ sys_detect_dev_null_output (void)
- 			 && archive_stat.st_ino == dev_null_stat.st_ino));
- }
- 
-+/* Manage to fully drain a pipe we might be reading, so to not break it on
-+   the producer after the EOF block.  FIXME: one of these days, GNU tar
-+   might become clever enough to just stop working, once there is no more
-+   work to do, we might have to revise this area in such time.  */
-+
-+void
-+sys_drain_input_pipe (void)
-+{
-+  size_t r;
-+
-+  if (access_mode == ACCESS_READ
-+      && ! _isrmt (archive)
-+      && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode)))
-+    while ((r = rmtread (archive, record_start->buffer, record_size)) != 0
-+	   && r != SAFE_READ_ERROR)
-+      continue;
-+}
-+
- void
--sys_wait_for_child (pid_t child_pid, bool eof)
-+sys_wait_for_child (pid_t child_pid)
- {
-   if (child_pid)
-     {
-@@ -171,11 +193,8 @@ sys_wait_for_child (pid_t child_pid, bool eof)
- 	  }
- 
-       if (WIFSIGNALED (wait_status))
--	{
--	  int sig = WTERMSIG (wait_status);
--	  if (!(!eof && sig == SIGPIPE))
--	    ERROR ((0, 0, _("Child died with signal %d"), sig));
--	}
-+	ERROR ((0, 0, _("Child died with signal %d"),
-+		WTERMSIG (wait_status)));
-       else if (WEXITSTATUS (wait_status) != 0)
- 	ERROR ((0, 0, _("Child returned status %d"),
- 		WEXITSTATUS (wait_status)));
diff --git a/app-arch/tar/files/tar-1.21-testsuite.patch b/app-arch/tar/files/tar-1.21-testsuite.patch
deleted file mode 100644
index 0d41408d71a4..000000000000
--- a/app-arch/tar/files/tar-1.21-testsuite.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=253122
-http://git.savannah.gnu.org/cgit/tar.git/commit/?id=7b68ef3d918603f3afb03e939ba72f5cad10edf4
-
-From 7b68ef3d918603f3afb03e939ba72f5cad10edf4 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org.ua>
-Date: Mon, 29 Dec 2008 09:27:00 +0000
-Subject: Fix testsuite and bootstrap. Implement -I.
-
-* bootstrap.conf: Include size_max.
-* gnulib.modules: Remove memset, rmdir. Replace strdup with
-strdup-posix. Patch by Eric Blake.
-* src/tar.c: Implement -I as a shorthand for --use-compress-program.
-* doc/tar.texi: Document -I.
-* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record
-size' output.
-* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define
-(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros.
----
-diff --git a/tests/pipe.at b/tests/pipe.at
-index efca65b..be99212 100644
---- a/tests/pipe.at
-+++ b/tests/pipe.at
-@@ -1,7 +1,7 @@
- # Process this file with autom4te to create testsuite. -*- Autotest -*-
- 
- # Test suite for GNU tar.
--# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin])
- 
- AT_KEYWORDS([pipe])
- 
--AT_TAR_CHECK([
-+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
-+[AT_TAR_CHECK([
- AT_SORT_PREREQ
- 
- mkdir directory
-@@ -49,6 +50,7 @@ directory/file1
- directory/file2
- separator
- separator
--])
-+],
-+[stderr])])
- 
- AT_CLEANUP
-diff --git a/tests/shortrec.at b/tests/shortrec.at
-index 3e009fd..179f365 100644
---- a/tests/shortrec.at
-+++ b/tests/shortrec.at
-@@ -1,7 +1,7 @@
- # Process this file with autom4te to create testsuite. -*- Autotest -*-
- 
- # Test suite for GNU tar.
--# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -23,17 +23,22 @@
- # used to create the archive.
- 
- AT_SETUP([short records])
--AT_KEYWORDS([shortrec.at])
-+AT_KEYWORDS([shortrec])
- 
--AT_TAR_CHECK([
-+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
-+[AT_TAR_CHECK([
- mkdir directory
- (cd directory && touch a b c d e f g h i j k l m n o p q r)
--tar -c -b 1 -f - directory | tar -t -f - >/dev/null
-+tar -c -b 1 -f - directory | tar -t -f - 
- tar -c -b 1 -f archive directory
--tar -t -f archive >/dev/null
--tar -t -f - < archive >/dev/null
-+tar -t -f archive 
-+tar -t -f - < archive 
- 
- rm -r directory
-+],
-+[0],
-+[ignore],
-+[stderr])
- ])
- 
- AT_CLEANUP
-diff --git a/tests/testsuite.at b/tests/testsuite.at
-index 2fa5392..a12477d 100644
---- a/tests/testsuite.at
-+++ b/tests/testsuite.at
-@@ -1,7 +1,7 @@
- # Process this file with autom4te to create testsuite. -*- Autotest -*-
- 
- # Test suite for GNU tar.
--# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -21,6 +21,7 @@
- # We need a recent Autotest.
- m4_version_prereq([2.52g])
- 
-+m4_define([AT_TAR_CHECK_HOOK])
- m4_define([AT_TAR_CHECK],[
-   AT_XFAIL_IF(test -f $[]XFAILFILE)
-   m4_foreach([FMT],
-@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT
- TAR_OPTIONS="-H FMT"
- export TAR_OPTIONS
- rm -rf *
--$1)],$2,$3,$4,$5,$6)])
-+$1)],$2,$3,$4,$5,$6)
-+              AT_TAR_CHECK_HOOK])
- ])
- 
-+m4_define([AT_TAR_WITH_HOOK],[
-+  m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
-+  $2
-+  
-+  m4_popdef([AT_TAR_CHECK_HOOK])])
-+
-+m4_define([TAR_IGNREC_HOOK],[
-+  AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
-+])
-+  
- m4_define([RE_CHECK],[
- AT_DATA([$1.re],[$2])
- awk '{print NR " " $[]0}' $1 > $[]$.1
---
-cgit v0.8.2
diff --git a/app-arch/tar/files/tar-1.22-strncpy.patch b/app-arch/tar/files/tar-1.22-strncpy.patch
deleted file mode 100644
index 6c439170ec40..000000000000
--- a/app-arch/tar/files/tar-1.22-strncpy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -uNr tar-1.22.ORIG//src/create.c tar-1.22/src/create.c
---- tar-1.22.ORIG//src/create.c	2010-04-25 19:50:28.147606290 +0100
-+++ tar-1.22/src/create.c	2010-04-25 19:50:44.849606051 +0100
-@@ -577,7 +577,10 @@
-   GNAME_TO_CHARS (tmpname, header->header.gname);
-   free (tmpname);
- 
--  strcpy (header->header.magic, OLDGNU_MAGIC);
-+  /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+  strncpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic));
-+  strncpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic),
-+           sizeof(header->header.version));
-   header->header.typeflag = type;
-   finish_header (st, header, -1);
- 
-@@ -907,9 +910,13 @@
-       break;
- 
-     case OLDGNU_FORMAT:
--    case GNU_FORMAT:   /*FIXME?*/
--      /* Overwrite header->header.magic and header.version in one blow.  */
--      strcpy (header->header.magic, OLDGNU_MAGIC);
-+    case GNU_FORMAT:
-+      /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+      strncpy (header->header.magic, OLDGNU_MAGIC,
-+               sizeof(header->header.magic));
-+      strncpy (header->header.version,
-+               OLDGNU_MAGIC+sizeof(header->header.magic),
-+               sizeof(header->header.version));
-       break;
- 
-     case POSIX_FORMAT:
diff --git a/app-arch/tar/tar-1.20.ebuild b/app-arch/tar/tar-1.20.ebuild
deleted file mode 100644
index eb1b191cfe3e..000000000000
--- a/app-arch/tar/tar-1.20.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.20.ebuild,v 1.6 2008/11/27 22:55:50 jer Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static userland_GNU"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use static && append-ldflags -static
-	use userland_GNU || myconf="--program-prefix=g"
-	# Work around bug in sandbox #67051
-	gl_cv_func_chown_follows_symlink=yes \
-	econf \
-		--enable-backup-scripts \
-		--bindir=/bin \
-		--libexecdir=/usr/sbin \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local p=""
-	use userland_GNU || p=g
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt || die
-	fi
-
-	dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-	newman "${FILESDIR}"/tar.1 ${p}tar.1
-	mv "${D}"/usr/sbin/${p}backup{,-tar}
-	mv "${D}"/usr/sbin/${p}restore{,-tar}
-
-	rm -f "${D}"/usr/$(get_libdir)/charset.alias
-}
diff --git a/app-arch/tar/tar-1.21-r1.ebuild b/app-arch/tar/tar-1.21-r1.ebuild
deleted file mode 100644
index 471f5fb647f0..000000000000
--- a/app-arch/tar/tar-1.21-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.21-r1.ebuild,v 1.2 2009/02/02 19:00:01 dirtyepic Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static userland_GNU"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-revert-pipe.patch #252680
-	epatch "${FILESDIR}"/${P}-testsuite.patch   #253122
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use static && append-ldflags -static
-	use userland_GNU || myconf="--program-prefix=g"
-	# Work around bug in sandbox #67051
-	gl_cv_func_chown_follows_symlink=yes \
-	econf \
-		--enable-backup-scripts \
-		--bindir=/bin \
-		--libexecdir=/usr/sbin \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local p=""
-	use userland_GNU || p=g
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt || die
-	fi
-
-	dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-	newman "${FILESDIR}"/tar.1 ${p}tar.1
-	mv "${D}"/usr/sbin/${p}backup{,-tar}
-	mv "${D}"/usr/sbin/${p}restore{,-tar}
-
-	rm -f "${D}"/usr/$(get_libdir)/charset.alias
-}
diff --git a/app-arch/tar/tar-1.22-r1.ebuild b/app-arch/tar/tar-1.22-r1.ebuild
deleted file mode 100644
index c67a65b9d076..000000000000
--- a/app-arch/tar/tar-1.22-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.22-r1.ebuild,v 1.1 2010/04/25 18:53:46 chainsaw Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
-	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
-	mirror://gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static userland_GNU"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.21-revert-pipe.patch #252680
-	epatch "${FILESDIR}"/${P}-strncpy.patch #317139
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use static && append-ldflags -static
-	use userland_GNU || myconf="--program-prefix=g"
-	# Work around bug in sandbox #67051
-	gl_cv_func_chown_follows_symlink=yes \
-	econf \
-		--enable-backup-scripts \
-		--bindir=/bin \
-		--libexecdir=/usr/sbin \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	local p=""
-	use userland_GNU || p=g
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt || die
-	fi
-
-	dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-	newman "${FILESDIR}"/tar.1 ${p}tar.1
-	mv "${D}"/usr/sbin/${p}backup{,-tar}
-	mv "${D}"/usr/sbin/${p}restore{,-tar}
-
-	rm -f "${D}"/usr/$(get_libdir)/charset.alias
-}