gentoo resync : 25.08.2020

5 files changed, 40 insertions, 192 deletions

diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 2697dd0284fd..8628e9d7ce7f 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,6 +1,3 @@
-AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
-DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
-DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
-EBUILD sunflower-0.2_alpha59.ebuild 2179 BLAKE2B 9190ab3dc2703b4dd1b56e3a3bd0067335d9497a4be13e8a343355c7d16d2fe3608b21a6ca1e5b4b3e3de302de79779e3a5a8436903de14a582222e396e86369 SHA512 eb5ca2f8be41572ba390286c60c687aa6b91c48bb1babdf8535e92fc1a93f496d4174e352593bb07385a9df550893a23700e0ae91f83171355f1dd7ba4f720eb
-EBUILD sunflower-0.3.61.ebuild 2247 BLAKE2B 2ed58a4bd560cd12594c7b366c593831b16c06ff54c41cda233b42fb4ec612430748089fe946c4f7b5dafc7913f6c3c827a71c8ea718a5b708ec3d6b352b5cc3 SHA512 d9134e077c77b072f1bbcb95d672d06e669f3d38b155d4f53474f3f9b9364081b0dac992e2a1f63436d4b0b269ba456fa79675bb62f59bcaaecbcd060cd7055b
+DIST sunflower-0.4_p20200716.tar.xz 830248 BLAKE2B 673b320bf08c0e0600fae06a531f75403b0e76bd8a267918986da84537a5213f0a1d99c9de74820f15652b80959e9029566f4611138893f08919f389a66a8032 SHA512 0e30bbadb3d60a64e2a2b629104c2a3ad88d997d581c1c76ef593afa1d3c48aafd185b4cd36da25bed5c3e9b9d1389f0709aaa40e796e883dccfe71b214620ed
+EBUILD sunflower-0.4_p20200716-r1.ebuild 818 BLAKE2B fde070e88b7ff643158e4de317ed9693b2559078f51557a7105c74541c019dd65e7e3193bb05163ddcda213111a1d58939255c54b8d702078f3ce836c9bff01d SHA512 06a378e03f8c2a67cd9b5c93a434b943022a1262ed00e47868ba7e190cbae6cbfab2f5828589ea40a56ba6b279b48a123f61ab9df72cfda886e683a8cf161467
 MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/files/sunflower b/x11-misc/sunflower/files/sunflower
deleted file mode 100644
index 192d4b99e1ae..000000000000
--- a/x11-misc/sunflower/files/sunflower
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-import os
-os.chdir("@SITEDIR@")
-import sunflower.Sunflower
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
deleted file mode 100644
index d1fea9c5a0c7..000000000000
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils python-r1 xdg-utils
-
-MY_PN="Sunflower"
-DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
-HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	https://sunflower-fm.org/"
-SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygtk-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	default
-	find "${S}" -name "*.py[co]" -delete || die
-	find "${S}"/translations -name "*.po" -delete || die
-	rm "${S}"/translations/${PN}.pot || die
-
-	sed -i \
-		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
-		${MY_PN}.py || die
-}
-
-src_install() {
-	touch __init__.py || die
-	installme() {
-		# install modules
-		python_moduleinto ${PN}
-		python_domodule images application ${MY_PN}.py \
-			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
-
-		# generate and install startup scripts
-		sed \
-			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
-			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
-		python_doscript "${WORKDIR}"/${PN}
-	}
-
-	# install for all enabled implementations
-	python_foreach_impl installme
-
-	insinto /usr/share/locale
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/translations ; echo *) ; do
-			if has ${i} ${LINGUAS} ; then
-				doins -r "${S}"/translations/${i}
-			fi
-		done
-	else
-		doins -r "${S}"/translations/*
-	fi
-
-	newicon -s 64 images/${PN}_64.png ${PN}.png
-	doicon -s scalable images/${PN}.svg
-	newmenu ${MY_PN}.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	# TODO: better description
-	elog "optional dependencies:"
-	elog "  dev-python/libgnome-python"
-	elog "  media-libs/mutagen"
-	elog "  x11-libs/vte:0[python] (terminal support)"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
deleted file mode 100644
index e632d371fb25..000000000000
--- a/x11-misc/sunflower/sunflower-0.3.61.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 xdg-utils desktop
-
-MY_PN="${PN^}"
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
-HOMEPAGE="https://github.com/MeanEYE/Sunflower
-	https://sunflower-fm.org/"
-SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygtk-2.15.0:2[${PYTHON_USEDEP}]
-	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_PN}-$MY_PV
-
-src_prepare() {
-	default
-	find "${S}"/translations -name "*.po" -delete || die
-	rm "${S}"/translations/${PN}.pot || die
-
-	sed -i \
-		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
-		${MY_PN}.py || die
-}
-
-src_install() {
-	touch __init__.py || die
-	installme() {
-		# install modules
-		python_moduleinto ${PN}
-		python_domodule images application ${MY_PN}.py \
-			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
-
-		# generate and install startup scripts
-		sed \
-			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
-			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
-		python_doscript "${WORKDIR}"/${PN}
-	}
-
-	# install for all enabled implementations
-	python_foreach_impl installme
-
-	insinto /usr/share/locale
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(cd "${S}"/translations ; echo *) ; do
-			if has ${i} ${LINGUAS} ; then
-				doins -r "${S}"/translations/${i}
-			fi
-		done
-	else
-		doins -r "${S}"/translations/*
-	fi
-
-	newicon -s 64 images/${PN}_64.png ${PN}.png
-	doicon -s scalable images/${PN}.svg
-	newmenu ${MY_PN}.desktop ${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	# TODO: better description
-	elog "optional dependencies:"
-	elog "  dev-python/libgnome-python"
-	elog "  media-libs/mutagen"
-	elog "  x11-libs/vte:0[python] (terminal support)"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
new file mode 100644
index 000000000000..18bd85007e5f
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+	https://sunflower-fm.org/"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}