From aba186ee3dde2658762095ecb416325874ec9edd Mon Sep 17 00:00:00 2001
From: Nils Freydank <nils.freydank@posteo.de>
Date: Mon, 13 Jan 2025 06:30:00 +0100
Subject: [PATCH] package.mask: Drop masked packages

This commit drops the following packages:
- app-crypt/archlinux-keyring
- sys-apps/pacman
- sys-apps/pacman-mirrorlist

Signed-off-by: Nils Freydank <nils.freydank@posteo.de>
---
 app-crypt/archlinux-keyring/Manifest          |  1 -
 .../archlinux-keyring-20240313.ebuild         | 36 --------
 app-crypt/archlinux-keyring/metadata.xml      |  8 --
 profiles/package.mask                         |  9 --
 sys-apps/pacman-mirrorlist/Manifest           |  1 -
 sys-apps/pacman-mirrorlist/metadata.xml       |  8 --
 .../pacman-mirrorlist-20230820.ebuild         | 29 -------
 sys-apps/pacman/Manifest                      |  1 -
 sys-apps/pacman/metadata.xml                  | 20 -----
 sys-apps/pacman/pacman-6.1.0.ebuild           | 86 -------------------
 10 files changed, 199 deletions(-)
 delete mode 100644 app-crypt/archlinux-keyring/Manifest
 delete mode 100644 app-crypt/archlinux-keyring/archlinux-keyring-20240313.ebuild
 delete mode 100644 app-crypt/archlinux-keyring/metadata.xml
 delete mode 100644 sys-apps/pacman-mirrorlist/Manifest
 delete mode 100644 sys-apps/pacman-mirrorlist/metadata.xml
 delete mode 100644 sys-apps/pacman-mirrorlist/pacman-mirrorlist-20230820.ebuild
 delete mode 100644 sys-apps/pacman/Manifest
 delete mode 100644 sys-apps/pacman/metadata.xml
 delete mode 100644 sys-apps/pacman/pacman-6.1.0.ebuild

diff --git a/app-crypt/archlinux-keyring/Manifest b/app-crypt/archlinux-keyring/Manifest
deleted file mode 100644
index a7878e3..0000000
--- a/app-crypt/archlinux-keyring/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST archlinux-keyring-20240313.tar.gz 1252554 BLAKE2B 2d5e8502baffb79c46628f346562e7cefd64d3f2f2f99c245e81b65a1bc935926ef1a1ee2ed55b501236a090539a76d8a3df32a55bb249f08ddfdbef8c9fad16 SHA512 c01d701cad38cbc03eb154e4e7357c9ccda6fce24b38bb04fe20a4a00188514e5c94a49fb23fc0c3eac6b44a786e4fa6d6a87fe87736eb6088ca0d3e3698ba49
diff --git a/app-crypt/archlinux-keyring/archlinux-keyring-20240313.ebuild b/app-crypt/archlinux-keyring/archlinux-keyring-20240313.ebuild
deleted file mode 100644
index 572c393..0000000
--- a/app-crypt/archlinux-keyring/archlinux-keyring-20240313.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="GnuPG keyring of Archlinux developer keys"
-HOMEPAGE="https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/releases"
-SRC_URI="https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/releases/${PV}/downloads/archlinux-keyring-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="app-crypt/sequoia-sq"
-
-src_prepare() {
-	default
-
-	# On non-systemd installations the service files are thrown
-	# directly into /. Hard-code the path as a quick and dirty solution.
-	# If it breaks for someone else, please complain, too and I'll revert it.
-	sed -i "s#\$\(shell pkgconf --variable systemd_system_unit_dir systemd\)#/usr/lib/systemd/system#" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This package only installs the keyring files while sys-apps/pacman"
-	einfo "initializes these keyrings to actually use it. This is a different"
-	einfo "behaviour from Archlinux, but is necessary to avoid circular deps."
-	einfo ""
-}
diff --git a/app-crypt/archlinux-keyring/metadata.xml b/app-crypt/archlinux-keyring/metadata.xml
deleted file mode 100644
index 3351e40..0000000
--- a/app-crypt/archlinux-keyring/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nils.freydank@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index bdee332..619117b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -5,15 +5,6 @@
 # <reason>
 # Removal after <LANG=C date -u -d1month "+%Y-%m-%d">.
 
-# Nils Freydank <nils.freydank@posteo.de> (2024-11-24)
-# Pacman 7.x is out, I don't have time to do the bump.
-# Besides, I don't use it anymore.
-# 2024-12-05: Adding archlinux-keyring.
-# Removal after 2025-01-05.
-app-crypt/archlinux-keyring
-sys-apps/pacman
-sys-apps/pacman-mirrorlist
-
 # Nils Freydank <nils.freydank@posteo.de> (2024-12-08)
 # I don't use the software anymore.
 # Open issues:
