Add support for renaming tar on non-GNU systems #96363.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 39 insertions, 15 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 5b4990f99c8d..3b79b9a47208 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.50 2005/06/17 03:40:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.51 2005/08/12 04:18:44 vapier Exp $
+
+  12 Aug 2005; Mike Frysinger <vapier@gentoo.org> tar-1.15.1.ebuild:
+  Add support for renaming tar on non-GNU systems #96363.
 
   17 Jun 2005; Mike Frysinger <vapier@gentoo.org>
   +files/tar-1.15.1-lseek.patch, tar-1.15.1.ebuild:
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index e580bfae35d5..6818e6509be4 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,13 +1,23 @@
-MD5 0f4191d941f1b5af4e1c4261843b152c ChangeLog 10388
-MD5 10b5cbd493848bce93fd8a66f6d4ef7d tar-1.15.1.ebuild 1705
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d4f800ee8a2c5ddd00931249e680def8 tar-1.14.ebuild 1329
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 421d5ac320097eb2811c407cc1fa1974 ChangeLog 10516
+MD5 90016441565e60252e22010bc7f1dff9 tar-1.15.1.ebuild 1998
 MD5 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
+MD5 971970980dc4f15a093acfe810dae560 files/tar-1.15.1-gcc4-test.patch 637
+MD5 6c645ac1da5d382a9f7ca85729b7e9e9 files/tar-1.15.1-dont-abort-long-names.patch 1586
 MD5 a1433bcc25f8f63d8ee96bddbf877962 files/1.15.1-flex-arg.patch 519
 MD5 c6222f8e6644e897361b0426c753fc8d files/tar-1.15.1-lseek.patch 5270
 MD5 9873b609521d574ae1f98d1c092c80e4 files/append.at 1065
 MD5 c94df05539a43d66c055452ef5acfb3b files/tar.1 12154
-MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
 MD5 71aa7eea494a25b07f4ea14a7f8a7a99 files/tar-1.15.1-less-verbose-newer.patch 770
-MD5 971970980dc4f15a093acfe810dae560 files/tar-1.15.1-gcc4-test.patch 637
-MD5 6c645ac1da5d382a9f7ca85729b7e9e9 files/tar-1.15.1-dont-abort-long-names.patch 1586
+MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC/CNPgIKl8Uu19MoRAlBCAJ9qgkSSrwgWfH4bYFuJj+fUMs4QOgCcDKO0
+Wqa35ngYE9NEuBSB1c1SnWw=
+=Jn2V
+-----END PGP SIGNATURE-----
diff --git a/app-arch/tar/tar-1.15.1.ebuild b/app-arch/tar/tar-1.15.1.ebuild
index 714edb4b968a..0eb4a9540211 100644
--- a/app-arch/tar/tar-1.15.1.ebuild
+++ b/app-arch/tar/tar-1.15.1.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/tar/tar-1.15.1.ebuild,v 1.15 2005/06/17 03:40:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v 1.16 2005/08/12 04:18:44 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -29,10 +29,19 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-less-verbose-newer.patch #86467
 	epatch "${FILESDIR}"/${P}-lseek.patch
 	cp "${FILESDIR}"/append.at tests/
+
+	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 \
@@ -40,23 +49,25 @@ src_compile() {
 		--bindir=/bin \
 		--libexecdir=/usr/sbin \
 		$(use_enable nls) \
-		|| die
+		${myconf} || die
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	# a nasty yet required symlink:
+	# a nasty yet required symlink
+	local p=""
+	use userland_GNU || p=g
 	dodir /etc
-	dosym ../usr/sbin/rmt /etc/rmt
+	dosym /usr/sbin/${p}rmt /etc/${p}rmt
 	if use build ; then
 		rm -r "${D}"/usr
 	else
 		dodir /usr/bin
-		dosym /bin/tar /usr/bin/gtar
+		dosym /bin/${p}tar /usr/bin/${p}tar
 		dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-		doman "${FILESDIR}"/tar.1
-		mv "${D}"/usr/sbin/backup{,-tar}
-		mv "${D}"/usr/sbin/restore{,-tar}
+		newman "${FILESDIR}"/tar.1 ${p}tar.1
+		mv "${D}"/usr/sbin/${p}backup{,-tar}
+		mv "${D}"/usr/sbin/${p}restore{,-tar}
 	fi
 }