Fix -l, --one-file-system option to actually work.

5 files changed, 101 insertions, 3 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 99779ccb49c2..259a6aab1e66 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/tar
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.5 2004/01/11 13:45:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.6 2004/01/11 18:33:14 azarah Exp $
+
+*tar-1.13.92-r3 (11 Jan 2004)
+
+  11 Jan 2004; Martin Schlemmer <azarah@gentoo.org> tar-1.13.92-r3.ebuild,
+  files/tar-1.13.92-fix-one_file_system.patch:
+  Fix -l, --one-file-system option to actually work.
 
 *tar-1.13.92-r2 (11 Jan 2004)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 8689a35f9c95..b4f26aeac3f9 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,7 +1,7 @@
 MD5 23b3f188b0060fb7423a4f3231ff0cee tar-1.13.92-r1.ebuild 1420
 MD5 57e5effc4019741e89ffcc4a3aa5a31c tar-1.13.25-r3.ebuild 1448
-MD5 93921ef32db4d51126cfa8809beec876 ChangeLog 4673
-MD5 0eab2511773d6bfc91c43a637e7bbbf1 tar-1.13.92-r3.ebuild 1587
+MD5 bd3966d4b333c8f95b75e7ce726749ae ChangeLog 4880
+MD5 d907d8d8bd0400c4940b1ec86b98fc29 tar-1.13.92-r3.ebuild 1587
 MD5 b4b34ef07d2487364dad02456713798d tar-1.13.92-r2.ebuild 1482
 MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
 MD5 ebfd134ad54b3a6a08124bef38ecdad6 files/digest-tar-1.13.25-r3 64
diff --git a/app-arch/tar/files/digest-tar-1.13.92-r3 b/app-arch/tar/files/digest-tar-1.13.92-r3
new file mode 100644
index 000000000000..6590deb15c11
--- /dev/null
+++ b/app-arch/tar/files/digest-tar-1.13.92-r3
@@ -0,0 +1 @@
+MD5 fdfffdd8141a00ea72c16c34b486a00a tar-1.13.92.tar.bz2 1043316
diff --git a/app-arch/tar/files/tar-1.13.92-fix-one_file_system.patch b/app-arch/tar/files/tar-1.13.92-fix-one_file_system.patch
new file mode 100644
index 000000000000..d45f0c0611fe
--- /dev/null
+++ b/app-arch/tar/files/tar-1.13.92-fix-one_file_system.patch
@@ -0,0 +1,21 @@
+===================================================================
+RCS file: /cvsroot/tar/cvsroot/tar/tar/src/create.c,v
+retrieving revision 1.73
+retrieving revision 1.74
+diff -u -r1.73 -r1.74
+--- tar/tar/src/create.c	2003/12/25 10:18:37	1.73
++++ tar/tar/src/create.c	2004/01/03 11:45:31	1.74
+@@ -981,9 +981,11 @@
+ 	  return;
+ 	}
+     }
+-  else if (!recursion_option)
++
++  if (!recursion_option)
+     return;
+-  else if (one_file_system_option
++
++  if (one_file_system_option
+ 	   && !top_level
+ 	   && parent_device != stat->stat.st_dev)
+     {
diff --git a/app-arch/tar/tar-1.13.92-r3.ebuild b/app-arch/tar/tar-1.13.92-r3.ebuild
new file mode 100644
index 000000000000..80c35afdcbfe
--- /dev/null
+++ b/app-arch/tar/tar-1.13.92-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.13.92-r3.ebuild,v 1.1 2004/01/11 18:33:14 azarah Exp $
+
+inherit eutils gnuconfig
+
+IUSE="nls static build"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Use this to try make tarballs :)"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="ftp://alpha.gnu.org/pub/pub/gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ~ia64 ~ppc64"
+
+DEPEND="app-arch/gzip
+	app-arch/bzip2
+	app-arch/ncompress"
+
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.35 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Do not strip './' in path elements, as they are valid, bug #37132
+	epatch ${FILESDIR}/${P}-dont-strip-dot_slash.patch
+	# Fix -l, --one-file-system option to actually work.
+	epatch ${FILESDIR}/${P}-fix-one_file_system.patch
+}
+
+src_compile() {
+
+	# Fix configure scripts to support linux-mips targets
+	gnuconfig_update
+
+	econf \
+		--bindir=/bin \
+		--libexecdir=/usr/lib/misc \
+		`use_enable nls` || die
+
+	if [ -z "`use static`" ]
+	then
+		emake || die
+	else
+		emake LDFLAGS=-static || die
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	#FHS 2.1 stuff
+	dodir /usr/sbin
+	cd ${D}
+	mv usr/lib/misc/rmt usr/sbin/rmt.gnu
+	dosym rmt.gnu /usr/sbin/rmt
+	# a nasty yet required symlink:
+	dodir /etc
+	dosym /usr/sbin/rmt /etc/rmt
+	cd ${S}
+	if [ -z "`use build`" ]
+	then
+		dodoc AUTHORS ChangeLog* COPYING NEWS README* PORTS THANKS
+		doman ${FILESDIR}/tar.1
+	else
+		rm -rf ${D}/usr/share
+	fi
+}