diff --git a/sys-apps/pacman-mirrorlist/Manifest b/sys-apps/pacman-mirrorlist/Manifest
deleted file mode 100644
index 75857dd..0000000
--- a/sys-apps/pacman-mirrorlist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pacman-mirrorlist-20230820 51403 BLAKE2B 7053f5efd59b03759a51ff723eeaab60ad123a76b8a8a05d1620bbe21813a9188fd83eb2f079da77a0243efd331648cc784f7fd5cd845de3ff316da1f3ebc709 SHA512 2347bcca1e4282d287dc142be8cee556e10a14a790a91ce1b408397b733e36bdef1a41442eee899050029d51b6cd4622f4b9fa23b3af8bceeee9623a9ab4fe7b
diff --git a/sys-apps/pacman-mirrorlist/metadata.xml b/sys-apps/pacman-mirrorlist/metadata.xml
deleted file mode 100644
index 3351e40..0000000
--- a/sys-apps/pacman-mirrorlist/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nils.freydank@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/pacman-mirrorlist/pacman-mirrorlist-20230820.ebuild b/sys-apps/pacman-mirrorlist/pacman-mirrorlist-20230820.ebuild
deleted file mode 100644
index 159c57d..0000000
--- a/sys-apps/pacman-mirrorlist/pacman-mirrorlist-20230820.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-COMMIT_ID="6e4f5b21223bd655f539d8256deed86d425d383f"
-
-DESCRIPTION="Repository list for Archlinux's binary package manager"
-HOMEPAGE="https://archlinux.org/mirrorlist/ https://archlinux.org/packages/core/any/pacman-mirrorlist/"
-SRC_URI="https://gitlab.archlinux.org/archlinux/packaging/packages/pacman-mirrorlist/-/raw/${COMMIT_ID}/mirrorlist -> ${P}"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT=0
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" mirrorlist
-}
-
-src_install() {
-	insinto etc/pacman.d
-	doins mirrorlist
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This packages installs only a plain list of mirrors for sys-apps/pacman."
-	einfo
-}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
deleted file mode 100644
index 664b16f..0000000
--- a/sys-apps/pacman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pacman-6.1.0.tar.xz 895640 BLAKE2B 6d77eb4b737fcd06e06e71f605f8865f5fb44d57442e1e02a63033b38fc329a989a2a39556b7f2bcf2e59d40101ee3912a6351d8d7a07e5205c28431bca2b6e6 SHA512 da5e78506e0505aac47def4b658a8cd6012be90c7ad7f7343da2edca2df5bd019091eec0a297f79c6f2fc264c139f139175778015d928cace26cb81c87d0477b
diff --git a/sys-apps/pacman/metadata.xml b/sys-apps/pacman/metadata.xml
deleted file mode 100644
index 30009ff..0000000
--- a/sys-apps/pacman/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<bugs-to>mailto:pacman-dev@archlinux.org</bugs-to>
-		<changelog>https://gitlab.archlinux.org/pacman/pacman/-/blob/master/NEWS</changelog>
-		<doc>https://archlinux.org/pacman/</doc>
-	</upstream>
-	<maintainer type="person">
-		<email>nils.freydank@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<slots>
-		<subslots>Reflect major ABI of libalpm.so.</subslots>
-	</slots>
-	<use>
-		<flag name="doc">Install extended documentation using <pkg>app-text/doxygen</pkg>. (Man pages are included by default.)</flag>
-		<flag name="gpg">Enable GPG signature verification using <pkg>app-crypt/gpgme</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/pacman/pacman-6.1.0.ebuild b/sys-apps/pacman/pacman-6.1.0.ebuild
deleted file mode 100644
index 089fef2..0000000
--- a/sys-apps/pacman/pacman-6.1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit meson
-
-DESCRIPTION="Archlinux's binary package manager"
-HOMEPAGE="
-	https://archlinux.org/pacman/
-	https://gitlab.archlinux.org/pacman/pacman/-/releases
-"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.archlinux.org/pacman/pacman"
-else
-	SRC_URI="https://gitlab.archlinux.org/pacman/pacman/-/releases/v${PV}/downloads/${P}.tar.xz"
-	# Do *not* re-add ~x86!
-	# https://www.archlinux.org/news/phasing-out-i686-support/
-	KEYWORDS="-* ~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/10"
-
-IUSE="doc +gpg test"
-DEPEND="
-	app-crypt/archlinux-keyring
-	app-arch/libarchive:=[lzma]
-	gpg? ( app-crypt/gpgme:= )
-	net-misc/curl
-	dev-libs/openssl:0=
-	virtual/libiconv
-	virtual/libintl
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/pacman-mirrorlist
-"
-BDEPEND="
-	app-text/asciidoc
-	doc? ( app-text/doxygen )
-	test? (
-		sys-apps/fakeroot
-		sys-apps/fakechroot
-	)
-"
-
-# Plenty tests fail because we're actually not on a archlinux system.
-RESTRICT="test"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuildstatic=false
-		# Help protect Gentoo users from shooting into their feet.
-		-Droot-dir="${EPREFIX}/var/chroot/archlinux"
-		# full doc with doxygen
-		$(meson_feature doc doxygen)
-		$(meson_feature gpg gpgme)
-	)
-	if [[ "${PV}" == *9999 ]]; then
-		emesonargs+=( -Duse-git-version=true )
-	fi
-	meson_src_configure
-}
-
-pkg_postinst() {
-	/usr/bin/pacman-key --init || die
-	/usr/bin/pacman-key --populate archlinux || die
-
-	einfo
-	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
-	einfo "to avoid breaking Gentoo systems due to oscitancy."
-	einfo "If you prefer another directory, take a look at"
-	einfo "pacman's parameter -r|--root."
-	einfo
-	einfo "You will need to setup at least one mirror in"
-	einfo "   /etc/pacman.d/mirrorlist."
-	einfo "This list is installed by sys-apps/pacman-mirrorlist but can be"
-	einfo "updated manually by fetching from"
-	einfo "https://wiki.archlinux.org/index.php/Mirror"
-	einfo
-	einfo "With pacman 5.1 contrib packages were moved into a seprate package."
-	einfo
-}