| 1 |
commit: 75173e1f07e816d34bf75066f89265ccda7de1ad |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 3 15:19:02 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 3 15:19:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=75173e1f |
| 7 |
|
| 8 |
dev-libs/icu: migrate to gx86 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/458636 |
| 11 |
|
| 12 |
dev-libs/icu/Manifest | 1 - |
| 13 |
dev-libs/icu/files/icu-58.1-iterator.patch | 127 ------------ |
| 14 |
dev-libs/icu/files/icu-58.1-remove-bashisms.patch | 224 ---------------------- |
| 15 |
dev-libs/icu/files/icu-58.2-darwin.patch | 55 ------ |
| 16 |
dev-libs/icu/icu-58.2.ebuild | 155 --------------- |
| 17 |
dev-libs/icu/metadata.xml | 8 - |
| 18 |
6 files changed, 570 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest |
| 21 |
deleted file mode 100644 |
| 22 |
index dc6f8971f7..0000000000 |
| 23 |
--- a/dev-libs/icu/Manifest |
| 24 |
+++ /dev/null |
| 25 |
@@ -1 +0,0 @@ |
| 26 |
-DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a |
| 27 |
|
| 28 |
diff --git a/dev-libs/icu/files/icu-58.1-iterator.patch b/dev-libs/icu/files/icu-58.1-iterator.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 6f52375eb7..0000000000 |
| 31 |
--- a/dev-libs/icu/files/icu-58.1-iterator.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,127 +0,0 @@ |
| 34 |
-source: http://bugs.icu-project.org/trac/changeset/39484/ |
| 35 |
- |
| 36 |
- |
| 37 |
-Index: icu/common/ulist.c |
| 38 |
-=================================================================== |
| 39 |
---- icu/common/ulist.c (revision 39483) |
| 40 |
-+++ icu/common/ulist.c (revision 39484) |
| 41 |
-@@ -30,5 +30,4 @@ |
| 42 |
- |
| 43 |
- int32_t size; |
| 44 |
-- int32_t currentIndex; |
| 45 |
- }; |
| 46 |
- |
| 47 |
-@@ -52,5 +51,4 @@ |
| 48 |
- newList->tail = NULL; |
| 49 |
- newList->size = 0; |
| 50 |
-- newList->currentIndex = -1; |
| 51 |
- |
| 52 |
- return newList; |
| 53 |
-@@ -81,6 +79,7 @@ |
| 54 |
- p->next->previous = p->previous; |
| 55 |
- } |
| 56 |
-- list->curr = NULL; |
| 57 |
-- list->currentIndex = 0; |
| 58 |
-+ if (p == list->curr) { |
| 59 |
-+ list->curr = p->next; |
| 60 |
-+ } |
| 61 |
- --list->size; |
| 62 |
- if (p->forceDelete) { |
| 63 |
-@@ -151,5 +150,4 @@ |
| 64 |
- list->head->previous = newItem; |
| 65 |
- list->head = newItem; |
| 66 |
-- list->currentIndex++; |
| 67 |
- } |
| 68 |
- |
| 69 |
-@@ -194,5 +192,4 @@ |
| 70 |
- curr = list->curr; |
| 71 |
- list->curr = curr->next; |
| 72 |
-- list->currentIndex++; |
| 73 |
- |
| 74 |
- return curr->data; |
| 75 |
-@@ -210,5 +207,4 @@ |
| 76 |
- if (list != NULL) { |
| 77 |
- list->curr = list->head; |
| 78 |
-- list->currentIndex = 0; |
| 79 |
- } |
| 80 |
- } |
| 81 |
-@@ -273,3 +269,2 @@ |
| 82 |
- return (UList *)(en->context); |
| 83 |
- } |
| 84 |
-- |
| 85 |
-Index: icu/i18n/ucol_res.cpp |
| 86 |
-=================================================================== |
| 87 |
---- icu/i18n/ucol_res.cpp (revision 39483) |
| 88 |
-+++ icu/i18n/ucol_res.cpp (revision 39484) |
| 89 |
-@@ -681,4 +681,5 @@ |
| 90 |
- } |
| 91 |
- memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); |
| 92 |
-+ ulist_resetList(sink.values); // Initialize the iterator. |
| 93 |
- en->context = sink.values; |
| 94 |
- sink.values = NULL; // Avoid deletion in the sink destructor. |
| 95 |
-Index: icu/test/intltest/apicoll.cpp |
| 96 |
-=================================================================== |
| 97 |
---- icu/test/intltest/apicoll.cpp (revision 39483) |
| 98 |
-+++ icu/test/intltest/apicoll.cpp (revision 39484) |
| 99 |
-@@ -82,14 +82,7 @@ |
| 100 |
- col = Collator::createInstance(Locale::getEnglish(), success); |
| 101 |
- if (U_FAILURE(success)){ |
| 102 |
-- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success)); |
| 103 |
-- return; |
| 104 |
-- } |
| 105 |
-- |
| 106 |
-- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success); |
| 107 |
-- if (U_FAILURE(success)){ |
| 108 |
-- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success)); |
| 109 |
-- return; |
| 110 |
-- } |
| 111 |
-- delete kwEnum; |
| 112 |
-+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success)); |
| 113 |
-+ return; |
| 114 |
-+ } |
| 115 |
- |
| 116 |
- col->getVersion(versionArray); |
| 117 |
-@@ -230,4 +223,27 @@ |
| 118 |
- delete aFrCol; |
| 119 |
- delete junk; |
| 120 |
-+} |
| 121 |
-+ |
| 122 |
-+void CollationAPITest::TestKeywordValues() { |
| 123 |
-+ IcuTestErrorCode errorCode(*this, "TestKeywordValues"); |
| 124 |
-+ LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode)); |
| 125 |
-+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) { |
| 126 |
-+ return; |
| 127 |
-+ } |
| 128 |
-+ |
| 129 |
-+ LocalPointer<StringEnumeration> kwEnum( |
| 130 |
-+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode)); |
| 131 |
-+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) { |
| 132 |
-+ return; |
| 133 |
-+ } |
| 134 |
-+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0); |
| 135 |
-+ const char *kw; |
| 136 |
-+ UBool hasStandard = FALSE; |
| 137 |
-+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) { |
| 138 |
-+ if (strcmp(kw, "standard") == 0) { |
| 139 |
-+ hasStandard = TRUE; |
| 140 |
-+ } |
| 141 |
-+ } |
| 142 |
-+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard); |
| 143 |
- } |
| 144 |
- |
| 145 |
-@@ -2467,4 +2483,5 @@ |
| 146 |
- TESTCASE_AUTO_BEGIN; |
| 147 |
- TESTCASE_AUTO(TestProperty); |
| 148 |
-+ TESTCASE_AUTO(TestKeywordValues); |
| 149 |
- TESTCASE_AUTO(TestOperators); |
| 150 |
- TESTCASE_AUTO(TestDuplicate); |
| 151 |
-Index: icu/test/intltest/apicoll.h |
| 152 |
-=================================================================== |
| 153 |
---- icu/test/intltest/apicoll.h (revision 39483) |
| 154 |
-+++ icu/test/intltest/apicoll.h (revision 39484) |
| 155 |
-@@ -36,4 +36,5 @@ |
| 156 |
- */ |
| 157 |
- void TestProperty(/* char* par */); |
| 158 |
-+ void TestKeywordValues(); |
| 159 |
- |
| 160 |
- /** |
| 161 |
|
| 162 |
diff --git a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch |
| 163 |
deleted file mode 100644 |
| 164 |
index ef60ce4569..0000000000 |
| 165 |
--- a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch |
| 166 |
+++ /dev/null |
| 167 |
@@ -1,224 +0,0 @@ |
| 168 |
-diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in |
| 169 |
---- a/config/Makefile.inc.in 2016-09-09 23:28:18.000000000 +0200 |
| 170 |
-+++ b/config/Makefile.inc.in 2016-11-05 19:43:07.688466668 +0100 |
| 171 |
-@@ -124,12 +124,6 @@ |
| 172 |
- # with usually. Many applications will want to add $(ICULIBS_I18N) as well. |
| 173 |
- ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) |
| 174 |
- |
| 175 |
--# Proper echo newline handling is needed in icu-config |
| 176 |
--ECHO_N=@ICU_ECHO_N@ |
| 177 |
--ECHO_C=@ICU_ECHO_C@ |
| 178 |
--# Not currently being used but good to have for proper tab handling |
| 179 |
--ECHO_T=@ICU_ECHO_T@ |
| 180 |
-- |
| 181 |
- ################################################################## |
| 182 |
- ################################################################## |
| 183 |
- # |
| 184 |
-diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom |
| 185 |
---- a/config/icu-config-bottom 2016-09-09 23:28:18.000000000 +0200 |
| 186 |
-+++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 |
| 187 |
-@@ -218,65 +218,65 @@ |
| 188 |
- ;; |
| 189 |
- |
| 190 |
- --cflags) |
| 191 |
-- echo $ECHO_N "${CFLAGS} ${ECHO_C}" |
| 192 |
-+ printf "%s" "${CFLAGS} " |
| 193 |
- ;; |
| 194 |
- |
| 195 |
- --cc) |
| 196 |
-- echo $ECHO_N "${CC} ${ECHO_C}" |
| 197 |
-+ printf "%s" "${CC} " |
| 198 |
- ;; |
| 199 |
- |
| 200 |
- --cxx) |
| 201 |
-- echo $ECHO_N "${CXX} ${ECHO_C}" |
| 202 |
-+ printf "%s" "${CXX} " |
| 203 |
- ;; |
| 204 |
- |
| 205 |
- --cxxflags) |
| 206 |
-- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" |
| 207 |
-+ printf "%s" "${CXXFLAGS} " |
| 208 |
- ;; |
| 209 |
- |
| 210 |
- --cppflags) |
| 211 |
- # Don't echo the -I. - it's unneeded. |
| 212 |
-- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' |
| 213 |
-+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' |
| 214 |
- ;; |
| 215 |
- |
| 216 |
- --cppflags-searchpath) |
| 217 |
-- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" |
| 218 |
-+ printf "%s" "-I${prefix}/include " |
| 219 |
- ;; |
| 220 |
- |
| 221 |
- --cppflags-dynamic) |
| 222 |
-- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" |
| 223 |
-+ printf "%s" "${SHAREDLIBCPPFLAGS} " |
| 224 |
- ;; |
| 225 |
- |
| 226 |
- --cxxflags-dynamic) |
| 227 |
-- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" |
| 228 |
-+ printf "%s" "${SHAREDLIBCXXFLAGS} " |
| 229 |
- ;; |
| 230 |
- |
| 231 |
- --cflags-dynamic) |
| 232 |
-- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" |
| 233 |
-+ printf "%s" "${SHAREDLIBCFLAGS} " |
| 234 |
- ;; |
| 235 |
- |
| 236 |
- --ldflags-system) |
| 237 |
-- echo $ECHO_N "${LIBS} ${ECHO_C}" |
| 238 |
-+ printf "%s" "${LIBS} " |
| 239 |
- ;; |
| 240 |
- |
| 241 |
- --ldflags) |
| 242 |
-- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" |
| 243 |
-+ printf "%s" "${LDFLAGS} ${ICULIBS} " |
| 244 |
- # $RPATH_LDFLAGS |
| 245 |
- ;; |
| 246 |
- |
| 247 |
- --ldflags-libsonly) |
| 248 |
-- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" |
| 249 |
-+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " |
| 250 |
- ;; |
| 251 |
- |
| 252 |
- --ldflags-icuio) |
| 253 |
-- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" |
| 254 |
-+ printf "%s" " ${ICULIBS_ICUIO} " |
| 255 |
- ;; |
| 256 |
- |
| 257 |
- --ldflags-obsolete) |
| 258 |
-- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" |
| 259 |
-+ printf "%s" "${ICULIBS_OBSOLETE} " |
| 260 |
- ;; |
| 261 |
- |
| 262 |
- --ldflags-toolutil) |
| 263 |
-- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" |
| 264 |
-+ printf "%s" " ${ICULIBS_TOOLUTIL} " |
| 265 |
- ;; |
| 266 |
- |
| 267 |
- --ldflags-layout) |
| 268 |
-@@ -285,7 +285,7 @@ |
| 269 |
- ;; |
| 270 |
- |
| 271 |
- --ldflags-searchpath) |
| 272 |
-- echo $ECHO_N "-L${libdir} ${ECHO_C}" |
| 273 |
-+ printf "%s" "-L${libdir} " |
| 274 |
- ;; |
| 275 |
- |
| 276 |
- --detect-prefix) |
| 277 |
-@@ -321,47 +321,47 @@ |
| 278 |
- ;; |
| 279 |
- |
| 280 |
- --shared-datadir) |
| 281 |
-- echo $ECHO_N "${datadir} ${ECHO_C}" |
| 282 |
-+ printf "%s" "${datadir} " |
| 283 |
- ;; |
| 284 |
- |
| 285 |
- --incfile) |
| 286 |
-- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" |
| 287 |
-+ printf "%s" "${pkglibdir}/Makefile.inc " |
| 288 |
- ;; |
| 289 |
- |
| 290 |
- --incpkgdatafile) |
| 291 |
-- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" |
| 292 |
-+ printf "%s" "${pkglibdir}/pkgdata.inc " |
| 293 |
- ;; |
| 294 |
- |
| 295 |
- --icudata) |
| 296 |
-- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" |
| 297 |
-+ printf "%s" "${ICUDATA_NAME} " |
| 298 |
- ;; |
| 299 |
- |
| 300 |
- --icudata-mode) |
| 301 |
-- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" |
| 302 |
-+ printf "%s" "${PKGDATA_MODE} " |
| 303 |
- ;; |
| 304 |
- |
| 305 |
- --icudata-install-dir) |
| 306 |
-- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" |
| 307 |
-+ printf "%s" "${ICUPKGDATA_DIR} " |
| 308 |
- ;; |
| 309 |
- |
| 310 |
- --icudatadir) |
| 311 |
-- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" |
| 312 |
-+ printf "%s" "${ICUDATA_DIR} " |
| 313 |
- ;; |
| 314 |
- |
| 315 |
- --shlib-c) |
| 316 |
-- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" |
| 317 |
-+ printf "%s" "${SHLIB_c} " |
| 318 |
- ;; |
| 319 |
- |
| 320 |
- --shlib-cc) |
| 321 |
-- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" |
| 322 |
-+ printf "%s" "${SHLIB_cc} " |
| 323 |
- ;; |
| 324 |
- |
| 325 |
- --version) |
| 326 |
-- echo $ECHO_N $VERSION |
| 327 |
-+ printf "%s" "$VERSION" |
| 328 |
- ;; |
| 329 |
- |
| 330 |
- --unicode-version) |
| 331 |
-- echo $ECHO_N $UNICODE_VERSION |
| 332 |
-+ printf "%s" "$UNICODE_VERSION" |
| 333 |
- ;; |
| 334 |
- |
| 335 |
- --host) |
| 336 |
-diff -ruN a/configure.ac b/configure.ac |
| 337 |
---- a/configure.ac 2016-10-04 21:30:20.000000000 +0200 |
| 338 |
-+++ b/configure.ac 2016-11-05 19:43:07.688466668 +0100 |
| 339 |
-@@ -22,24 +22,6 @@ |
| 340 |
- PACKAGE="icu" |
| 341 |
- AC_SUBST(PACKAGE) |
| 342 |
- |
| 343 |
--# Use custom echo test for newline option |
| 344 |
--# Current autoconf (2.65) gives incorrect echo newline option |
| 345 |
--# for icu-config |
| 346 |
--# This may be removed later - mow (June 17, 2010) |
| 347 |
--ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T= |
| 348 |
--case `/bin/sh -c "echo -n x"` in |
| 349 |
---n*) |
| 350 |
-- case `/bin/sh -c "echo 'x\c'"` in |
| 351 |
-- *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character. |
| 352 |
-- *) ICU_ECHO_C='\c';; |
| 353 |
-- esac;; |
| 354 |
--*) |
| 355 |
-- ICU_ECHO_N='-n';; |
| 356 |
--esac |
| 357 |
--AC_SUBST(ICU_ECHO_N) |
| 358 |
--AC_SUBST(ICU_ECHO_C) |
| 359 |
--AC_SUBST(ICU_ECHO_T) |
| 360 |
-- |
| 361 |
- AC_MSG_CHECKING(for ICU version numbers) |
| 362 |
- |
| 363 |
- # Get the ICU version from uversion.h or other headers |
| 364 |
-diff -ruN a/icudefs.mk.in b/icudefs.mk.in |
| 365 |
---- a/icudefs.mk.in 2016-09-09 23:28:18.000000000 +0200 |
| 366 |
-+++ b/icudefs.mk.in 2016-11-05 19:43:07.688466668 +0100 |
| 367 |
-@@ -157,11 +157,6 @@ |
| 368 |
- ENABLE_STATIC = @ENABLE_STATIC@ |
| 369 |
- ENABLE_SHARED = @ENABLE_SHARED@ |
| 370 |
- |
| 371 |
--# Echo w/o newline |
| 372 |
-- |
| 373 |
--#ECHO_N = @ICU_ECHO_N@ |
| 374 |
--#ECHO_C = @ICU_ECHO_C@ |
| 375 |
-- |
| 376 |
- # Commands to compile |
| 377 |
- COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c |
| 378 |
- COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c |
| 379 |
-diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in |
| 380 |
---- a/test/hdrtst/Makefile.in 2016-09-28 06:17:24.000000000 +0200 |
| 381 |
-+++ b/test/hdrtst/Makefile.in 2016-11-05 19:43:07.688466668 +0100 |
| 382 |
-@@ -35,9 +35,6 @@ |
| 383 |
- include $(shell icu-config --incfile) |
| 384 |
- DIRS=$(prefix)/include/unicode |
| 385 |
- LDIRS=$(prefix)/include/layout |
| 386 |
--ECHO_T=@ECHO_T@ |
| 387 |
--ECHO_C=@ECHO_C@ |
| 388 |
--ECHO_N=@ECHO_N@ |
| 389 |
- |
| 390 |
- all: |
| 391 |
- @echo Please read this Makefile for more information. |
| 392 |
|
| 393 |
diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch |
| 394 |
deleted file mode 100644 |
| 395 |
index e5a9000a34..0000000000 |
| 396 |
--- a/dev-libs/icu/files/icu-58.2-darwin.patch |
| 397 |
+++ /dev/null |
| 398 |
@@ -1,55 +0,0 @@ |
| 399 |
-same as 4.7, but retargetted to apply with eapply |
| 400 |
- |
| 401 |
---- a/config/mh-darwin |
| 402 |
-+++ b/config/mh-darwin |
| 403 |
-@@ -4,6 +4,13 @@ |
| 404 |
- ## Copyright (c) 1999-2011 International Business Machines Corporation and |
| 405 |
- ## others. All Rights Reserved. |
| 406 |
- |
| 407 |
-+ |
| 408 |
-+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 409 |
-+FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO) |
| 410 |
-+MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO) |
| 411 |
-+ |
| 412 |
-+IS_DARWIN = yes |
| 413 |
-+ |
| 414 |
- ## Flags for position independent code |
| 415 |
- SHAREDLIBCFLAGS = -dynamic |
| 416 |
- SHAREDLIBCXXFLAGS = -dynamic |
| 417 |
-@@ -28,7 +35,7 @@ |
| 418 |
- ifeq ($(ENABLE_RPATH),YES) |
| 419 |
- LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| 420 |
- else |
| 421 |
--LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) |
| 422 |
-+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| 423 |
- endif |
| 424 |
- |
| 425 |
- ## Compiler switch to embed a runtime search path |
| 426 |
---- a/stubdata/Makefile.in |
| 427 |
-+++ b/stubdata/Makefile.in |
| 428 |
-@@ -32,7 +32,11 @@ |
| 429 |
- |
| 430 |
- |
| 431 |
- ifneq ($(ENABLE_SHARED),) |
| 432 |
-+ifeq ($(IS_DARWIN),) |
| 433 |
- SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) |
| 434 |
-+else |
| 435 |
-+SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) |
| 436 |
-+endif |
| 437 |
- ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) |
| 438 |
- endif |
| 439 |
- |
| 440 |
---- a/tools/ctestfw/Makefile.in |
| 441 |
-+++ b/tools/ctestfw/Makefile.in |
| 442 |
-@@ -31,7 +31,11 @@ |
| 443 |
- endif |
| 444 |
- |
| 445 |
- ifneq ($(ENABLE_SHARED),) |
| 446 |
-+ifeq ($(IS_DARWIN),) |
| 447 |
- SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 448 |
-+else |
| 449 |
-+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 450 |
-+endif |
| 451 |
- ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) |
| 452 |
- endif |
| 453 |
- |
| 454 |
|
| 455 |
diff --git a/dev-libs/icu/icu-58.2.ebuild b/dev-libs/icu/icu-58.2.ebuild |
| 456 |
deleted file mode 100644 |
| 457 |
index b046626072..0000000000 |
| 458 |
--- a/dev-libs/icu/icu-58.2.ebuild |
| 459 |
+++ /dev/null |
| 460 |
@@ -1,155 +0,0 @@ |
| 461 |
-# Copyright 1999-2017 Gentoo Foundation |
| 462 |
-# Distributed under the terms of the GNU General Public License v2 |
| 463 |
-# $Id$ |
| 464 |
- |
| 465 |
-EAPI=6 |
| 466 |
- |
| 467 |
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal |
| 468 |
- |
| 469 |
-DESCRIPTION="International Components for Unicode" |
| 470 |
-HOMEPAGE="http://www.icu-project.org/" |
| 471 |
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" |
| 472 |
- |
| 473 |
-LICENSE="BSD" |
| 474 |
- |
| 475 |
-SLOT="0/${PV}" |
| 476 |
- |
| 477 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 478 |
-IUSE="debug doc examples static-libs" |
| 479 |
- |
| 480 |
-DEPEND=" |
| 481 |
- virtual/pkgconfig |
| 482 |
- doc? ( |
| 483 |
- app-doc/doxygen[dot] |
| 484 |
- ) |
| 485 |
-" |
| 486 |
- |
| 487 |
-S="${WORKDIR}/${PN}/source" |
| 488 |
- |
| 489 |
-MULTILIB_CHOST_TOOLS=( |
| 490 |
- /usr/bin/icu-config |
| 491 |
-) |
| 492 |
- |
| 493 |
-PATCHES=( |
| 494 |
- "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" |
| 495 |
- "${FILESDIR}/${PN}-58.1-iterator.patch" |
| 496 |
- "${FILESDIR}/${PN}-58.2-darwin.patch" |
| 497 |
-) |
| 498 |
- |
| 499 |
-src_prepare() { |
| 500 |
- # apply patches |
| 501 |
- default |
| 502 |
- |
| 503 |
- local variable |
| 504 |
- |
| 505 |
- # Disable renaming as it is stupid thing to do |
| 506 |
- sed -i \ |
| 507 |
- -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ |
| 508 |
- common/unicode/uconfig.h || die |
| 509 |
- |
| 510 |
- # Fix linking of icudata |
| 511 |
- sed -i \ |
| 512 |
- -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ |
| 513 |
- config/mh-linux || die |
| 514 |
- |
| 515 |
- # Append doxygen configuration to configure |
| 516 |
- sed -i \ |
| 517 |
- -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ |
| 518 |
- configure.ac || die |
| 519 |
- |
| 520 |
- # Fix compilation on Solaris due to enabling of conflicting standards |
| 521 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 522 |
- sed -i -e '/define _XOPEN_SOURCE_EXTENDED/s/_XOPEN/no_XOPEN/' \ |
| 523 |
- common/uposixdefs.h || die |
| 524 |
- fi |
| 525 |
- |
| 526 |
- eautoreconf |
| 527 |
-} |
| 528 |
- |
| 529 |
-src_configure() { |
| 530 |
- # Use C++14 |
| 531 |
- append-cxxflags -std=c++14 |
| 532 |
- |
| 533 |
- if tc-is-cross-compiler; then |
| 534 |
- mkdir "${WORKDIR}"/host || die |
| 535 |
- pushd "${WORKDIR}"/host >/dev/null || die |
| 536 |
- |
| 537 |
- CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ |
| 538 |
- CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ |
| 539 |
- RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ |
| 540 |
- "${S}"/configure --disable-renaming --disable-debug \ |
| 541 |
- --disable-samples --enable-static || die |
| 542 |
- emake |
| 543 |
- |
| 544 |
- popd >/dev/null || die |
| 545 |
- fi |
| 546 |
- |
| 547 |
- multilib-minimal_src_configure |
| 548 |
-} |
| 549 |
- |
| 550 |
-multilib_src_configure() { |
| 551 |
- local myeconfargs=( |
| 552 |
- --disable-renaming |
| 553 |
- --disable-samples |
| 554 |
- --disable-layoutex |
| 555 |
- $(use_enable debug) |
| 556 |
- $(use_enable static-libs static) |
| 557 |
- ) |
| 558 |
- |
| 559 |
- multilib_is_native_abi && myeconfargs+=( |
| 560 |
- $(use_enable examples samples) |
| 561 |
- ) |
| 562 |
- tc-is-cross-compiler && myeconfargs+=( |
| 563 |
- --with-cross-build="${WORKDIR}"/host |
| 564 |
- ) |
| 565 |
- |
| 566 |
- # icu tries to use clang by default |
| 567 |
- tc-export CC CXX |
| 568 |
- |
| 569 |
- # make sure we configure with the same shell as we run icu-config |
| 570 |
- # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined |
| 571 |
- export CONFIG_SHELL=${EPREFIX}/bin/sh |
| 572 |
- # probably have no /bin/sh in prefix-chain |
| 573 |
- [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH} |
| 574 |
- |
| 575 |
- ECONF_SOURCE=${S} \ |
| 576 |
- econf "${myeconfargs[@]}" |
| 577 |
-} |
| 578 |
- |
| 579 |
-multilib_src_compile() { |
| 580 |
- default |
| 581 |
- |
| 582 |
- if multilib_is_native_abi && use doc; then |
| 583 |
- doxygen -u Doxyfile || die |
| 584 |
- doxygen Doxyfile || die |
| 585 |
- fi |
| 586 |
-} |
| 587 |
- |
| 588 |
-multilib_src_test() { |
| 589 |
- # INTLTEST_OPTS: intltest options |
| 590 |
- # -e: Exhaustive testing |
| 591 |
- # -l: Reporting of memory leaks |
| 592 |
- # -v: Increased verbosity |
| 593 |
- # IOTEST_OPTS: iotest options |
| 594 |
- # -e: Exhaustive testing |
| 595 |
- # -v: Increased verbosity |
| 596 |
- # CINTLTST_OPTS: cintltst options |
| 597 |
- # -e: Exhaustive testing |
| 598 |
- # -v: Increased verbosity |
| 599 |
- emake -j1 VERBOSE="1" check |
| 600 |
-} |
| 601 |
- |
| 602 |
-multilib_src_install() { |
| 603 |
- default |
| 604 |
- |
| 605 |
- if multilib_is_native_abi && use doc; then |
| 606 |
- docinto html |
| 607 |
- dodoc -r doc/html/* |
| 608 |
- fi |
| 609 |
-} |
| 610 |
- |
| 611 |
-multilib_src_install_all() { |
| 612 |
- einstalldocs |
| 613 |
- docinto html |
| 614 |
- dodoc ../readme.html |
| 615 |
-} |
| 616 |
|
| 617 |
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml |
| 618 |
deleted file mode 100644 |
| 619 |
index 13ce236ee5..0000000000 |
| 620 |
--- a/dev-libs/icu/metadata.xml |
| 621 |
+++ /dev/null |
| 622 |
@@ -1,8 +0,0 @@ |
| 623 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 624 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 625 |
-<pkgmetadata> |
| 626 |
- <maintainer type="project"> |
| 627 |
- <email>office@g.o</email> |
| 628 |
- <name>Gentoo Office project</name> |
| 629 |
- </maintainer> |
| 630 |
-</pkgmetadata> |
Archives