Index: tar-1.15.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1.ebuild,v
retrieving revision 1.15
diff -u -B -r1.15 tar-1.15.1.ebuild
--- tar-1.15.1.ebuild	17 Jun 2005 03:40:36 -0000	1.15
+++ tar-1.15.1.ebuild	17 Jun 2005 11:05:26 -0000
@@ -16,7 +16,8 @@
 IUSE="nls static build bzip2"
 
 RDEPEND="app-arch/gzip
-	bzip2? ( app-arch/bzip2 )"
+	bzip2? ( app-arch/bzip2 )
+	elibc_FreeBSD? ( dev-libs/libiconv )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
@@ -29,6 +30,9 @@
 	epatch "${FILESDIR}"/${P}-less-verbose-newer.patch #86467
 	epatch "${FILESDIR}"/${P}-lseek.patch
 	cp "${FILESDIR}"/append.at tests/
+
+	sed -i -e 's:/backup.sh:/gbackup.sh:' \
+		scripts/backup.in scripts/restore.in scripts/dump-remind.in
 }
 
 src_compile() {
@@ -39,6 +44,7 @@
 		--enable-backup-scripts \
 		--bindir=/bin \
 		--libexecdir=/usr/sbin \
+		--program-prefix=g \
 		$(use_enable nls) \
 		|| die
 	emake || die "emake failed"
@@ -48,15 +54,27 @@
 	make DESTDIR="${D}" install || die "make install failed"
 	# a nasty yet required symlink:
 	dodir /etc
-	dosym ../usr/sbin/rmt /etc/rmt
+	dosym ../usr/sbin/grmt /etc/rmt
+
 	if use build ; then
 		rm -r "${D}"/usr
 	else
-		dodir /usr/bin
-		dosym /bin/tar /usr/bin/gtar
 		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 gtar.1
+		mv "${D}"/usr/sbin/gbackup{,-tar}
+		mv "${D}"/usr/sbin/grestore{,-tar}
 	fi
+
+	if [[ ${USERLAND} == "GNU" ]]; then
+		dosym gtar /bin/tar
+		dosym gtar.1.gz /usr/share/man/man1/tar.1.gz
+
+		for prog in rmt backup-tar restore-tar dump-remind; do
+			dosym g${prog} /usr/sbin/${prog}
+		done
+	fi
+
+	# This is installed on non-GNU systems but we already have
+	# it by using libiconv. Avoid collision.
+	rm -f ${D}/usr/$(get_libdir)/charset.alias
 }