1 files changed, 19 insertions, 8 deletions
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
 }