Patch to fix bug #136233, to use utimes instead of utime.

Package-Manager: portage-2.1_rc4-r5

5 files changed, 221 insertions, 23 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 8df5a49842ae..fd6da75ee782 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ccache
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.43 2006/03/31 21:12:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.44 2006/06/09 23:54:44 robbat2 Exp $
+
+*ccache-2.4-r2 (09 Jun 2006)
+
+  09 Jun 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ccache-2.4-utimes.patch, +ccache-2.4-r2.ebuild:
+  Patch to fix bug #136233, to use utimes instead of utime.
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> ccache-2.4-r1.ebuild:
   Remove virtual/libc dependency and add keyword ~x86-fbsd.
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 99aedde769bb..dc1060ce7f16 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,27 +1,46 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3928f61b0aef1c1263a9435c8f9823d0 ChangeLog 5349
-RMD160 2923d2d07e75fa958a32aa0395873ac1dcc66520 ChangeLog 5349
-SHA256 1d6af5ce49001cd47f5ce4866d85c9b984a77defc9ab08845841d9f6fa1d8737 ChangeLog 5349
+AUX ccache-2.4-respectflags.patch 403 RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 SHA1 27fbedc4ee219ee6f9b2c17ef8fa30dd91a024f5 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5
+MD5 ff94f3cf974deb56b1effb276dc9b6ea files/ccache-2.4-respectflags.patch 403
+RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 files/ccache-2.4-respectflags.patch 403
+SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5 files/ccache-2.4-respectflags.patch 403
+AUX ccache-2.4-utimes.patch 3267 RMD160 57bf223bbc1da41e3955cf017aa5d472cf93b19f SHA1 e9d63db657ef4273e8c27ddf6ae6deb8127540d1 SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a
+MD5 66cda3e733720761fe82c38be92b3ab0 files/ccache-2.4-utimes.patch 3267
+RMD160 57bf223bbc1da41e3955cf017aa5d472cf93b19f files/ccache-2.4-utimes.patch 3267
+SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a files/ccache-2.4-utimes.patch 3267
+AUX ccache-config 1554 RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 SHA1 919e73d840ba959ef4b32a66db62e4837611763b SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb
+MD5 3a5de45f5094320a0ce4eb5201506042 files/ccache-config 1554
+RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 files/ccache-config 1554
+SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb files/ccache-config 1554
+DIST ccache-2.2.tar.gz 81666
+DIST ccache-2.3.tar.gz 84386
+DIST ccache-2.4.tar.gz 86363
+EBUILD ccache-2.2.ebuild 2111 RMD160 bbf65573f1abbe68ea7bf6d2cb6ee334bccff59d SHA1 a800d21c4c972dfbfcccbebb0bc653a045535f22 SHA256 9b68e8f2c16c32f7a320919026b19a02dc622471fbb5bd180e8c90950cd299aa
 MD5 da9c02e7e8e50fefb7fc259354d004fa ccache-2.2.ebuild 2111
 RMD160 bbf65573f1abbe68ea7bf6d2cb6ee334bccff59d ccache-2.2.ebuild 2111
 SHA256 9b68e8f2c16c32f7a320919026b19a02dc622471fbb5bd180e8c90950cd299aa ccache-2.2.ebuild 2111
+EBUILD ccache-2.3.ebuild 2033 RMD160 4d26e942577a02082a840e7162d10fdcbc992baf SHA1 9695ebf74e51416ac291c15dc68ae9fb8e3a570e SHA256 9096cba3d1f7ab0e34cc481206004f54dc61a28353d08fbdb5e0fce0da763ffd
 MD5 90b71c416670ef466b34d73fc9d9bbab ccache-2.3.ebuild 2033
 RMD160 4d26e942577a02082a840e7162d10fdcbc992baf ccache-2.3.ebuild 2033
 SHA256 9096cba3d1f7ab0e34cc481206004f54dc61a28353d08fbdb5e0fce0da763ffd ccache-2.3.ebuild 2033
+EBUILD ccache-2.4-r1.ebuild 2111 RMD160 28f9f5dbb08b864aee5b22630090706f999c954c SHA1 ece1b13197b25fa56022d9a72b83075fa3ab6c2f SHA256 eb34f8ffca2b1be0ca2539e08c25d33aaa85e4ab280b142932211b5f066e050d
 MD5 74f1b31d1f21ef785285bac845126c14 ccache-2.4-r1.ebuild 2111
 RMD160 28f9f5dbb08b864aee5b22630090706f999c954c ccache-2.4-r1.ebuild 2111
 SHA256 eb34f8ffca2b1be0ca2539e08c25d33aaa85e4ab280b142932211b5f066e050d ccache-2.4-r1.ebuild 2111
