| 1 |
commit: bc8a806d4063c94b6238e750e6ca06199aedbcb8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 1 13:44:14 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 1 13:47:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8a806d |
| 7 |
|
| 8 |
games-emulation/m64py: Add archive support USE flags and deps |
| 9 |
|
| 10 |
games-emulation/m64py/m64py-0.2.4.ebuild | 30 +++++++++++++++--------------- |
| 11 |
games-emulation/m64py/metadata.xml | 4 ++++ |
| 12 |
2 files changed, 19 insertions(+), 15 deletions(-) |
| 13 |
|
| 14 |
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild |
| 15 |
index f1c389c13b0..7d0c4054d8d 100644 |
| 16 |
--- a/games-emulation/m64py/m64py-0.2.4.ebuild |
| 17 |
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild |
| 18 |
@@ -14,13 +14,26 @@ SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz" |
| 19 |
LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0" |
| 20 |
SLOT="0" |
| 21 |
KEYWORDS="~amd64 ~x86" |
| 22 |
-IUSE="" |
| 23 |
+IUSE="7z rar" |
| 24 |
|
| 25 |
RDEPEND=" |
| 26 |
dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}] |
| 27 |
dev-python/PySDL2[${PYTHON_USEDEP}] |
| 28 |
media-libs/libsdl2[joystick,video] |
| 29 |
- >=games-emulation/mupen64plus-core-2.5:0/2-sdl2" |
| 30 |
+ >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 |
| 31 |
+ 7z? ( |
| 32 |
+ || ( |
| 33 |
+ dev-python/pylzma[${PYTHON_USEDEP}] |
| 34 |
+ app-arch/p7zip |
| 35 |
+ ) |
| 36 |
+ ) |
| 37 |
+ rar? ( |
| 38 |
+ || ( |
| 39 |
+ dev-python/rarfile[${PYTHON_USEDEP}] |
| 40 |
+ app-arch/unrar |
| 41 |
+ app-arch/rar |
| 42 |
+ ) |
| 43 |
+ )" |
| 44 |
|
| 45 |
python_prepare_all() { |
| 46 |
# set the correct search path |
| 47 |
@@ -33,19 +46,6 @@ _EOF_ |
| 48 |
|
| 49 |
pkg_postinst() { |
| 50 |
xdg_desktop_database_update |
| 51 |
- |
| 52 |
- if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then |
| 53 |
- elog |
| 54 |
- elog "In order to gain RAR archive support, please install either app-arch/rar" |
| 55 |
- elog "or app-arch/unrar." |
| 56 |
- fi |
| 57 |
- |
| 58 |
- if ! type -P 7z >/dev/null \ |
| 59 |
- && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then |
| 60 |
- elog |
| 61 |
- elog "In order to gain 7z archive support, please install either app-arch/p7zip" |
| 62 |
- elog "or dev-python/pylzma." |
| 63 |
- fi |
| 64 |
} |
| 65 |
|
| 66 |
pkg_postrm() { |
| 67 |
|
| 68 |
diff --git a/games-emulation/m64py/metadata.xml b/games-emulation/m64py/metadata.xml |
| 69 |
index c8f77563ef6..00cb74caa25 100644 |
| 70 |
--- a/games-emulation/m64py/metadata.xml |
| 71 |
+++ b/games-emulation/m64py/metadata.xml |
| 72 |
@@ -5,6 +5,10 @@ |
| 73 |
<email>mgorny@g.o</email> |
| 74 |
<name>Michał Górny</name> |
| 75 |
</maintainer> |
| 76 |
+ <use> |
| 77 |
+ <flag name='7z'>Ensure support for .7z archives.</flag> |
| 78 |
+ <flag name='rar'>Ensure support for .rar archives.</flag> |
| 79 |
+ </use> |
| 80 |
<upstream> |
| 81 |
<remote-id type="sourceforge">m64py</remote-id> |
| 82 |
</upstream> |
Archives