net-mail/metamail: Version bump. sys-fs/squashfuse: Remove

Signed-off-by: Martin Väth <martin@mvath.de>

7 files changed, 7 insertions, 87 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 9e262673..af15d553 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -90,7 +90,7 @@ net-dialup/martian-modem 20100123-r3: ltmodem alternative driver providing suppo
 net-dns/host 20070128-r1: A powerful command-line DNS query and test tool
 net-dns/noip-updater 2.1.9-r6: no-ip.com dynamic DNS updater
 net-firewall/firewall-mv 13.3: Initialize iptables and net-related sysctl variables
-net-mail/metamail 2.7.53.3-r3: Metamail (with Debian patches) - Generic MIME package
+net-mail/metamail 2.7.54.1: Metamail (with Debian patches) - Generic MIME package
 net-misc/netctl 1.11: Profile based network connection tool from Arch Linux
 net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
 net-misc/sshstart 4.10-r1: Start ssh-agent/ssh-add only if you really use ssh or friends
@@ -112,7 +112,6 @@ sys-fs/emount 3.0.5: mount/unmount create/remove dm-crypt filesystems according
 sys-fs/encfs 1.9.6_alpha0: An implementation of encrypted filesystem in user-space using FUSE
 sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
 sys-fs/squashfs-tools 99999999: Tool for creating compressed filesystem type squashfs
-sys-fs/squashfuse 0.1.104: FUSE filesystem to mount squashfs archives
 sys-fs/squashmount 22.1-r2: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
 sys-kernel/cfcfg 1.0: Yet another Linux kernel configuration comparator
 sys-kernel/kccmp 0.3-r3: A simple tool for comparing two linux kernel .config files
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 6ed3f620..62881307 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -1,2 +1,2 @@
-DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
+DIST metamail_2.7-54.diff.gz 324193 BLAKE2B a9a858d67beda6aaf2ce6a67cbc6c9abcdb52be1a1b58e038d316359e09dd415b19a8b4501680736d6071e3ed17609edf021f89039fc84a377b4a86585c339c5 SHA512 34ed2c39ac43fad62fadfaf74fbe2a7dadd46d10841b887e2222aa21ee70ca92c38e2a3292c1add35c6695432a3661af7a40e29be01f48a779216889c18a5f08
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
diff --git a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild b/net-mail/metamail/metamail-2.7.54.1.ebuild
index fe5e2bff..85ea4518 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
+++ b/net-mail/metamail/metamail-2.7.54.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools toolchain-funcs
 
+RESTRICT="mirror"
+
 MY_PV=$(ver_cut 1-2)
 DEB_PV=${MY_PV}-$(ver_cut 3)
 
@@ -12,6 +14,7 @@ DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
 HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
 SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
 	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
+#	https://sibelius.debian.org/debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +36,7 @@ S=${WORKDIR}/mm${MY_PV}/src
 src_prepare() {
 	eapply "${WORKDIR}"/metamail_${DEB_PV}.diff
 	eapply "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
-	eapply "${FILESDIR}"/${P}-glibc-2.10.patch
+	eapply "${FILESDIR}"/${PN}-2.7.53.3-glibc-2.10.patch
 
 	# respect CFLAGS
 	sed -i -e 's/CFLAGS/LIBS/' \
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d8b95f1c..43ba001f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -131,7 +131,5 @@ sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse
 sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz4
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/zstd (requires >=linux-4.14 or >=sys-fs/squashfuse-0.1.101_alpha20170917)
-sys-fs/squashfuse:lz4 - Enable support for lz4 compression
-sys-fs/squashfuse:zstd - Enable support for zstd compression
 sys-power/pm-utils:ntp - Install support for net-misc/ntp
 x11-libs/motif:motif22-compatibility - Compatibility with Open Motif 2.2
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
deleted file mode 100644
index 48d3fdc2..00000000
--- a/sys-fs/squashfuse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST squashfuse-0.1.104.tar.gz 63596 BLAKE2B e2ccb5668ca3159ebad65aabc46362f9f515441c74e8559d6fb8e671c33a827e38742268beec894c9a3e933c7ee2b4b040447552667aad08019edf0e175543dc SHA512 34e5092fb422b98ec7eaaa5ea1fe71c401cf9cfb0fdad8d89f8ed1662912b3733fceafb2959af988467363e5d7fc9ccdd37cc2bcfc090379c4f9e38a415f7a2b
diff --git a/sys-fs/squashfuse/metadata.xml b/sys-fs/squashfuse/metadata.xml
deleted file mode 100644
index 46fe6745..00000000
--- a/sys-fs/squashfuse/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<bugs-to>mailto:dave@vasilevsky.ca</bugs-to>
-		<changelog>https://github.com/vasi/squashfuse/commits/master</changelog>
-		<doc>https://raw.github.com/vasi/squashfuse/master/README</doc>
-		<remote-id type="github">vasi/squashfuse</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>martin@mvath.de</email>
-		<name>Martin Väth</name>
-		<description>maintainer of the updates in the mv overlay</description>
-	</maintainer>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<use>
-		<flag name="lz4">Enable support for lz4 compression</flag>
-		<flag name="zstd">Enable support for zstd compression</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild b/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
deleted file mode 100644
index d3b63eb0..00000000
--- a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-RESTRICT="mirror"
-inherit autotools flag-o-matic
-
-DESCRIPTION="FUSE filesystem to mount squashfs archives"
-HOMEPAGE="https://github.com/vasi/squashfuse"
-
-case ${PV} in
-*alpha*)
-	EGIT_COMMIT="0b48352ed7a89d920bb6792ac59f9f6775088f02"
-	SRC_URI="https://github.com/vasi/squashfuse/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	alpha=:;;
-*)
-	SRC_URI="https://github.com/vasi/squashfuse/archive/${PV}/${P}.tar.gz"
-	alpha=false;;
-esac
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lz4 lzma lzo static-libs +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
-
-COMMON_DEPEND="
-	sys-fs/fuse:3=
-	lzma? ( >=app-arch/xz-utils-5.0.4:= )
-	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
-	lzo? ( >=dev-libs/lzo-2.06:= )
-	lz4? ( >=app-arch/lz4-0_p106:= )
-	zstd? ( >=app-arch/zstd-1.0:= )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	! $alpha || sed -i -e '1s:\[0\.1\.100\]:['"${PV}"']:' configure.ac || die
-	AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_configure() {
-	filter-flags '-flto*' -fwhole-program -fno-common
-	local myconf=(
-		$(use lz4 || echo --without-lz4)
-		$(use lzma || echo  --without-xz)
-		$(use lzo || echo --without-lzo)
-		$(use zlib || echo --without-zlib)
-		$(use zstd || echo --without-zstd)
-		$(use static-libs || echo --disable-static)
-	)
-	econf "${myconf[@]}"
-}