diff --git a/dev-libs/icu/icu-55.1.recipe b/dev-libs/icu/icu55-55.1.recipe similarity index 95% rename from dev-libs/icu/icu-55.1.recipe rename to dev-libs/icu/icu55-55.1.recipe index 4d72d7700..877076f12 100644 --- a/dev-libs/icu/icu-55.1.recipe +++ b/dev-libs/icu/icu55-55.1.recipe @@ -41,7 +41,7 @@ wrapping when displaying the text." HOMEPAGE="http://www.icu-project.org" COPYRIGHT="1995-2015 IBM Corporation and others." LICENSE="ICU" -REVISION="6" +REVISION="1" SOURCE_URI="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-src.tgz" SOURCE_URI_2="http://www.iana.org/time-zones/repository/releases/tzdata2015g.tar.gz#noarchive" SOURCE_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-data.zip#noarchive" @@ -60,7 +60,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - icu$secondaryArchSuffix = $portVersion compat >= 55 + icu55$secondaryArchSuffix = $portVersion compat >= 55 lib:libicudata$secondaryArchSuffix = $portVersion compat >= 55 lib:libicui18n$secondaryArchSuffix = $portVersion compat >= 55 lib:libicuio$secondaryArchSuffix = $portVersion compat >= 55 @@ -79,7 +79,7 @@ REQUIRES+=" fi PROVIDES_devel=" - icu${secondaryArchSuffix}_devel = $portVersion + icu55${secondaryArchSuffix}_devel = $portVersion cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 55 devel:libicudata${secondaryArchSuffix} = $portVersion compat >= 55 devel:libicui18n${secondaryArchSuffix} = $portVersion compat >= 55 @@ -91,7 +91,11 @@ PROVIDES_devel=" devel:libicuuc${secondaryArchSuffix} = $portVersion compat >= 55 " REQUIRES_devel=" - icu${secondaryArchSuffix} == $portVersion base + icu55${secondaryArchSuffix} == $portVersion base + " +CONFLICTS_devel=" + icu${secondaryArchSuffix}_devel + icu54${secondaryArchSuffix}_devel " BUILD_REQUIRES="