From 71635d28d6e801aaadf3233d9924d9c4f9230350 Mon Sep 17 00:00:00 2001 From: grepwood Date: Thu, 23 Apr 2020 13:47:20 +0200 Subject: [PATCH] Paying repoman dues, restructuring RDEPEND and BDEPEND, restructuring SRC_URI to conditionals --- games-simulation/clou2/clou2-2.0f-r1.ebuild | 12 ++++--- .../warcraft3/warcraft3-1.26a.ebuild | 33 ++++++++----------- .../lgogdownloader-3.7-r1.ebuild | 2 +- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/games-simulation/clou2/clou2-2.0f-r1.ebuild b/games-simulation/clou2/clou2-2.0f-r1.ebuild index e775563..4128d60 100644 --- a/games-simulation/clou2/clou2-2.0f-r1.ebuild +++ b/games-simulation/clou2/clou2-2.0f-r1.ebuild @@ -10,13 +10,15 @@ LICENSE="neoSoftware" SLOT="0" KEYWORDS="~amd64 ~x86" -BDEPEND=" - media-gfx/icoutils - media-gfx/imagemagick" +BDEPEND+=" + media-gfx/icoutils + media-gfx/imagemagick +" -RDEPEND=" +RDEPEND+=" app-emulation/wine-vanilla[abi_x86_32] - app-arch/unshield" + app-arch/unshield +" DEPEND="${RDEPEND}" diff --git a/games-strategy/warcraft3/warcraft3-1.26a.ebuild b/games-strategy/warcraft3/warcraft3-1.26a.ebuild index 4f60973..64b12aa 100644 --- a/games-strategy/warcraft3/warcraft3-1.26a.ebuild +++ b/games-strategy/warcraft3/warcraft3-1.26a.ebuild @@ -3,20 +3,23 @@ EAPI=7 -DESCRIPTION="" -HOMEPAGE="" +inherit run-wine + +DESCRIPTION="Third installment of Warcraft from Blizzard." +HOMEPAGE="https://www.blizzard.com/games/war3/" LICENSE="Warcraft3_EULA" SLOT="0" KEYWORDS="~amd64 ~x86" -DESCRIPTION="Third installment of Warcraft from Blizzard." -HOMEPAGE="https://www.blizzard.com/games/war3/" -SRC_URI="https://archive.org/download/wc3_patches/Windows/ROC/English/War3ROC_126a_English.exe https://archive.org/download/wc3_patches/Windows/TFT/English/War3TFT_126a_English.exe" +SRC_URI=" + !tft? ( https://archive.org/download/wc3_patches/Windows/ROC/English/War3ROC_126a_English.exe ) + tft? ( https://archive.org/download/wc3_patches/Windows/TFT/English/War3TFT_126a_English.exe ) +" IUSE="tft video_cards_nouveau" -BDEPEND=" +BDEPEND+=" sys-apps/sed sys-apps/coreutils sys-apps/grep @@ -28,12 +31,13 @@ BDEPEND=" x11-misc/xdotool x11-wm/openbox" -RDEPEND=" +RDEPEND+=" app-emulation/wine-vanilla[abi_x86_32,gstreamer] media-plugins/gst-plugins-meta[ffmpeg] media-video/ffmpeg[mp3,xvid] app-emulation/winetricks - app-shells/bash" + app-shells/bash:0 +" DEPEND="${RDEPEND}" @@ -53,26 +57,17 @@ src_unpack() { if use video_cards_nouveau ; then einfo "This USE flag has no effect just yet. This is a placeholder for https://gitlab.com/src_prepare/src_prepare-overlay/-/issues/2" fi - export WINEPREFIX="$(pwd)/wineprefix" - export WINEARCH="win32" - export WINEDEBUG="-all" - export HID_DEVICES=($(ls /dev | grep ^hid | sed 's_^_/dev/_')) export PATCH=1 export TFT=0 if use tft ; then TFT=1 fi - einfo "Adding temporary pseudo rw to /dev/input" - addpredict /dev/input - for hid_device in ${HID_DEVICES[@]}; do - einfo "Adding temporary pseudo rw to ${hid_device}" - addpredict ${hid_device} - done if use tft ; then eerror "The Frozen Throne is not supported yet." die fi - ${FILESDIR}/install_wc3_linux.sh + runwine_prepare_for_wine_run + "${FILESDIR}"/install_wc3_linux.sh einfo "Installation finished." # Everything ready, time to prepare for src_install mv ${WINEPREFIX}/drive_c/Program\ Files/Warcraft\ III warcraft3 diff --git a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild index cfa1648..eac6b15 100644 --- a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild +++ b/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild @@ -20,7 +20,7 @@ RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] ) - portage? ( app-shells/bash + portage? ( app-shells/bash:0 sys-apps/coreutils app-arch/xz-utils app-arch/tar