+EBUILD ccache-2.4-r2.ebuild 2174 RMD160 c16e692a6c7f5504866744f16dd08ad1919db797 SHA1 588bbc886b3e847a4f1fab39d6b8d4d45f1b6021 SHA256 3cc939d120fd394624046bb009a8f45bc37c77a78f4644c3b63021ec9afa3cce
+MD5 d8fc4b6cf11b073e96a430de6e308108 ccache-2.4-r2.ebuild 2174
+RMD160 c16e692a6c7f5504866744f16dd08ad1919db797 ccache-2.4-r2.ebuild 2174
+SHA256 3cc939d120fd394624046bb009a8f45bc37c77a78f4644c3b63021ec9afa3cce ccache-2.4-r2.ebuild 2174
+EBUILD ccache-2.4.ebuild 2010 RMD160 73e8644470b7fd2b2c655060c2c9c39eec4ced15 SHA1 2635b77e89eb0869bd0cd0f9cbb1e836088ae815 SHA256 b8ea1fab4823e2f7d1617746f00a9a345aff12cf38a86ebcc4336f78d68f133e
 MD5 022d1231138f39cbb44c900cd8c32acd ccache-2.4.ebuild 2010
 RMD160 73e8644470b7fd2b2c655060c2c9c39eec4ced15 ccache-2.4.ebuild 2010
 SHA256 b8ea1fab4823e2f7d1617746f00a9a345aff12cf38a86ebcc4336f78d68f133e ccache-2.4.ebuild 2010
-MD5 ff94f3cf974deb56b1effb276dc9b6ea files/ccache-2.4-respectflags.patch 403
-RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 files/ccache-2.4-respectflags.patch 403
-SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5 files/ccache-2.4-respectflags.patch 403
-MD5 3a5de45f5094320a0ce4eb5201506042 files/ccache-config 1554
-RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 files/ccache-config 1554
-SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb files/ccache-config 1554
+MISC ChangeLog 5548 RMD160 a5782cc7507b8338458189876dc998e2c4ce5329 SHA1 b63006663763aeb2e0b5fe7495af715697102d13 SHA256 db2cdb7e1c6ed869675def79915fa4a45d8c30698f3154b9b31b4aa58bb2660f
+MD5 5714ac0e5a0e7be938482171c9bc7a9d ChangeLog 5548
+RMD160 a5782cc7507b8338458189876dc998e2c4ce5329 ChangeLog 5548
+SHA256 db2cdb7e1c6ed869675def79915fa4a45d8c30698f3154b9b31b4aa58bb2660f ChangeLog 5548
+MISC metadata.xml 386 RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb SHA1 c1c307ca690b90b14ef22dfeb2f467dd4076ccd7 SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518
+MD5 0e91c81450afb11a7d06d7543dddcd57 metadata.xml 386
+RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb metadata.xml 386
+SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518 metadata.xml 386
 MD5 0dfb58c5d312454e0c766c14f3d76dad files/digest-ccache-2.2 61
 RMD160 32493dec39d23033b85a270640191fa4c0a09c59 files/digest-ccache-2.2 61
 SHA256 2cdd9d2b57361f048c6f6ede6d2d3a184bc3e394b4b64608643c897d3a2e6cae files/digest-ccache-2.2 61
@@ -34,13 +53,6 @@ SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/di
 MD5 4ec9394758a87717466629023c2872fd files/digest-ccache-2.4-r1 61
 RMD160 fc35cc78e2493f7411ce0a199eb4a15f5883355e files/digest-ccache-2.4-r1 61
 SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/digest-ccache-2.4-r1 61
