[gentoo-commits] proj/portage:master commit in: bin/, /

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

commit:     861141ff3335d8096a6bc869a59ebc346af65820
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 20:34:40 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 05:01:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=861141ff

deprecated-path: Drop unused script

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

 NEWS                |  2 ++
 bin/deprecated-path | 28 ----------------------------
 setup.py            |  4 +---
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/NEWS b/NEWS
index 564e00cfb..505fde7c6 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ Cleanups:
 * Move the internal portageq wrapper script out of the ebuild-helpers
   directory.
 
+* Drop unused deprecated-path script.
+
 portage-3.0.47 (2023-04-30)
 --------------
 

diff --git a/bin/deprecated-path b/bin/deprecated-path
deleted file mode 100755
index dba39125f..000000000
--- a/bin/deprecated-path
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author:
-#
-
-source /lib/gentoo/functions.sh
-
-scriptpath=${BASH_SOURCE[0]}
-scriptname=${scriptpath##*/}
-
-IFS=':'
-
-for path in ${PATH}; do
-	[[ -x ${path}/${scriptname} ]] || continue
-	[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue
-
-	unset IFS
-	eerror "Deprecation warning: Calling ${scriptname} from wrong path: '${scriptpath}'"
-	eerror "Correct path should be '${path}/${scriptname}', Please correct your scripts or file a bug with the maintainer..."
-	exec "${path}/${scriptname}" "$@"
-done
-
-unset IFS
-
-eerror "ERROR: portage file: deprecated-path: Failed to locate ${scriptname} in PATH"
-eerror "PATH: ${PATH}"
-exit 1

diff --git a/setup.py b/setup.py
index d4c572f3a..066365af0 100755
--- a/setup.py
+++ b/setup.py
@@ -731,8 +731,7 @@ def find_packages():
 def find_scripts():
     for dirpath, _dirnames, filenames in os.walk("bin"):
         for f in filenames:
-            if f not in ["deprecated-path"]:
-                yield os.path.join(dirpath, f)
+            yield os.path.join(dirpath, f)
 
 
 def get_manpages():
@@ -844,7 +843,6 @@ setup(
             ],
             ["$portage_setsdir", ["cnf/sets/portage.conf"]],
             ["$docdir", ["NEWS", "RELEASE-NOTES"]],
-            ["$portage_base/bin", ["bin/deprecated-path"]],
             ["$portage_confdir/repo.postsync.d", ["cnf/repo.postsync.d/example"]],
         ],
         [