From d4a208ec63b63b4d2960c7511965512a38fa84a8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 24 Apr 2020 12:44:41 -0500 Subject: app-emulation/virt-manager: fix installation files Bug: https://bugs.gentoo.org/717886 Closes: https://bugs.gentoo.org/718670 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthias Maier --- .../virt-manager/virt-manager-2.2.1-r2.ebuild | 95 --------------------- .../virt-manager/virt-manager-2.2.1-r3.ebuild | 99 ++++++++++++++++++++++ .../virt-manager/virt-manager-9999.ebuild | 4 + 3 files changed, 103 insertions(+), 95 deletions(-) delete mode 100644 app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild create mode 100644 app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild (limited to 'app-emulation/virt-manager') diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild deleted file mode 100644 index 229e27a53dfd..000000000000 --- a/app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_SINGLE_IMPL=1 - -DISTUTILS_USE_SETUPTOOLS=no -inherit gnome2 distutils-r1 - -DESCRIPTION="A graphical tool for administering virtual machines" -HOMEPAGE="http://virt-manager.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - SRC_URI="" - KEYWORDS="amd64 x86" - EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" -else - SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~ppc64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="gtk policykit sasl" - -RDEPEND="!app-emulation/virtinst - ${PYTHON_DEPS} - app-cdr/cdrtools - >=app-emulation/libvirt-glib-1.0.0[introspection] - $(python_gen_cond_dep ' - dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}] - dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] - dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - ') - >=sys-libs/libosinfo-0.2.10[introspection] - gtk? ( - gnome-base/dconf - >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] - net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] - net-misc/x11-ssh-askpass - x11-libs/gtk+:3[introspection] - x11-libs/gtksourceview:4[introspection] - x11-libs/vte:2.91[introspection] - policykit? ( sys-auth/polkit[introspection] ) - ) -" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/intltool -" - -DOCS=( README.md NEWS.md ) - -src_prepare() { - distutils-r1_src_prepare -} - -python_configure() { - esetup.py configure \ - --default-graphics=spice -} - -src_install() { - local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) - distutils-r1_src_install - - python_fix_shebang "${ED}"/usr/share/virt-manager -} - -pkg_preinst() { - if use gtk; then - gnome2_pkg_preinst - - cd "${ED}" - export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) - else - rm -rf "${ED}/usr/share/virt-manager/virtManager" - rm -f "${ED}/usr/share/virt-manager/virt-manager" - rm -rf "${ED}/usr/share/virt-manager/ui/" - rm -rf "${ED}/usr/share/virt-manager/icons/" - rm -rf "${ED}/usr/share/man/man1/virt-manager.1*" - rm -rf "${ED}/usr/share/icons/" - rm -rf "${ED}/usr/share/applications/virt-manager.desktop" - rm -rf "${ED}/usr/bin/virt-manager" - fi -} - -pkg_postinst() { - use gtk && gnome2_pkg_postinst -} diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild new file mode 100644 index 000000000000..091a92f50ba5 --- /dev/null +++ b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7} ) +DISTUTILS_SINGLE_IMPL=1 + +DISTUTILS_USE_SETUPTOOLS=no +inherit gnome2 distutils-r1 + +DESCRIPTION="A graphical tool for administering virtual machines" +HOMEPAGE="http://virt-manager.org" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + SRC_URI="" + KEYWORDS="amd64 x86" + EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" +else + SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~ppc64 x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="gtk policykit sasl" + +RDEPEND="!app-emulation/virtinst + ${PYTHON_DEPS} + app-cdr/cdrtools + >=app-emulation/libvirt-glib-1.0.0[introspection] + $(python_gen_cond_dep ' + dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') + >=sys-libs/libosinfo-0.2.10[introspection] + gtk? ( + gnome-base/dconf + >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] + net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] + net-misc/x11-ssh-askpass + x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:4[introspection] + x11-libs/vte:2.91[introspection] + policykit? ( sys-auth/polkit[introspection] ) + ) +" +DEPEND="${RDEPEND} + dev-lang/perl + dev-util/intltool +" + +DOCS=( README.md NEWS.md ) + +src_prepare() { + distutils-r1_src_prepare +} + +python_configure() { + esetup.py configure \ + --default-graphics=spice +} + +python_install() { + esetup.py install +} + +src_install() { + local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) + distutils-r1_src_install + + python_fix_shebang "${ED}"/usr/share/virt-manager +} + +pkg_preinst() { + if use gtk; then + gnome2_pkg_preinst + + cd "${ED}" + export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) + else + rm -rf "${ED}/usr/share/virt-manager/virtManager" + rm -f "${ED}/usr/share/virt-manager/virt-manager" + rm -rf "${ED}/usr/share/virt-manager/ui/" + rm -rf "${ED}/usr/share/virt-manager/icons/" + rm -rf "${ED}/usr/share/man/man1/virt-manager.1*" + rm -rf "${ED}/usr/share/icons/" + rm -rf "${ED}/usr/share/applications/virt-manager.desktop" + rm -rf "${ED}/usr/bin/virt-manager" + fi +} + +pkg_postinst() { + use gtk && gnome2_pkg_postinst +} diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index bba518fa336b..b7b613db8926 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -66,6 +66,10 @@ python_configure() { --default-graphics=spice } +python_install() { + esetup.py install +} + src_install() { local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) distutils-r1_src_install -- cgit v1.2.3-65-gdbad