-MD5 0e91c81450afb11a7d06d7543dddcd57 metadata.xml 386
-RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb metadata.xml 386
-SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518 metadata.xml 386
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELZtzAiZjviIA2XgRAhS/AJ9jkUYuwJ9DyAipJg60/DQ0FUcUrgCeJR2g
-yoE1q+aRphhW7iA8jOlfh1Q=
-=k4s6
------END PGP SIGNATURE-----
+MD5 4ec9394758a87717466629023c2872fd files/digest-ccache-2.4-r2 61
+RMD160 fc35cc78e2493f7411ce0a199eb4a15f5883355e files/digest-ccache-2.4-r2 61
+SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/digest-ccache-2.4-r2 61
diff --git a/dev-util/ccache/ccache-2.4-r2.ebuild b/dev-util/ccache/ccache-2.4-r2.ebuild
new file mode 100644
index 000000000000..f1d5f5c16ac6
--- /dev/null
+++ b/dev-util/ccache/ccache-2.4-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.4-r2.ebuild,v 1.1 2006/06/09 23:54:44 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+# Note: this version is designed to be auto-detected and used if
+# you happen to have Portage 2.0.X+ installed.
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ccache-2.4-respectflags.patch
+	epatch ${FILESDIR}/ccache-2.4-utimes.patch
+	eautoconf
+}
+
+src_install() {
+	dobin ccache || die
+	doman ccache.1
+	dodoc README
+	dohtml web/*.html
+
+	diropts -m0755
+	dodir /usr/lib/ccache/bin
+	keepdir /usr/lib/ccache/bin
+
+	exeinto /usr/bin
+	doexe ${FILESDIR}/ccache-config
+
+	diropts -m0700
+	if use ppc-macos; then
+		dodir /var/root/.ccache
+		keepdir /var/root/.ccache
+	else
+		dodir /root/.ccache
+		keepdir /root/.ccache
+	fi
+}
+
+pkg_preinst() {
+	# Portage doesn't handle replacing a non-empty dir with a file!
+	[[ -e ${ROOT}/usr/bin/ccache ]] && rm -r "${ROOT}"/usr/bin/ccache
+	[[ -e ${ROOT}/usr/bin/ccache.backup ]] && rm -r "${ROOT}"/usr/bin/ccache.backup
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} = "/" ]] ; then
+		einfo "Scanning for compiler front-ends..."
+		/usr/bin/ccache-config --install-links
+		/usr/bin/ccache-config --install-links ${CHOST}
+	else
+		ewarn "Install is incomplete; you must run the following commands:"
+		ewarn " # ccache-config --install-links"
+		ewarn " # ccache-config --install-links ${CHOST}"
+		ewarn "after booting or chrooting to ${ROOT} to complete installation."
+	fi
+
+	einfo "To use ccache with **non-Portage** C compiling, add"
+	einfo "/usr/lib/ccache/bin to the beginning of your path, before /usr/bin."
+	einfo "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
+	einfo "no additional steps.  If this is your first install of ccache, type"
+	einfo "something like this to set a maximum cache size of 2GB:"
+	einfo "# ccache -M 2G"
+}
diff --git a/dev-util/ccache/files/ccache-2.4-utimes.patch b/dev-util/ccache/files/ccache-2.4-utimes.patch
new file mode 100644
index 000000000000..30aff6b8fb8a
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-utimes.patch
@@ -0,0 +1,105 @@
+utime(...,NULL) in some cases may cause truncation of sub-second portions of
+timestamps. If utimes(...,NULL) is available, use it instead to avoid this
+problem.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
+--- ccache-2.4.orig/ccache.c	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/ccache.c	2006-06-09 16:29:16.695117780 -0700
+@@ -481,7 +481,11 @@
+ 		return;
+ 	}
+ 
++#ifdef HAVE_UTIMES
++	utimes(stderr_file, NULL);
++#else
+ 	utime(stderr_file, NULL);
++#endif
+ 
+ 	if (strcmp(output_file, "/dev/null") == 0) {
+ 		ret = 0;
+@@ -515,7 +519,11 @@
+ 	}
+ 	if (ret == 0) {
+ 		/* update the mtime on the file so that make doesn't get confused */
++#ifdef HAVE_UTIMES
++		utimes(output_file, NULL);
++#else
+ 		utime(output_file, NULL);
++#endif
+ 	}
+ 
+ 	/* get rid of the intermediate preprocessor file */
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.h ccache-2.4/ccache.h
+--- ccache-2.4.orig/ccache.h	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/ccache.h	2006-06-09 16:28:16.601658626 -0700
+@@ -22,6 +22,9 @@
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+ #endif
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
+ 
+ #define STATUS_NOTFOUND 3
+ #define STATUS_FATAL 4
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/config.h.in ccache-2.4/config.h.in
+--- ccache-2.4.orig/config.h.in	2003-09-27 21:48:17.000000000 -0700
++++ ccache-2.4/config.h.in	2006-06-09 16:25:43.000000000 -0700
+@@ -19,6 +19,9 @@
+ /* Define to 1 if you have the `gethostname' function. */
+ #undef HAVE_GETHOSTNAME
+ 
++/* Define to 1 if you have the `getpwuid' function. */
++#undef HAVE_GETPWUID
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+@@ -31,6 +34,9 @@
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+ 
++/* Define to 1 if you have the <pwd.h> header file. */
++#undef HAVE_PWD_H
++
+ /* Define to 1 if you have the `realpath' function. */
+ #undef HAVE_REALPATH
+ 
+@@ -60,6 +66,9 @@
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+ 
++/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H
++
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+ 
+@@ -69,6 +78,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* Define to 1 if you have the `utimes' function. */
++#undef HAVE_UTIMES
++
+ /* Define to 1 if you have the `vasprintf' function. */
+ #undef HAVE_VASPRINTF
+ 
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/configure.in ccache-2.4/configure.in
+--- ccache-2.4.orig/configure.in	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/configure.in	2006-06-09 16:25:15.541288184 -0700
+@@ -27,10 +27,11 @@
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
+ 
+-AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h)
++AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h)
+ 
+ AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp)
+ AC_CHECK_FUNCS(gethostname getpwuid)
++AC_CHECK_FUNCS(utimes)
+ 
+ AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
+     AC_TRY_COMPILE(
diff --git a/dev-util/ccache/files/digest-ccache-2.4-r2 b/dev-util/ccache/files/digest-ccache-2.4-r2
new file mode 100644
index 000000000000..309204b80d28
--- /dev/null
+++ b/dev-util/ccache/files/digest-ccache-2.4-r2
@@ -0,0 +1 @@
+MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363