From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A849A138334 for ; Thu, 29 Aug 2019 05:45:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C71EDE081A; Thu, 29 Aug 2019 05:45:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93D32E081A for ; Thu, 29 Aug 2019 05:45:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEC8F34A5CB for ; Thu, 29 Aug 2019 05:45:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF3CB6FE for ; Thu, 29 Aug 2019 05:44:59 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1567057498.33109f2939460910f07472f87b3b322313e35ec1.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/squashfs-tools/Manifest sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild X-VCS-Directories: sys-fs/squashfs-tools/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 33109f2939460910f07472f87b3b322313e35ec1 X-VCS-Branch: master Date: Thu, 29 Aug 2019 05:44:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da3762fb-b821-412c-ab09-2f345208514d X-Archives-Hash: 4aa7cb699a9bdc5ecc0ff65d191aa0c8 commit: 33109f2939460910f07472f87b3b322313e35ec1 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Aug 29 05:43:18 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Aug 29 05:44:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33109f29 sys-fs/squashfs-tools: Old Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> sys-fs/squashfs-tools/Manifest | 1 - .../squashfs-tools-4.3_p11-r1.ebuild | 85 ---------------------- .../squashfs-tools/squashfs-tools-4.3_p11.ebuild | 84 --------------------- 3 files changed, 170 deletions(-) diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 41d0f3cbd34..b612ae3571a 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,5 +1,4 @@ DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308 -DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild deleted file mode 100644 index b0c96a39261..00000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2019 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="http://squashfs.sourceforge.net" -SRC_URI=" - mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}"/${P/_p*}-sysmacros.patch - "${FILESDIR}"/${P/_p*}-aligned-data.patch - "${FILESDIR}"/${P/_p*}-local-cve-fix.patch - "${FILESDIR}"/${P/_p*}-mem-overflow.patch - "${FILESDIR}"/${P/_p*}-extmatch.patch - "${FILESDIR}"/${P/_p*}-musl.patch -) - -S="${WORKDIR}/squashfs${PV/_p*}/${PN}" - -src_prepare() { - mv "${WORKDIR}"/debian/patches/0016-remove-frag_deflator_thread.patch "${WORKDIR}"/ || die - eapply -p2 "${WORKDIR}"/debian/patches/*.patch - eapply -p2 ${PATCHES[@]} - eapply_user -} - -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[@]}" -} - -src_install() { - dobin mksquashfs unsquashfs - cd .. - dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* - doman "${WORKDIR}"/debian/manpages/*.[0-9] -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild deleted file mode 100644 index 48c56a33545..00000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 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="http://squashfs.sourceforge.net" -SRC_URI=" - mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}"/${P/_p*}-sysmacros.patch - "${FILESDIR}"/${P/_p*}-aligned-data.patch - "${FILESDIR}"/${P/_p*}-local-cve-fix.patch - "${FILESDIR}"/${P/_p*}-mem-overflow.patch - "${FILESDIR}"/${P/_p*}-extmatch.patch - "${FILESDIR}"/${P/_p*}-musl.patch -) - -S="${WORKDIR}/squashfs${PV/_p*}/${PN}" - -src_prepare() { - eapply -p2 "${WORKDIR}"/debian/patches/*.patch - eapply -p2 ${PATCHES[@]} - eapply_user -} - -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[@]}" -} - -src_install() { - dobin mksquashfs unsquashfs - cd .. - dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* - doman "${WORKDIR}"/debian/manpages/*.[0-9] -}