6 files changed, 154 insertions, 133 deletions
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index efdc9cb7b776..fd17c107b494 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1 +1,3 @@
 DIST catfish-1.4.13.tar.bz2 221999 BLAKE2B b487947954832c691a5a1b3bd2a49e7ae1aedecbe2084b86b9ae1c8bd7c95f6d3746f80723d351bed3abac0e2396fcce134072345a908f5ba9f0dfebdd95108f SHA512 a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886
+DIST catfish-4.15.0.tar.bz2 256897 BLAKE2B 98ac6c1f5af7a48276438c08e0259eaae7f9a7d4f043a8c89b945d1d0a18e10f2faf3a210363cf46a97b4becc7492a6c1ce6b8e499b168729ce18ff80d5da828 SHA512 d2415194e3d803a99b1a0d80763db6f4e95c810d2bc679057e54105bb906ec1a0de32b64d8c0b2a36aad11d689401111c3466b1e8ad41760f4d6b67f979a81a3
+DIST catfish-4.16.0.tar.bz2 261252 BLAKE2B b495814857cb551c00dff8b92d2b24df876b1ab269bcb0ba468c791b97f3e962b875c5a687010472c5d47719475c99131d5ee6df3ce642af147b199976eb3538 SHA512 926318d3b2387386a5141347cf23b7e1505f83c48dac3804dc9c51aeeede2ef71d6d70e61bd5f608145249ccb4d3d87662bdab0c0a88dc69608b2edee55ddc19
diff --git a/dev-util/catfish/catfish-1.4.13-r1.ebuild b/dev-util/catfish/catfish-1.4.13-r1.ebuild
deleted file mode 100644
index 141b408c4cac..000000000000
--- a/dev-util/catfish/catfish-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	virtual/freedesktop-icon-theme
-"
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-catfish_python_install() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local args=( "${@}" )
-
-	# enable compilation for the install phase.
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# python likes to compile any module it sees, which triggers sandbox
-	# failures if some packages haven't compiled their modules yet.
-	addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
-	addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}"
-	addpredict /usr/lib/pypy2.7
-	addpredict /usr/lib/pypy3.6
-	addpredict /usr/lib/portage/pym
-	addpredict /usr/local # bug 498232
-
-	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		# user may override --install-scripts
-		# note: this is poor but distutils argv parsing is dumb
-		local mydistutilsargs=( "${mydistutilsargs[@]}" )
-		local scriptdir=${EPREFIX}/usr/bin
-
-		# construct a list of mydistutilsargs[0] args[0] args[1]...
-		local arg arg_vars
-		[[ ${mydistutilsargs[@]} ]] && eval arg_vars+=(
-			'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']'
-		)
-		[[ ${args[@]} ]] && eval arg_vars+=(
-			'args['{0..$(( ${#args[@]} - 1 ))}']'
-		)
-
-		set -- "${arg_vars[@]}"
-		while [[ ${@} ]]; do
-			local arg_var=${1}
-			shift
-			local a=${!arg_var}
-
-			case "${a}" in
-				--install-scripts=*)
-					scriptdir=${a#--install-scripts=}
-					unset "${arg_var}"
-					;;
-				--install-scripts)
-					scriptdir=${!1}
-					unset "${arg_var}" "${1}"
-					shift
-					;;
-			esac
-		done
-	fi
-
-	local root=${D%/}/_${EPYTHON}
-	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}
-
-	esetup.py install --root="${root}" "${args[@]}"
-
-	local forbidden_package_names=( examples test tests .pytest_cache )
-	local p
-	for p in "${forbidden_package_names[@]}"; do
-		if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
-			die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
-		fi
-	done
-
-	local shopt_save=$(shopt -p nullglob)
-	shopt -s nullglob
-	local pypy_dirs=(
-		"${root}/usr/$(get_libdir)"/pypy*/share
-		"${root}/usr/lib"/pypy*/share
-	)
-	${shopt_save}
-
-	if [[ -n ${pypy_dirs} ]]; then
-		die "Package installs 'share' in PyPy prefix, see bug #465546."
-	fi
-
-	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
-		multibuild_merge_root "${root}" "${D%/}"
-	fi
-}
-
-python_install() {
-	catfish_python_install
-	python_optimize
-	rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.13.ebuild b/dev-util/catfish/catfish-1.4.13.ebuild
new file mode 100644
index 000000000000..e13674989ff3
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-4.15.0.ebuild b/dev-util/catfish/catfish-4.15.0.ebuild
new file mode 100644
index 000000000000..76db5889077b
--- /dev/null
+++ b/dev-util/catfish/catfish-4.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/pango[introspection]
+	>=xfce-base/xfconf-4.14[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-4.16.0.ebuild b/dev-util/catfish/catfish-4.16.0.ebuild
new file mode 100644
index 000000000000..2753ce0adeaa
--- /dev/null
+++ b/dev-util/catfish/catfish-4.16.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/pango[introspection]
+	>=xfce-base/xfconf-4.14[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index e699a03d7679..2411066c7917 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/metadata.xml
@@ -4,5 +4,5 @@
 	<maintainer type="project">
 		<email>xfce@gentoo.org</email>
 	</maintainer>
-	<origin>calculatelinux-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>