Remove old patches per Arfrever.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 9 insertions, 194 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 736b026e5af2..899d1d638b02 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.185 2012/05/06 19:34:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.186 2012/05/06 19:40:20 floppym Exp $
+
+  06 May 2012; Mike Gilbert <floppym@gentoo.org> -files/icu-4.6-pkgdata.patch,
+  -files/icu-4.6.1-parallel_installation.patch, -files/icu-4.8.1-fix_ltr.patch:
+  Remove old patches per Arfrever.
 
   06 May 2012; Mike Gilbert <floppym@gentoo.org> -icu-4.6.ebuild:
   Remove one more old version.
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 9e3e76d208d0..1b3e511914b6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,10 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX icu-4.6-pkgdata.patch 4214 RMD160 0cdc3d409dcdedf7ac62cc0a29142d75dbb6aeee SHA1 c0bf9c4ca0767887ef4839e5f7ae31636d01d34a SHA256 643cfce19b2091fee859462a86dac7b6119063ee67abc1132d4700c44a79c271
-AUX icu-4.6.1-parallel_installation.patch 1329 RMD160 48b673c8e56d046880340eca0c05cb0e52efde2a SHA1 2c00430f7ac4351a30ef048cf299288ab3735a33 SHA256 03ce917d8211af55ba2833039c90cf957696f6579e9b067ee26aa246363eaac7
 AUX icu-4.8.1-fix_binformat_fonts.patch 530 RMD160 2a896c9c7d460c86cc18ee59f03eebfc370863a8 SHA1 515fefde32ad246b4c8737f7853ec899e6a18e25 SHA256 17eae8386e720cc86c4305d29dca8e393111fbc899cc550ae9eb2db91b810bfe
-AUX icu-4.8.1-fix_ltr.patch 2154 RMD160 4d35706305de4a00825e8d98cee620305ff27544 SHA1 f5d4f24ceacf57c15d92eb40ccf314a0e9cf0c8a SHA256 e701ad66912f863882064d9be599b181623a5584336fafc340bcb5a6f354d836
 AUX icu-4.8.1-fix_nan.patch 2246 RMD160 289f11b2a260de557c30eb8527c8a0886cfe6ecb SHA1 5964b99936cb2c0c9af2234c02502799d10eb367 SHA256 6e2375c96cfdf87028e6c3d3235ab7bfc6258cd0a505a75f3518611b1caba8e4
 AUX icu-4.8.1.1-fix_ltr.patch 2175 RMD160 49ef2d6df6b9ffc949a9377a6662e02f0ef6083b SHA1 b29c8223b824d018ae5fba210c9b4490a5d701aa SHA256 ecef8b305a8ab43c9164a2aaa39b3509e042008d374d6661900efea78372946a
 AUX icu-49.1.1-regex.patch 4860 RMD160 ad2a57eed7d639f1562cc1b3ab9457a414809b38 SHA1 2d552ec1ae29b0e9a4013eb0220a9a62f7ca16af SHA256 45ea5644d8161f367c6860cc5cc3f26fc72a69e86676d1a1296b2d8ded83967e
@@ -14,12 +11,12 @@ DIST icu4c-4_8_1_1-docs.zip 4078464 RMD160 ee07a9042714ff306de6e086a1510c9f88455
 DIST icu4c-4_8_1_1-src.tgz 18675781 RMD160 c1ac8098b3815604da9e278d752051fb861bea63 SHA1 7146ee269b39273fa98d750f73136b14f781758a SHA256 0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1
 EBUILD icu-4.8.1.1-r1.ebuild 2365 RMD160 3571f587ff510bb6ccc962d90288f901a0b73499 SHA1 16dfb9d2c64ee11e3cb86abc83288ee9bd6ed082 SHA256 68abfe56e8a83cddd54f62a50c7e60a94f44ee162fa7ba368862cd0cb3da348c
 EBUILD icu-49.1.1-r1.ebuild 2302 RMD160 4f76bd82b1eb72557de5b10db8451a4cee843c08 SHA1 1ac941fe1583e292e45416928106fe08d5170f8e SHA256 972d05d961a9da6843f832580ab5f28bd8d3250c30b6803c24c0e0897bf08c73
