Increase verbosity of pkgdata.

(Portage version: 14007-svn/cvs/Linux x86_64)

3 files changed, 196 insertions, 2 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 1308db82e87e..de70badbd5c5 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.92 2009/07/27 17:03:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.93 2009/08/12 02:38:34 arfrever Exp $
+
+  12 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  icu-4.2.1.ebuild, +files/icu-4.2.1-pkgdata.patch:
+  Increase verbosity of pkgdata.
 
   27 Jul 2009; nixnut <nixnut@gentoo.org> icu-4.2.ebuild:
   ppc stable #275593
diff --git a/dev-libs/icu/files/icu-4.2.1-pkgdata.patch b/dev-libs/icu/files/icu-4.2.1-pkgdata.patch
new file mode 100644
index 000000000000..a66b0ff4617b
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.2.1-pkgdata.patch
@@ -0,0 +1,188 @@
+https://bugs.icu-project.org/trac/ticket/6969
+https://bugs.icu-project.org/trac/changeset/26210
+
+--- tools/pkgdata/pkgdata.cpp
++++ tools/pkgdata/pkgdata.cpp
+@@ -118,6 +118,7 @@
+ static void createFileNames(const char *version_major, const char *version, const char *libName, const UBool reverseExt);
+ 
+ static int32_t pkg_getOptionsFromICUConfig(UOption *option);
++static int runCommand(const char* command);
+ 
+ enum {
+     NAME,
+@@ -461,6 +462,15 @@
+     return result;
+ }
+ 
++static int runCommand(const char* command) { 
++	printf("pkgdata: %s\n", command); 
++	int result = system(command); 
++	if (result != 0) { 
++		printf("-- return status = %d\n", result); 
++	} 
++	return result; 
++} 
++
+ #define LN_CMD "ln -s"
+ #define RM_CMD "rm -f"
+ 
+@@ -724,7 +734,7 @@
+             LN_CMD,
+             libFileNames[LIB_FILE_VERSION],
+             libFileNames[LIB_FILE_VERSION_MAJOR]);
+-    result = system(cmd);
++    result = runCommand(cmd);
+     if (result != 0) {
+         return result;
+     }
+@@ -737,7 +747,7 @@
+             libFileNames[LIB_FILE_VERSION],
+             libFileNames[LIB_FILE], pkgDataFlags[SO_EXT]);
+ 
+-     result = system(cmd);
++     result = runCommand(cmd);
+ 
+     return result;
+ }
+@@ -753,7 +763,7 @@
+             installDir, PKGDATA_FILE_SEP_STRING, libFileNames[LIB_FILE_VERSION]
+             );
+ 
+-    result = system(cmd);
++    result = runCommand(cmd);
+ 
+     if (result != 0) {
+         return result;
+@@ -795,7 +805,7 @@
+                         srcDir, PKGDATA_FILE_SEP_STRING, buffer,
+                         installDir, PKGDATA_FILE_SEP_STRING, buffer);
+ 
+-                result = system(cmd);
++                result = runCommand(cmd);
+                 if (result != 0) {
+                     fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
+                     break;
+@@ -815,7 +825,7 @@
+     }
+ #else
+     sprintf(cmd, "%s %s %s %s", WIN_INSTALL_CMD, srcDir, installDir, WIN_INSTALL_CMD_FLAGS);
+-    result = system(cmd);
++    result = runCommand(cmd);
+     if (result != 0) {
+         fprintf(stderr, "Failed to install data file with command: %s\n", cmd);
+     }
+@@ -849,7 +859,17 @@
+                 targetDir,
+                 libFileNames[LIB_FILE_VERSION_TMP]);
+ 
+-        result = system(cmd);
++		result = runCommand(cmd); 
++		if (result != 0) { 
++			return result; 
++		} 
++
++		sprintf(cmd, "%s %s%s", 
++			pkgDataFlags[RANLIB], 
++			targetDir, 
++			libFileNames[LIB_FILE_VERSION]);
++
++		result = runCommand(cmd); 
+         if (result != 0) {
+             return result;
+         }
+@@ -860,7 +880,7 @@
+                 targetDir,
+                 libFileNames[LIB_FILE_VERSION_TMP]);
+ 
+-        result = system(cmd);
++        result = runCommand(cmd);
+         if (result != 0) {
+             return result;
+         }
+@@ -908,7 +928,21 @@
+                 pkgDataFlags[A_EXT],
+                 objectFile);
+ 
+-        result = system(cmd);
++		result = runCommand(cmd); 
++		if (result == 0) 
++		{
++#ifdef OS400 
++		sprintf(cmd, "QSH CMD('%s %s%s.%s')", 
++#else 
++		sprintf(cmd, "%s %s%s.%s", 
++#endif 
++			pkgDataFlags[RANLIB], 
++			targetDir, 
++			libFileNames[LIB_FILE], 
++			pkgDataFlags[A_EXT]); 
++
++			result = runCommand(cmd); 
++		}
+     } else /* if (mode == MODE_DLL) */ {
+ #ifdef U_CYGWIN
+         sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
+@@ -935,7 +969,7 @@
+                 pkgDataFlags[BIR_FLAGS]);
+ 
+         /* Generate the library file. */
+-        result = system(cmd);
++        result = runCommand(cmd);
+     }
+ 
+     if (freeCmd) {
+@@ -961,7 +995,7 @@
+             tempObjectFile,
+             gencFilePath);
+ 
+-    result = system(cmd);
++    result = runCommand(cmd);
+     if (result != 0) {
+         return result;
+     }
+@@ -1043,7 +1077,7 @@
+                         tempObjectFile,
+                         gencmnFile);
+             
+-            result = system(cmd);
++            result = runCommand(cmd);
+             if (result != 0) {
+                 break;
+             }
+@@ -1094,7 +1128,7 @@
+             sprintf(cmd, "cat %s >> %s", gencmnFile, icudtAll);
+ #endif
+             
+-            result = system(cmd);
++            result = runCommand(cmd);
+             if (result != 0) {
+                 break;
+             }
+@@ -1110,7 +1144,7 @@
+                     pkgDataFlags[LIBFLAGS],
+                     tempObjectFile,
+                     gencmnFile);
+-        result = system(cmd);
++        result = runCommand(cmd);
+         if (result != 0) {
+             break;
+         }
+@@ -1139,7 +1173,7 @@
+         tempObjectFile,
+         icudtAll);
+     
+-    result = system(cmd);
++    result = runCommand(cmd);
+     if (result == 0) {
+         sprintf(buffer, "%s %s",
+             buffer,
+@@ -1222,7 +1256,7 @@
+                 );
+     }
+ 
+-    return system(cmd);
++    return runCommand(cmd);
+ }
+ #endif
+ 
diff --git a/dev-libs/icu/icu-4.2.1.ebuild b/dev-libs/icu/icu-4.2.1.ebuild
index 88683eb153b1..0d5c7478e892 100644
--- a/dev-libs/icu/icu-4.2.1.ebuild
+++ b/dev-libs/icu/icu-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.2.1.ebuild,v 1.1 2009/07/03 21:49:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.2.1.ebuild,v 1.2 2009/08/12 02:38:34 arfrever Exp $
 
 EAPI="2"
 
@@ -46,6 +46,8 @@ src_prepare() {
 	for x in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
 		sed -i -e "/^${x} =.*/s:@${x}@::" "config/Makefile.inc.in" || die "sed failed"
 	done
+
+	epatch "${FILESDIR}/${P}-pkgdata.patch"
 }
 
 src_configure() {