| 1 |
commit: 63b971281356305f04ecdd476156cf6968fe30dd |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 29 22:02:47 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 29 22:04:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b97128 |
| 7 |
|
| 8 |
app-emulation/vice: Sort USE, DEPENDs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/vice/vice-3.1.ebuild | 49 ++++++++++++++++++-------------------- |
| 14 |
1 file changed, 23 insertions(+), 26 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild |
| 17 |
index d7267e2b207..e5b69137fe9 100644 |
| 18 |
--- a/app-emulation/vice/vice-3.1.ebuild |
| 19 |
+++ b/app-emulation/vice/vice-3.1.ebuild |
| 20 |
@@ -5,34 +5,30 @@ EAPI=6 |
| 21 |
|
| 22 |
inherit autotools flag-o-matic toolchain-funcs |
| 23 |
|
| 24 |
-DESCRIPTION="The Versatile Commodore 8-bit Emulator" |
| 25 |
+DESCRIPTION="Versatile Commodore 8-bit Emulator" |
| 26 |
HOMEPAGE="http://vice-emu.sourceforge.net/" |
| 27 |
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz" |
| 28 |
|
| 29 |
LICENSE="GPL-2+" |
| 30 |
SLOT="0" |
| 31 |
KEYWORDS="amd64 x86" |
| 32 |
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte zlib" |
| 33 |
+IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte Xaw3d zlib" |
| 34 |
|
| 35 |
# upstream says gtk3 and sdl2 shouldn't be exposed yet. |
| 36 |
#REQUIRED_USE="?? ( gtk2 gtk3 sdl )" |
| 37 |
REQUIRED_USE="?? ( gtk sdl )" |
| 38 |
|
| 39 |
-GTK_COMMON=" |
| 40 |
- x11-libs/pango |
| 41 |
- x11-libs/cairo" |
| 42 |
# gtk3? ( |
| 43 |
+# x11-libs/cairo |
| 44 |
# x11-libs/gtk+:3 |
| 45 |
+# x11-libs/pango |
| 46 |
# vte? ( x11-libs/vte:2.90 ) |
| 47 |
-# ${GTK_COMMON} |
| 48 |
# ) |
| 49 |
RDEPEND=" |
| 50 |
+ media-libs/giflib |
| 51 |
virtual/jpeg:0 |
| 52 |
virtual/opengl |
| 53 |
- media-libs/giflib |
| 54 |
alsa? ( media-libs/alsa-lib ) |
| 55 |
- pulseaudio? ( media-sound/pulseaudio ) |
| 56 |
- sdlsound? ( media-libs/libsdl[sound] ) |
| 57 |
ethernet? ( |
| 58 |
>=net-libs/libpcap-0.9.8 |
| 59 |
>=net-libs/libnet-1.1.2.1:1.1 |
| 60 |
@@ -41,17 +37,22 @@ RDEPEND=" |
| 61 |
libav? ( media-video/libav:= ) |
| 62 |
!libav? ( media-video/ffmpeg:= ) |
| 63 |
) |
| 64 |
+ gtk? ( |
| 65 |
+ x11-libs/cairo |
| 66 |
+ x11-libs/gtk+:2 |
| 67 |
+ x11-libs/gtkglext |
| 68 |
+ x11-libs/pango |
| 69 |
+ vte? ( x11-libs/vte:0 ) |
| 70 |
+ ) |
| 71 |
lame? ( media-sound/lame ) |
| 72 |
nls? ( virtual/libintl ) |
| 73 |
png? ( media-libs/libpng:0= ) |
| 74 |
- zlib? ( sys-libs/zlib:= ) |
| 75 |
- sdl? ( |
| 76 |
- media-libs/libsdl[joystick,video] |
| 77 |
- ) |
| 78 |
+ pulseaudio? ( media-sound/pulseaudio ) |
| 79 |
+ sdl? ( media-libs/libsdl[joystick,video] ) |
| 80 |
!sdl? ( |
| 81 |
+ sys-libs/readline:0= |
| 82 |
x11-libs/libX11 |
| 83 |
x11-libs/libXext |
| 84 |
- sys-libs/readline:0= |
| 85 |
fullscreen? ( |
| 86 |
x11-libs/libXrandr |
| 87 |
x11-libs/libXxf86vm |
| 88 |
@@ -65,25 +66,21 @@ RDEPEND=" |
| 89 |
!Xaw3d? ( x11-libs/libXaw ) |
| 90 |
) |
| 91 |
) |
| 92 |
- gtk? ( |
| 93 |
- x11-libs/gtk+:2 |
| 94 |
- x11-libs/gtkglext |
| 95 |
- ${GTK_COMMON} |
| 96 |
- vte? ( x11-libs/vte:0 ) |
| 97 |
- )" |
| 98 |
+ sdlsound? ( media-libs/libsdl[sound] ) |
| 99 |
+ zlib? ( sys-libs/zlib ) |
| 100 |
+" |
| 101 |
DEPEND="${RDEPEND} |
| 102 |
- virtual/pkgconfig |
| 103 |
+ media-libs/fontconfig |
| 104 |
x11-apps/bdftopcf |
| 105 |
x11-apps/mkfontdir |
| 106 |
x11-base/xorg-proto |
| 107 |
- media-libs/fontconfig |
| 108 |
+ virtual/pkgconfig |
| 109 |
nls? ( sys-devel/gettext ) |
| 110 |
- !sdl? ( |
| 111 |
- !gtk? ( |
| 112 |
+ !gtk? ( !sdl? ( |
| 113 |
x11-libs/libICE |
| 114 |
x11-libs/libSM |
| 115 |
- ) |
| 116 |
- )" |
| 117 |
+ ) ) |
| 118 |
+" |
| 119 |
|
| 120 |
PATCHES=( |
| 121 |
"${FILESDIR}"/${PN}-2.4.27-autotools.patch |
Archives