-MISC ChangeLog 23214 RMD160 a0a402d8ed896f52620fef9b5d9ef45450028b57 SHA1 7daf1d071afb075455c091cd6765fb9e2e0345a0 SHA256 9fae8a2f48ded0005a0ddf3e79198853ebd5e9939ba363a3007a34ccf036b055
+MISC ChangeLog 23409 RMD160 775a7289d87a61b86f709efd77551895105586d1 SHA1 78db4e131dcce8a357ac682b2e9df3071640c11c SHA256 37e28e1f3b651422bb8107059dcf2b35759a3063aeea72c98a5c2dae0146ba64
 MISC metadata.xml 294 RMD160 00109f9a2a1db3e7d1abf6d30704d56a20f745d8 SHA1 63c589c192de7a7e3cf1ec5e5d4807eb7703ccf9 SHA256 501a5b0d4dc6215cd3302bdbdd6aa8e8037036996fadbe48f20acd2e037a31d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+m0jwACgkQC77qH+pIQ6RplgEAuci3sP7S94HiEbz/2DXIPFm7
-bUqglNpkQCQ1aRflszABAMYk4qcTp25QPY9BiFZyuHSGvSUGJ6GFPc5GoN8deOSA
-=03ic
+iF4EAREIAAYFAk+m06oACgkQC77qH+pIQ6RTrQD+MHzcQqqi12eV56h5DFbTdM0z
+trEgh/Rk884Ri9bf/50BAIQOZKTB2IXUsf8pyVoqhNJ6Ua32AR/OHPq5a9n8puif
+=rcCY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-4.6-pkgdata.patch b/dev-libs/icu/files/icu-4.6-pkgdata.patch
deleted file mode 100644
index df9b4045fa0c..000000000000
--- a/dev-libs/icu/files/icu-4.6-pkgdata.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=326021
-https://ssl.icu-project.org/trac/ticket/8281
-https://ssl.icu-project.org/trac/changeset/29332
-https://ssl.icu-project.org/trac/changeset/29333
-
---- tools/pkgdata/pkgdata.cpp
-+++ tools/pkgdata/pkgdata.cpp
-@@ -1,5 +1,5 @@
- /******************************************************************************
-- *   Copyright (C) 2000-2010, International Business Machines
-+ *   Copyright (C) 2000-2011, International Business Machines
-  *   Corporation and others.  All Rights Reserved.
-  *******************************************************************************
-  *   file name:  pkgdata.c
-@@ -99,6 +99,7 @@
- 
- #define LARGE_BUFFER_MAX_SIZE 2048
- #define SMALL_BUFFER_MAX_SIZE 512
-+#define BUFFER_PADDING_SIZE 20
- 
- static void loadLists(UPKGOptions *o, UErrorCode *status);
- 
-@@ -484,9 +485,8 @@
- 
-     if (!specialHandling) {
- #if defined(USING_CYGWIN) || defined(OS400)
--#define CMD_PADDING_SIZE 20
--        if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
--            cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
-+        if ((len + BUFFER_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
-+            cmd = (char *)uprv_malloc(len + BUFFER_PADDING_SIZE);
-         } else {
-             cmd = cmdBuffer;
-         }
-@@ -1133,6 +1133,7 @@
-     int32_t result = 0;
-     char *cmd = NULL;
-     UBool freeCmd = FALSE;
-+    int32_t length = 0;
- 
-     /* This is necessary because if packaging is done without assembly code, objectFile might be extremely large
-      * containing many object files and so the calling function should supply a command buffer that is large
-@@ -1140,15 +1141,18 @@
-      */
-     if (command != NULL) {
-         cmd = command;
--    } else {
--        if ((cmd = (char *)uprv_malloc(sizeof(char) * LARGE_BUFFER_MAX_SIZE)) == NULL) {
--            fprintf(stderr, "Unable to allocate memory for command.\n");
--            return -1;
--        }
--        freeCmd = TRUE;
-     }
- 
-     if (mode == MODE_STATIC) {
-+        if (cmd == NULL) {
-+            length = uprv_strlen(pkgDataFlags[AR]) + uprv_strlen(pkgDataFlags[ARFLAGS]) + uprv_strlen(targetDir) +
-+                     uprv_strlen(libFileNames[LIB_FILE_VERSION]) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[RANLIB]) + BUFFER_PADDING_SIZE;
-+            if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) {
-+                fprintf(stderr, "Unable to allocate memory for command.\n");
-+                return -1;
-+            }
-+            freeCmd = TRUE;
-+        }
-         sprintf(cmd, "%s %s %s%s %s",
-                 pkgDataFlags[AR],
-                 pkgDataFlags[ARFLAGS],
-@@ -1166,6 +1170,21 @@
-             result = runCommand(cmd);
-         }
-     } else /* if (mode == MODE_DLL) */ {
-+        if (cmd == NULL) {
-+            length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) +
-+                     uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP]) +
-+                     uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) +
-+                     uprv_strlen(pkgDataFlags[LD_SONAME][0] == 0 ? "" : libFileNames[LIB_FILE_VERSION_MAJOR]) +
-+                     uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE;
-+#ifdef U_CYGWIN
-+            length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]);
-+#endif
-+            if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) {
-+                fprintf(stderr, "Unable to allocate memory for command.\n");
-+                return -1;
-+            }
-+            freeCmd = TRUE;
-+        }
- #ifdef U_CYGWIN
-         sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
-                 pkgDataFlags[GENLIB],
-@@ -1209,7 +1228,7 @@
-     tempObjectFile[uprv_strlen(tempObjectFile)-1] = 'o';
- 
-     length = uprv_strlen(pkgDataFlags[COMPILER]) + uprv_strlen(pkgDataFlags[LIBFLAGS])
--                    + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + 10;
-+                    + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + BUFFER_PADDING_SIZE;
- 
-     cmd = (char *)uprv_malloc(sizeof(char) * length);
-     if (cmd == NULL) {
diff --git a/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch b/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch
deleted file mode 100644
index e4eec2d4a72b..000000000000
--- a/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=272328
-https://ssl.icu-project.org/trac/ticket/7628
-https://ssl.icu-project.org/trac/changeset/29657
-
---- extra/uconv/Makefile.in
-+++ extra/uconv/Makefile.in
-@@ -1,6 +1,6 @@
- ## ******************************************************************************
- ## *
--## *   Copyright (C) 1999-2009, International Business Machines
-+## *   Copyright (C) 1999-2011, International Business Machines
- ## *   Corporation and others.  All Rights Reserved.
- ## *
- ## *******************************************************************************
-@@ -147,7 +147,7 @@
- endif
- 
- 
--package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
-+package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc
- 	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
- 
- $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
-@@ -159,7 +159,7 @@
- 
- # no install for static mode
- ifneq ($(UCONVMSG_MODE),static)
--install-resfiles: $(RESFILES)
-+install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc 
- 	$(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR)
- 	$(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
- else
diff --git a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
deleted file mode 100644
index 9bcd217ff3c9..000000000000
--- a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- release-4-8-1/source/layout/LESwaps.h	2011-10-07 06:52:16.240688181 +0300
-+++ release-4-8/source/layout/LESwaps.h	2011-10-07 05:56:26.915499700 +0300
-@@ -45,8 +45,8 @@
- public:
- 
-     /**
--     * Reads a big-endian 16-bit word and returns a native-endian value.
--     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
-+     * This method does the byte swap required on little endian platforms
-+     * to correctly access a (16-bit) word.
-      *
-      * @param value - the word to be byte swapped
-      *
-@@ -56,19 +56,12 @@
-      */
-     static le_uint16 swapWord(le_uint16 value)
-     {
--#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
--        // Fastpath when we know that the platform is big-endian.
--        return value;
--#else
--        // Reads a big-endian value on any platform.
--        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
--        return (le_uint16)((p[0] << 8) | p[1]);
--#endif
-+        return (le_uint16)((value << 8) | (value >> 8));
-     };
- 
-     /**
--     * Reads a big-endian 32-bit word and returns a native-endian value.
--     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
-+     * This method does the byte swapping required on little endian platforms
-+     * to correctly access a (32-bit) long.
-      *
-      * @param value - the long to be byte swapped
-      *
-@@ -78,14 +71,11 @@
-      */
-     static le_uint32 swapLong(le_uint32 value)
-     {
--#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
--        // Fastpath when we know that the platform is big-endian.
--        return value;
--#else
--        // Reads a big-endian value on any platform.
--        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
--        return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
--#endif
-+        return (le_uint32)(
-+            (value << 24) |
-+            ((value << 8) & 0xff0000) |
-+            ((value >> 8) & 0xff00) |
-+            (value >> 24));
-     };
- 
- private: