commit: c55628818fd51a9f4a7bf6cc1db0d64e8eeb0713 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Thu Jul 15 18:53:06 2021 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Thu Jul 15 19:15:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5562881
x11-misc/caffeine-ng: fix stuff, drop live Closes: https://bugs.gentoo.org/783795 Closes: https://bugs.gentoo.org/783798 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild | 47 +++++++++++++----------- x11-misc/caffeine-ng/caffeine-ng-9999.ebuild | 51 --------------------------- 2 files changed, 26 insertions(+), 72 deletions(-) diff --git a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild index 694fc4962..f727649e5 100644 --- a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild +++ b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild @@ -3,48 +3,53 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 gnome2-utils -DESCRIPTION="Aplication able to temporarily inhibit the screensaver." +DESCRIPTION="Aplication able to temporarily inhibit the screensaver" HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"; -if [[ ${PV} == 9999 ]];then + +if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="${HOMEPAGE}.git" + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; else - SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"; + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"; KEYWORDS="~amd64" fi LICENSE="GPL-3" SLOT="0" -IUSE="" - -DEPEND=" - dev-python/pygobject:3 - >=dev-python/pyxdg-0.25 - dev-python/dbus-python - >=dev-python/docopt-0.6.2 - >=dev-python/setproctitle-1.1.10 - dev-python/setuptools - >=dev-python/wheel-0.29.0 - dev-python/setuptools_scm + +RDEPEND=" + >=dev-python/ewmh-0.1.4[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=dev-python/pyxdg-0.25[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.2[${PYTHON_USEDEP}] + dev-python/pulsectl[${PYTHON_USEDEP}] + >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] dev-libs/libappindicator:3 - x11-libs/gtk+:3 " -RDEPEND="${DEPEND}" -pkg_preinst(){ +src_prepare() { + sed "/wheel/d" -i setup.py || die + sed "s/;TrayIcon;DesktopUtility//" -i share/applications/caffeine.desktop || die + gunzip share/man/man1/caffeine.1.gz || die + + distutils-r1_src_prepare +} + +pkg_preinst() { gnome2_schemas_savelist } -pkg_postinst(){ +pkg_postinst() { gnome2_gconf_install gnome2_schemas_update } -pkg_postrm(){ +pkg_postrm() { gnome2_gconf_uninstall gnome2_schemas_update } diff --git a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild deleted file mode 100644 index f55d9d5dc..000000000 --- a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit distutils-r1 gnome2-utils - -DESCRIPTION="Aplication able to temporarily inhibit the screensaver." -HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"; -if [[ ${PV} == 9999 ]];then - inherit git-r3 - EGIT_REPO_URI="${HOMEPAGE}.git" -else - SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"; - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -DEPEND=" - dev-python/pygobject:3 - >=dev-python/pyxdg-0.25 - dev-python/dbus-python - >=dev-python/docopt-0.6.2 - >=dev-python/setproctitle-1.1.10 - dev-python/setuptools - >=dev-python/wheel-0.29.0 - dev-python/setuptools_scm - dev-libs/libappindicator:3 - x11-libs/gtk+:3 - x11-libs/libnotify -" -RDEPEND="${DEPEND}" - -pkg_preinst(){ - gnome2_schemas_savelist -} - -pkg_postinst(){ - gnome2_gconf_install - gnome2_schemas_update -} - -pkg_postrm(){ - gnome2_gconf_uninstall - gnome2_schemas_update -}
