Install the backup/restore scripts that are described in the tar info pages (as backup-tar and restore-tar so they don't conflict with app-arch/dump). Move cflags manglement to src_compile where it belongs

5 files changed, 145 insertions, 20 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index b0fbfe696cc8..8927cac1569f 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/tar
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.35 2004/10/13 03:51:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.36 2004/10/16 04:15:31 agriffis Exp $
+
+*tar-1.14.90-r1 (16 Oct 2004)
+
+  16 Oct 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/1.14.90-scripts.patch, +tar-1.14.90-r1.ebuild:
+  Install the backup/restore scripts that are described in the tar info pages
+  (as backup-tar and restore-tar so they don't conflict with app-arch/dump).
+  Move cflags manglement to src_compile where it belongs
 
   12 Oct 2004; Mike Frysinger <vapier@gentoo.org> tar-1.14.90.ebuild:
   Add a workaround to handle a bug in tar #67051.
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 5c79b10c21ae..f3366055e244 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4347aac5d791aae9d9a656e8949748cb ChangeLog 8259
-MD5 0ed7fffca1f3e59802efe2ab207ec2e7 tar-1.14.90.ebuild 1781
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d0b3e45115a461b08fc996e4036fa171 tar-1.14.ebuild 1337
 MD5 091a6972853071b4b764eddcdc658398 tar-1.13.92-r3.ebuild 1624
-MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90 65
-MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594
-MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
-MD5 4cdef5c71729b03a10fb5e066b358398 files/1.14.90-tests.patch 879
-MD5 23ab0e636547af36f83f3d7db78c9776 files/tar.1 12155
+MD5 4347aac5d791aae9d9a656e8949748cb ChangeLog 8259
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0ed7fffca1f3e59802efe2ab207ec2e7 tar-1.14.90.ebuild 1781
+MD5 9ddba3a58eb65367c3bdff3c7b91dd03 tar-1.14.90-r1.ebuild 1909
 MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
+MD5 e05d36a6f2aeb7f6374d04d61872bd53 files/tar-1.13.92-fix-one_file_system.patch 547
+MD5 23ab0e636547af36f83f3d7db78c9776 files/tar.1 12155
+MD5 4cdef5c71729b03a10fb5e066b358398 files/1.14.90-tests.patch 879
+MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90 65
 MD5 404c6b2a90334fe682029e5d5771620d files/1.14.90-gnulib.patch 3403
 MD5 8adb291e1142c213ed26260319bef9f4 files/tar-1.13.92-dont-strip-dot_slash.patch 893
-MD5 e05d36a6f2aeb7f6374d04d61872bd53 files/tar-1.13.92-fix-one_file_system.patch 547
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBbYRhHTu7gpaalycRArUIAJ99Exaqw1euzPDiZUoBAFGYCoZGiACgpxvM
-YhMLkXPKm3LqFNdoQLQK05w=
-=e4Pt
------END PGP SIGNATURE-----
+MD5 e4017a705a2d9950c025b458ead9ac79 files/digest-tar-1.13.92-r3 65
+MD5 afe4f707a5851659a448c05a5bb6868e files/1.14.90-remote-shell.patch 594
+MD5 6e38cbcf3c8dddd5c1e3e00d18f0d378 files/1.14.90-scripts.patch 1829
+MD5 a19a156b33f2b725bccc907941208c92 files/digest-tar-1.14.90-r1 65
diff --git a/app-arch/tar/files/1.14.90-scripts.patch b/app-arch/tar/files/1.14.90-scripts.patch
new file mode 100644
index 000000000000..4d79d4033874
--- /dev/null
+++ b/app-arch/tar/files/1.14.90-scripts.patch
@@ -0,0 +1,53 @@
+16 Oct 2004 agriffis
+
+This patch enables compilation and installation of the backup and
+restore scripts that are supposed to be delivered with GNU tar.  The
+ebuild then moves them somewhere more appropriate so they don't
+conflict with other backup/restore stuff.
+
+--- tar-1.14/scripts/Makefile.am.agriffis	2004-05-10 07:49:06.000000000 -0400
++++ tar-1.14/scripts/Makefile.am	2004-10-15 23:56:42.411451159 -0400
+@@ -15,11 +15,9 @@
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ ## 02111-1307, USA.
+ 
+-BACKUP_LIBEXEC_SCRIPTS_LIST=backup.sh dump-remind
+-BACKUP_SBIN_SCRIPTS_LIST=backup restore
+-libexec_SCRIPTS=@BACKUP_LIBEXEC_SCRIPTS@
++libexec_SCRIPTS=backup.sh dump-remind
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=backup.sh dump-remind
+-sbin_SCRIPTS=@BACKUP_SBIN_SCRIPTS@
++sbin_SCRIPTS=backup restore
+ EXTRA_SCRIPTS=
+ EXTRA_DIST=\
+  backup.sh.in\
+@@ -46,4 +44,4 @@
+ 	sed $(SED_CMD) $? > $@
+ 
+ dump-remind: $(srcdir)/dump-remind.in
+-	sed $(SED_CMD) $? > $@
+\ No newline at end of file
++	sed $(SED_CMD) $? > $@
+--- tar-1.14/scripts/Makefile.in.agriffis	2004-05-11 04:13:26.000000000 -0400
++++ tar-1.14/scripts/Makefile.in	2004-10-15 23:57:43.353652590 -0400
+@@ -105,8 +105,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BACKUP_LIBEXEC_SCRIPTS = @BACKUP_LIBEXEC_SCRIPTS@
+-BACKUP_SBIN_SCRIPTS = @BACKUP_SBIN_SCRIPTS@
+ BACKUP_SED_COND = @BACKUP_SED_COND@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -204,9 +202,9 @@
+ target_alias = @target_alias@
+ BACKUP_LIBEXEC_SCRIPTS_LIST = backup.sh dump-remind
+ BACKUP_SBIN_SCRIPTS_LIST = backup restore
+-libexec_SCRIPTS = @BACKUP_LIBEXEC_SCRIPTS@
++libexec_SCRIPTS = backup.sh dump-remind
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = backup.sh dump-remind
+-sbin_SCRIPTS = @BACKUP_SBIN_SCRIPTS@
++sbin_SCRIPTS = backup restore
+ EXTRA_SCRIPTS = 
+ EXTRA_DIST = \
+  backup.sh.in\
diff --git a/app-arch/tar/files/digest-tar-1.14.90-r1 b/app-arch/tar/files/digest-tar-1.14.90-r1
new file mode 100644
index 000000000000..7b1ccdf80dfa
--- /dev/null
+++ b/app-arch/tar/files/digest-tar-1.14.90-r1
@@ -0,0 +1 @@
+MD5 dd816b09dadaf6a4e9a46d22993f6d44 tar-1.14.90.tar.bz2 1309070
diff --git a/app-arch/tar/tar-1.14.90-r1.ebuild b/app-arch/tar/tar-1.14.90-r1.ebuild
new file mode 100644
index 000000000000..8cbac20fee07
--- /dev/null
+++ b/app-arch/tar/tar-1.14.90-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.90-r1.ebuild,v 1.1 2004/10/16 04:15:31 agriffis Exp $
+
+inherit flag-o-matic eutils gnuconfig
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="http://dev.gentoo.org/~seemant/distfiles/${P}.tar.bz2
+	http://alpha.gnu.org/gnu/tar/${P}.tar.bz2
+	mirror://gnu/tar/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls static build"
+
+DEPEND="virtual/libc
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/ncompress"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-remote-shell.patch #66959
+	epatch ${FILESDIR}/${PV}-tests.patch #67023
+	epatch ${FILESDIR}/${PV}-gnulib.patch #67038
+	epatch ${FILESDIR}/${PV}-scripts.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	# Work around bug in sandbox #67051
+	gl_cv_func_chown_follows_symlink=yes \
+	econf \
+		--disable-dependency-tracking \
+		--bindir=/bin \
+		--libexecdir=/usr/sbin \
+		$(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_test() {
+	if [ "${ARCH}" == "x86" ] ; then
+		einfo "Skipping make test due to a glibc bug (See #67051)."
+		einfo "Then again, it probably would have worked anyways."
+		einfo "So have some faith and pretend everything is OK."
+	else
+		make test || die "make test failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	# a nasty yet required symlink:
+	dodir /etc
+	dosym ../usr/sbin/rmt /etc/rmt
+	if use build ; then
+		rm -rf ${D}/usr
+	else
+		dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
+		doman "${FILESDIR}/tar.1"
+		mv ${D}/usr/sbin/backup{,-tar}
+		mv ${D}/usr/sbin/restore{,-tar}
+	fi
+}