[gentoo-commits] repo/gentoo:master commit in: app-admin/eselect/, app-admin/eselect/files/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     0fcfe6d7d82c2327faa92252c400ef768dc281ef
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 05:54:36 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 05:54:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcfe6d7

app-admin/eselect: drop 1.4.22-r1

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-admin/eselect/Manifest                         |  1 -
 app-admin/eselect/eselect-1.4.22-r1.ebuild         | 60 ----------------------
 .../eselect/files/eselect-1.4.22-env-module.patch  | 19 -------
 3 files changed, 80 deletions(-)

diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 1d143b6bd8fc..9c9b1e0d75aa 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,2 +1 @@
-DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
 DIST eselect-1.4.25.tar.xz 184300 BLAKE2B 630fe27338bee0c921a2f90e42d0a8abbb60a141a82bc2c4e7cf43d37582c24b06986ae1cbd341f8d3e69d011edc6c29675bf91ceaf1dcbc2593086f451b8f5f SHA512 98f2752d61e2c31ff6d735d5df0e7d98c3cc51d51c26b71d796948b141ccbc017002185022e6e1e48660ae0012bfc9cd383dd5ac50f644b35bb0893b9271121b

diff --git a/app-admin/eselect/eselect-1.4.22-r1.ebuild b/app-admin/eselect/eselect-1.4.22-r1.ebuild
deleted file mode 100644
index 6b4aa0da4bcc..000000000000
--- a/app-admin/eselect/eselect-1.4.22-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs vim-syntax"
-
-DEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)"
-RDEPEND="${DEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-BDEPEND="doc? ( dev-python/docutils )"
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-PATCHES=( "${FILESDIR}/${P}-env-module.patch" )
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}

diff --git a/app-admin/eselect/files/eselect-1.4.22-env-module.patch b/app-admin/eselect/files/eselect-1.4.22-env-module.patch
deleted file mode 100644
index 54eb20692d14..000000000000
--- a/app-admin/eselect/files/eselect-1.4.22-env-module.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-env.eselect: More robust file type detection
-https://bugs.gentoo.org/908401
-
---- a/modules/env.eselect
-+++ b/modules/env.eselect
-@@ -46,9 +46,10 @@ is_envfile() {
- 	[[ -n ${envfile##*~} ]] || return 1
- 	[[ ${envfile##*.} != bak ]] || return 1
- 
--	mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
--		| cut -d ' ' -f 2 | sed -e 's/;$//')
--	if ! has ${mime} ${MIME_WHITELIST}; then
-+	mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
-+		|| die "'file' command failed"
-+	mime=${mime%%;*}
-+	if ! has "${mime}" ${MIME_WHITELIST}; then
- 		echo "Skipping non-text file ${envfile}."
- 		return 1
- 	fi