commit:     0c7e8acaf9666ca4d2cfe388b635921b2615fb2b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 20:22:38 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 20:34:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7e8aca

sys-fs/squashfs-tools: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-fs/squashfs-tools/Manifest                     |  1 -
 .../files/squashfs-tools-4.4-fno-common.patch      | 11 ----
 sys-fs/squashfs-tools/metadata.xml                 |  6 --
 sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild | 55 ------------------
 sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild    | 67 ----------------------
 5 files changed, 140 deletions(-)

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 952f1f088a0..5df865b6a20 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1 @@
 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

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 dfbf42abb34..00000000000
--- 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 9e444d0bdc1..a017cec98ce 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -5,12 +5,6 @@
                <email>mgo...@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 f330af3c97a..00000000000
--- 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 26923c4c78e..00000000000
--- 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
-}

Reply via email to