From 3c078d81929b0bdca5cd1e7f685e2b53dbb54cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 19 Jul 2014 19:49:49 +0200 Subject: [PATCH] Fix some bad usage of $portVersionedName It contains _x86 for gcc4 builds, which is not what we need. --- app-accessibility/espeak/espeak-1.48.04.recipe | 2 +- media-libs/liblo/liblo-0.28.recipe | 4 ++-- media-libs/libmtp/libmtp-1.1.6.recipe | 4 ++-- net-misc/curl/curl-7.37.0.recipe | 2 +- sys-devel/bin86/bin86-0.16.21.recipe | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe index 16651c643..67f44ec87 100644 --- a/app-accessibility/espeak/espeak-1.48.04.recipe +++ b/app-accessibility/espeak/espeak-1.48.04.recipe @@ -35,7 +35,7 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="${portVersionedName}-source" +SOURCE_DIR="espeak-${portVersion}-source" PATCHES="espeak-1.48.04.patch" diff --git a/media-libs/liblo/liblo-0.28.recipe b/media-libs/liblo/liblo-0.28.recipe index 20c26f40a..0dd1acaa2 100644 --- a/media-libs/liblo/liblo-0.28.recipe +++ b/media-libs/liblo/liblo-0.28.recipe @@ -11,13 +11,13 @@ COPYRIGHT=" 2005 Martin Habets 2005-2006 Steve Harris" LICENSE="GNU LGPL v2.1" -SRC_URI="http://prdownloads.sourceforge.net/liblo/$portVersionedName.tar.gz" +SRC_URI="http://prdownloads.sourceforge.net/liblo/liblo-$portVersion.tar.gz" CHECKSUM_SHA256="da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="$portVersionedName.patchset" +PATCHES="liblo-$portVersion.patchset" PROVIDES=" liblo$secondaryArchSuffix = $portVersion compat >= 0 diff --git a/media-libs/libmtp/libmtp-1.1.6.recipe b/media-libs/libmtp/libmtp-1.1.6.recipe index 17b0be066..54cd2e1bf 100644 --- a/media-libs/libmtp/libmtp-1.1.6.recipe +++ b/media-libs/libmtp/libmtp-1.1.6.recipe @@ -14,13 +14,13 @@ COPYRIGHT=" Marcus Meissner " LICENSE="GNU LGPL v2.1" -SRC_URI="http://prdownloads.sourceforge.net/libmtp/$portVersionedName.tar.gz" +SRC_URI="http://prdownloads.sourceforge.net/libmtp/libmtp-$portVersion.tar.gz" CHECKSUM_SHA256="3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="$portVersionedName.patchset" +PATCHES="libmtp-$portVersion.patchset" PROVIDES=" libmtp$secondaryArchSuffix = $portVersion compat >= 1.0 diff --git a/net-misc/curl/curl-7.37.0.recipe b/net-misc/curl/curl-7.37.0.recipe index b5aac30f6..8e8e14178 100644 --- a/net-misc/curl/curl-7.37.0.recipe +++ b/net-misc/curl/curl-7.37.0.recipe @@ -2,7 +2,7 @@ SUMMARY="A commandline-tool and library for downloading data from URLs" HOMEPAGE="http://curl.haxx.se" COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/$portVersionedName.tar.bz2" +SRC_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2" CHECKSUM_SHA256="24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" diff --git a/sys-devel/bin86/bin86-0.16.21.recipe b/sys-devel/bin86/bin86-0.16.21.recipe index a3b60ec9f..a040f116b 100644 --- a/sys-devel/bin86/bin86-0.16.21.recipe +++ b/sys-devel/bin86/bin86-0.16.21.recipe @@ -12,14 +12,14 @@ COPYRIGHT=" 1999 Robert de Bath " LICENSE="GNU GPL v2" -SRC_URI="http://v3.sk/~lkundrak/dev86/$portVersionedName.tar.gz" +SRC_URI="http://v3.sk/~lkundrak/dev86/bin86-$portVersion.tar.gz" CHECKSUM_SHA256="021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738" REVISION="1" ARCHITECTURES="x86 x86_64 x86_gcc2" SECONDARY_ARCHITECTURES="x86" -PATCHES="${portVersionedName}.patchset" +PATCHES="bin86-$portVersion.patchset" PROVIDES=" bin86$secondaryArchSuffix = $portVersion compat >= 0