aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-10-31 16:23:31 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-11-05 17:37:26 +0000
commit5d4398de107163d2c1b826d898a7051e6dfe1b6a (patch)
tree0e0616d6b7741fc3282b36b441a83756845dbb79
parentc9bc47089a68beb4ffefb097bf1f15495e4c8ae2 (diff)
downloadpaludis-5d4398de107163d2c1b826d898a7051e6dfe1b6a.tar.gz
paludis-5d4398de107163d2c1b826d898a7051e6dfe1b6a.tar.xz
EAPI 6 can unpack .txz files
-rw-r--r--paludis/repositories/e/eapis/6.conf1
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf2
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf2
-rw-r--r--paludis/syncers/dotar.in2
4 files changed, 4 insertions, 3 deletions
diff --git a/paludis/repositories/e/eapis/6.conf b/paludis/repositories/e/eapis/6.conf
index af27f8d..2249ec1 100644
--- a/paludis/repositories/e/eapis/6.conf
+++ b/paludis/repositories/e/eapis/6.conf
@@ -12,4 +12,5 @@ utility_path_suffixes = 6 5 4 3 2 1 0
shell_options_global = failglob
unpack_any_path = true
+unpack_suffixes = ${unpack_suffixes} tar.xz,txz
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 0618d2e..5073579 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -364,7 +364,7 @@ best_has_version_host_root = false
new_stdin = false
has_subslots = false
-unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz xz
+unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz,txz xz
annotations_blocker_resolution = resolution
annotations_blocker_resolution_manual = manual
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index dc593e7..862fa8a 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -282,5 +282,5 @@ failure_is_fatal = false
best_has_version_host_root = false
new_stdin = false
-unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz xz
+unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz,txz xz
diff --git a/paludis/syncers/dotar.in b/paludis/syncers/dotar.in
index 864dd55..b3cffdd 100644
--- a/paludis/syncers/dotar.in
+++ b/paludis/syncers/dotar.in
@@ -175,7 +175,7 @@ fi
UNPACKDIR="${TEMP}/repository"
mkdir "${UNPACKDIR}"
-export PALUDIS_UNPACK_SUFFIXES="tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma 7z,7Z tar.xz"
+export PALUDIS_UNPACK_SUFFIXES="tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma 7z,7Z tar.xz,txz"
export PALUDIS_UNPACK_UNRECOGNISED_IS_FATAL=yes
export PALUDIS_UNPACK_FIX_PERMISSIONS=
export PALUDIS_UNPACK_ANY_PATH=yes