From 5b8104adf234f63fbfc794e8f9ae85a01f19579f Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 25 May 2016 23:41:30 +0000
Subject: [PATCH] tar: bump to 1.29, rework patch, mark x86 as tested, add
 TEST(). (#598)

---
 .../{tar-1.28.patchset => tar-1.29.patchset}  | 43 +++++++++++--------
 .../tar/{tar-1.28.recipe => tar-1.29.recipe}  | 32 +++++++++++---
 2 files changed, 52 insertions(+), 23 deletions(-)
 rename app-arch/tar/patches/{tar-1.28.patchset => tar-1.29.patchset} (56%)
 rename app-arch/tar/{tar-1.28.recipe => tar-1.29.recipe} (68%)

diff --git a/app-arch/tar/patches/tar-1.28.patchset b/app-arch/tar/patches/tar-1.29.patchset
similarity index 56%
rename from app-arch/tar/patches/tar-1.28.patchset
rename to app-arch/tar/patches/tar-1.29.patchset
index e660e713a..d5bbcb9b8 100644
--- a/app-arch/tar/patches/tar-1.28.patchset
+++ b/app-arch/tar/patches/tar-1.29.patchset
@@ -4,27 +4,11 @@ Date: Wed, 10 Sep 2014 16:24:50 +0000
 Subject: gcc2 patch
 
 
-diff --git a/lib/wordsplit.h b/lib/wordsplit.h
-index d64cf2f..c93f53d 100644
---- a/lib/wordsplit.h
-+++ b/lib/wordsplit.h
-@@ -34,9 +34,9 @@ struct wordsplit
-   const char *ws_escape;
-   void (*ws_alloc_die) (struct wordsplit * wsp);
-   void (*ws_error) (const char *, ...)
--                   __attribute__ ((__format__ (__printf__, 1, 2)));
-+;
-   void (*ws_debug) (const char *, ...)
--                   __attribute__ ((__format__ (__printf__, 1, 2)));
-+;
- 
-   const char **ws_env;
-   const char *(*ws_getvar) (const char *, size_t, void *);
 diff --git a/src/tar.c b/src/tar.c
-index cd32379..d975e37 100644
+index ba24c43..09c344d 100644
 --- a/src/tar.c
 +++ b/src/tar.c
-@@ -566,11 +566,10 @@ static struct argp_option options[] = {
+@@ -548,11 +548,10 @@ static struct argp_option options[] = {
     N_("cancel the effect of --delay-directory-restore option"), GRID+1 },
    {"sort", SORT_OPTION, N_("ORDER"), 0,
  #if D_INO_IN_DIRENT
@@ -41,3 +25,26 @@ index cd32379..d975e37 100644
 -- 
 2.2.2
 
+
+From 3269fb640f76f56b450231ae78576c855da9dda1 Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Mon, 16 May 2016 18:46:10 +0000
+Subject: Use __attribute__ only if gcc > 2.95 (instead of gcc >= 2.7)
+
+
+diff --git a/lib/wordsplit.h b/lib/wordsplit.h
+index e0d2559..627a626 100644
+--- a/lib/wordsplit.h
++++ b/lib/wordsplit.h
+@@ -22,7 +22,7 @@
+ 
+ #include <stddef.h>
+ 
+-#if 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
++#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
+ # define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+ #else
+ # define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) /* empty */
+-- 
+2.7.0
+
diff --git a/app-arch/tar/tar-1.28.recipe b/app-arch/tar/tar-1.29.recipe
similarity index 68%
rename from app-arch/tar/tar-1.28.recipe
rename to app-arch/tar/tar-1.29.recipe
index 0e20ae8d7..f49026bdc 100644
--- a/app-arch/tar/tar-1.28.recipe
+++ b/app-arch/tar/tar-1.29.recipe
@@ -9,15 +9,15 @@ tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite
 the utility's name, Tar can direct its output to available devices, files, or \
 other programs (using pipes), it can even access remote devices or files (as \
 archives)."
-HOMEPAGE="http://www.gnu.org/software/tar/"
-COPYRIGHT="1990-2011 Free Software Foundation, Inc."
+HOMEPAGE="https://www.gnu.org/software/tar/"
+COPYRIGHT="1990-2016 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="http://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
-CHECKSUM_SHA256="60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562"
+SOURCE_URI="http://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2"
+CHECKSUM_SHA256="236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2"
 PATCHES="tar-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	tar = $portVersion compat >= 1
@@ -26,18 +26,35 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:autoreconf
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
 
+if [ "$recipeAction" = TEST ]; then
+	BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+		cmd:compress
+		cmd:gzip
+		cmd:bzip2
+		"
+	if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+		BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+			cmd:lzip
+			cmd:lzma
+			cmd:xz
+			"
+	fi
+fi
+
 defineDebugInfoPackage tar $binDir/tar
 
 BUILD()
@@ -56,3 +73,8 @@ INSTALL()
 
 	rm $libDir/charset.alias
 }
+
+TEST()
+{
+	make check
+}