[gentoo-commits] proj/apache:master commit in: /

[Lars Wendler]

commit:     dcda83a75b1770bcc72fabe6a4ae551a97a2da9f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 12:25:51 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 12:25:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=dcda83a7

Revert "rolltarball.sh: Create xz compressed tarballs"

This reverts commit d8466105dfb6f3323561445488afa300634013b0
because of unresolved issues

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 rolltarball.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rolltarball.sh b/rolltarball.sh
index 2660564..1962c00 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -18,12 +18,11 @@
 #      05-Jun-2005     Complete rewrite to clean up code
 #      20-Apr-2014     Use git instead of svn. Change patchname in ebuild as
 #                      well
-#       01-Dec-2020    Replace bzip2 with xz to compress tarballs
 #
 
-# Please increase version number before or on each commit which includes
-# changes to this script.
-MYVERSION='2.1'
+# Please increase version number before each commit which includes changes to
+# this script.
+MYVERSION='2.0'
 
 # ********** Begin functions **********
 
@@ -434,8 +433,8 @@ build_tarball() {
                echo ${CURTIME} > ${TB_DIR}/DATESTAMP
                echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP
                echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP
-               edebug "Create xz-ed tarball ${TB} from ${TB_DIR} excluding vcs 
files"
-               tar --create --xz --verbose --exclude-vcs --exclude=*~ --file 
${TB} ${TB_DIR} >&9
+               edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding 
vcs files"
+               tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ 
--file ${TB} ${TB_DIR} >&9
                eend $? "Tarball creation failed" || die
                edebug "Remove temporary directory" 
                rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove 
${TB_DIR}/"