aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Alex Elsayed <eternaleye@gmail.com> 2012-06-01 22:20:36 -0700
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-06-02 22:01:27 +0100
commita3bb614a9fe39b0cbc597197e7428f70a6b99e8c (patch)
tree4ce2fbe7b7dde4b17ac13a7a236d85ce7c8dcefc /paludis
parentd4661a13032a90c7be9a03b5c9ad11845f8cc2f6 (diff)
downloadpaludis-a3bb614a9fe39b0cbc597197e7428f70a6b99e8c.tar.gz
paludis-a3bb614a9fe39b0cbc597197e7428f70a6b99e8c.tar.xz
docs, configure.ac: libarchive[>=3.0]
Version 3.0 of libarchive fixes both xattr issues and GNU tar support, so we now hard-dep on it. As a result, we can rip out the code for creating paxballs. However, we'll keep unpaxinate and the other machinery for extracting them so as not to break old pbins.
Diffstat (limited to 'paludis')
-rw-r--r--paludis/repositories/e/e_repository.cc4
-rw-r--r--paludis/tar_extras.cc4
2 files changed, 0 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 94a3ebc13..2b7a16a61 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -136,11 +136,7 @@ typedef std::map<FSPath, std::string, FSPathComparator> EAPIForFileMap;
namespace
{
-#ifdef LIBARCHIVE_DOES_GNUTAR
const std::string pbin_tar_extension = ".tar";
-#else
- const std::string pbin_tar_extension = ".pax";
-#endif
std::shared_ptr<FSPathSequence> get_master_locations(
const std::shared_ptr<const ERepositorySequence> & r)
diff --git a/paludis/tar_extras.cc b/paludis/tar_extras.cc
index b3fbb6dce..239504a5f 100644
--- a/paludis/tar_extras.cc
+++ b/paludis/tar_extras.cc
@@ -50,11 +50,7 @@ paludis_tar_extras_init(const std::string & f, const std::string & compress)
else
archive_write_set_compression_none(extras->archive);
-#ifdef LIBARCHIVE_DOES_GNUTAR
archive_write_set_format_gnutar(extras->archive);
-#else
- archive_write_set_format_pax(extras->archive);
-#endif
if (ARCHIVE_OK != archive_write_open_filename(extras->archive, f.c_str()))
throw MergerError("archive_write_open_filename failed");