diff options
Diffstat (limited to 'sys-fs/squashfs-tools')
| -rw-r--r-- | sys-fs/squashfs-tools/Manifest | 8 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch | 11 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/metadata.xml | 6 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild | 55 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild | 67 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild | 2 |
6 files changed, 3 insertions, 146 deletions
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 6d1291ee621d..d8a769892472 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,7 +1,3 @@ -AUX squashfs-tools-4.4-fno-common.patch 456 BLAKE2B 6864eea963512705290c84e2c8ec57db59d0b96119469dae57a55c70f999446ca14ac7fbf7260540afd1656e1b50ba7ad174548b3972fba74ed530cfee1e5a7d SHA512 16da63201d5d1584401f3199a0f89d11d5e8d968a4e707215febf5910ec03425a7478d32a0a6e5e6cf7039f92300657d1797a525b38a817601ed0a8e698fb96d DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0 -DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308 -EBUILD squashfs-tools-4.4-r1.ebuild 1320 BLAKE2B 519be00eb2fe38a2be2a8722d75cf821cbc431d3af15d1138a279b1689f8e6060b017511314e772c9f6fee30ca7b3a28ef5ecc03f002181f4861565b01268edb SHA512 0b47634b8dc8eb2ea199fed7f1b044e8638d182995083cd8479e349cdc3c19920953d1996f7f32ec45c04904ac78eb3d9cc396a2e4c706eb1f9d4362f1787b6f -EBUILD squashfs-tools-4.4.ebuild 1720 BLAKE2B 762f8c6f0b1ef784bda8a5f56c49be0410628dfa39402fe15c188d97775dd6c53608e1099004c958a1baf87afb6b82362415143f0756e50d168da671c26fccbb SHA512 dd8e639279641c15fc0a6eefc7690c546a135a6eb66a66f5efec57c02947fe5a871b03159f337e00a974a4d10ea3bf0578e53d556c9027b5092d760c5fc62a7e -EBUILD squashfs-tools-4.4_p1.ebuild 1316 BLAKE2B 63bf43dbfb51c6ea23d7957eded39d250c0a6aa69495f15f88e969e76464ba1a1e216c8575ea1272ca6d295d4effe2194ad91e9a7c6e3ff1fc746bb1b3af485f SHA512 77ac0a873d27251633906e69fca05b252fe354979d86eb8241c929e604e9b33dfdb1ae6bfbe4a2882053c6f08735b174d4b4674bc9adb96af78d469b3fd0a308 -MISC metadata.xml 454 BLAKE2B a4b9cd6ce3e032fdfee261126f4893ed9fb81a0008960774812361fe25a993f77c67353fcbc818aceb0c6c936a52bec3f13d5d9b5aebac00cf36f47cf1d74583 SHA512 b884abe3bfe270a305536f51b9e4c291e2acd5c848b0f1c1a996e208beba57ae29746701478ffbc6b4df2c9dd10b17756b4c077aa895e65a37c9a231401e820f +EBUILD squashfs-tools-4.4_p1.ebuild 1313 BLAKE2B 589a3a76413933addc8d051678baf19d8ae8e557c0544df7df53d1e872216983610d2a04f52ae71236d1d0305232dcad852c204bdff0bf07a75b8e638e9cf741 SHA512 ccf88d8ca9eef5d96d50b51afd5df5cc34239562e88b4f5c0e119eea8502dfcd25d3271c0ce5bd0d72ba597347461fd170bc145499e9760a6785d66938578907 +MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4 diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch deleted file mode 100644 index dfbf42abb34b..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -143,7 +143,7 @@ struct append_file { - #endif - - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; --struct cache *bwriter_buffer, *fwriter_buffer; -+extern struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, - *to_frag, *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index 9e444d0bdc16..a017cec98cee 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -5,12 +5,6 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <use> - <flag name="xz"> - Enable support for XZ ("LZMA2") compression using - <pkg>app-arch/xz-utils</pkg> - </flag> - </use> <upstream> <remote-id type="sourceforge">squashfs</remote-id> </upstream> diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild deleted file mode 100644 index f330af3c97ac..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools" -SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="debug lz4 lzma lzo xattr zstd" - -RDEPEND=" - sys-libs/zlib - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - zstd? ( app-arch/zstd ) -" -DEPEND=${RDEPEND} - -PATCHES=( - "${FILESDIR}"/${PN}-4.4-fno-common.patch -) - -use10() { usex "${1}" 1 0; } - -src_configure() { - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 lzma) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools -} - -src_install() { - dobin squashfs-tools/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild deleted file mode 100644 index 26923c4c78e9..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools" -SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="debug lz4 lzma lzo static xattr +xz zstd" - -LIB_DEPEND=" - sys-libs/zlib[static-libs(+)] - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) - lz4? ( app-arch/lz4[static-libs(+)] ) - lzma? ( app-arch/xz-utils[static-libs(+)] ) - lzo? ( dev-libs/lzo[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) - xz? ( app-arch/xz-utils[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-4.4-fno-common.patch -) - -use10() { usex $1 1 0 ; } - -src_configure() { - # restore GNU89 inline semantics to - # emit function symbols, bug 595290 - append-cflags -std=gnu89 - - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 xz) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE - use static && append-ldflags -static -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN} -} - -src_install() { - dobin ${PN}/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild index ff8ad03a5649..9faef4b6fd90 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" RDEPEND=" |