commit: bc8a806d4063c94b6238e750e6ca06199aedbcb8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 13:44:14 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 13:47:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8a806d
games-emulation/m64py: Add archive support USE flags and deps
games-emulation/m64py/m64py-0.2.4.ebuild | 30 +++++++++++++++---------------
games-emulation/m64py/metadata.xml | 4 ++++
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild
b/games-emulation/m64py/m64py-0.2.4.ebuild
index f1c389c13b0..7d0c4054d8d 100644
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild
@@ -14,13 +14,26 @@ SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="7z rar"
RDEPEND="
dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
dev-python/PySDL2[${PYTHON_USEDEP}]
media-libs/libsdl2[joystick,video]
- >=games-emulation/mupen64plus-core-2.5:0/2-sdl2"
+ >=games-emulation/mupen64plus-core-2.5:0/2-sdl2
+ 7z? (
+ || (
+ dev-python/pylzma[${PYTHON_USEDEP}]
+ app-arch/p7zip
+ )
+ )
+ rar? (
+ || (
+ dev-python/rarfile[${PYTHON_USEDEP}]
+ app-arch/unrar
+ app-arch/rar
+ )
+ )"
python_prepare_all() {
# set the correct search path
@@ -33,19 +46,6 @@ _EOF_
pkg_postinst() {
xdg_desktop_database_update
-
- if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
- elog
- elog "In order to gain RAR archive support, please install
either app-arch/rar"
- elog "or app-arch/unrar."
- fi
-
- if ! type -P 7z >/dev/null \
- && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]";
then
- elog
- elog "In order to gain 7z archive support, please install
either app-arch/p7zip"
- elog "or dev-python/pylzma."
- fi
}
pkg_postrm() {
diff --git a/games-emulation/m64py/metadata.xml
b/games-emulation/m64py/metadata.xml
index c8f77563ef6..00cb74caa25 100644
--- a/games-emulation/m64py/metadata.xml
+++ b/games-emulation/m64py/metadata.xml
@@ -5,6 +5,10 @@
<email>[email protected]</email>
<name>Michał Górny</name>
</maintainer>
+ <use>
+ <flag name='7z'>Ensure support for .7z archives.</flag>
+ <flag name='rar'>Ensure support for .rar archives.</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">m64py</remote-id>
</upstream>
