| 1 |
commit: 47928b5c235ec1d105d64dde8d233df612beaa7c |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Thu Oct 17 00:46:08 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 30 22:19:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47928b5c |
| 7 |
|
| 8 |
app-emulation/dosemu: Fix dependencies. Drop "sndfile" USE flag. Use EAPI="7". |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/697900 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
.../dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 51 ++++++++++++---------- |
| 15 |
1 file changed, 27 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 18 |
index 6eb911c30a1..d6de58d0a4b 100644 |
| 19 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 20 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 2002-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=6 |
| 27 |
+EAPI="7" |
| 28 |
|
| 29 |
inherit autotools eutils flag-o-matic pax-utils toolchain-funcs |
| 30 |
|
| 31 |
@@ -18,30 +18,32 @@ SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz |
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="-* amd64 x86" |
| 35 |
-IUSE="X svga gpm debug alsa sndfile fluidsynth" |
| 36 |
+IUSE="X alsa debug fluidsynth gpm svga" |
| 37 |
|
| 38 |
-RDEPEND="X? ( x11-libs/libX11 |
| 39 |
- x11-libs/libXxf86vm |
| 40 |
- x11-libs/libXau |
| 41 |
- x11-libs/libXext |
| 42 |
- x11-libs/libXdmcp |
| 43 |
- x11-apps/xset |
| 44 |
- x11-apps/xlsfonts |
| 45 |
+BDEPEND="app-arch/unzip |
| 46 |
+ X? ( |
| 47 |
x11-apps/bdftopcf |
| 48 |
- >=x11-apps/mkfontscale-1.2.0 ) |
| 49 |
- svga? ( media-libs/svgalib ) |
| 50 |
- gpm? ( sys-libs/gpm ) |
| 51 |
+ >=x11-apps/mkfontscale-1.2.0 |
| 52 |
+ )" |
| 53 |
+COMMON_DEPEND="media-libs/libsdl |
| 54 |
+ >=sys-libs/slang-1.4 |
| 55 |
+ X? ( |
| 56 |
+ x11-libs/libX11 |
| 57 |
+ x11-libs/libXext |
| 58 |
+ x11-libs/libXxf86vm |
| 59 |
+ ) |
| 60 |
alsa? ( media-libs/alsa-lib ) |
| 61 |
- sndfile? ( media-libs/libsndfile ) |
| 62 |
- fluidsynth? ( media-sound/fluidsynth |
| 63 |
- media-sound/fluid-soundfont ) |
| 64 |
- media-libs/libsdl |
| 65 |
- >=sys-libs/slang-1.4" |
| 66 |
- |
| 67 |
-DEPEND="${RDEPEND} |
| 68 |
- app-arch/unzip |
| 69 |
- X? ( x11-base/xorg-proto ) |
| 70 |
- >=sys-devel/autoconf-2.57" |
| 71 |
+ fluidsynth? ( |
| 72 |
+ media-sound/fluid-soundfont |
| 73 |
+ media-sound/fluidsynth |
| 74 |
+ ) |
| 75 |
+ gpm? ( sys-libs/gpm ) |
| 76 |
+ svga? ( media-libs/svgalib )" |
| 77 |
+# sndfile? ( media-libs/libsndfile ) |
| 78 |
+DEPEND="${COMMON_DEPEND} |
| 79 |
+ X? ( x11-base/xorg-proto )" |
| 80 |
+RDEPEND="${COMMON_DEPEND} |
| 81 |
+ X? ( x11-apps/xset )" |
| 82 |
|
| 83 |
S="${WORKDIR}/${PN}-code-${COMMIT}" |
| 84 |
|
| 85 |
@@ -79,13 +81,14 @@ src_configure() { |
| 86 |
fi |
| 87 |
fi |
| 88 |
|
| 89 |
+ # sndfile support is unconditionally disabled in src/plugin/sndfile/snd_o_wav.c |
| 90 |
econf $(use_with X x) \ |
| 91 |
$(use_with svga svgalib) \ |
| 92 |
$(use_enable debug) \ |
| 93 |
$(use_with gpm) \ |
| 94 |
$(use_with alsa) \ |
| 95 |
- $(use_with sndfile) \ |
| 96 |
$(use_with fluidsynth) \ |
| 97 |
+ --without-sndfile \ |
| 98 |
--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \ |
| 99 |
--sysconfdir="${EPREFIX}"/etc/dosemu/ \ |
| 100 |
--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
Archives