Undo previous commit. This does not work on FreeBSD.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

4 files changed, 9 insertions, 40 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index bc2dffb88014..4d2d171314d6 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,11 +1,6 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.308 2009/03/29 09:36:44 ulm Exp $
-
-  29 Mar 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r18.ebuild,
-  emacs-22.3-r2.ebuild:
-  Warn about possible problems if the package manager does not preserve file
-  modification times, bugs 181021 and 264130.
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.309 2009/03/31 16:38:13 ulm Exp $
 
 *emacs-21.4-r18 (12 Mar 2009)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index cd6e49e2fd6a..193366d9fdab 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -14,15 +14,15 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2516 RMD160 eec73e8fcf1462b945f9414a7db44268961eb7a0 SHA1 050566fc795050ce3609aec693e34217fabd5334 SHA256 92024b0574b11ea073e13cd92c9a652884fed2e817d7d66a5adcc463d1dcd76f
 EBUILD emacs-21.4-r17.ebuild 5443 RMD160 ff69721fc3961fc62e33a3764eba74f1e48b3f80 SHA1 3d5415d956226c7c1c38d8fcc793604e45fcb857 SHA256 5999f9cc74aae00661dfe270cf9a9feeb69bc4dc456e70c9a754dde72c33f1b1
-EBUILD emacs-21.4-r18.ebuild 5814 RMD160 f7cb66b8776c4aaeff4747ae03a41b6b5c452037 SHA1 f269a64f4a708322606436403d4e2be02f29d4b9 SHA256 497f445cbd38a45140790c918defa3ec60bb3ef23e688e42fb7d794568a605b2
+EBUILD emacs-21.4-r18.ebuild 5299 RMD160 465c9d255b59751376a9ad539b08c903f6f32ab4 SHA1 4581d6a5d8eed2902768aa812d74d2338a1132ad SHA256 78fcb31ca4459cae5f6213d85b08b2e9c54bdf47b1b2b0994d0fddfe2d78c338
 EBUILD emacs-22.3-r1.ebuild 8044 RMD160 bfc81e97b345c90fdc2bfff90d4066f4d0058b6d SHA1 305304da89dccf016caacaa64460755aa8419b12 SHA256 7e38a07bc7b1e120ae12d4d2962f337f2aa0eed172fab1f3c8a0a4bbaee1d0bc
-EBUILD emacs-22.3-r2.ebuild 8433 RMD160 8076c89a8c7b7fc1d17b86e008657050aab5de43 SHA1 5e638fa19d8ede5dbdb62d6bfd3b3b66c5da67ca SHA256 1006a3f3e95cb6fd66e824b2aa088b6e0b469a343ae3ab3c4426b0b034cb19c2
-MISC ChangeLog 44666 RMD160 17701c74bf06a8fc27038b876ea7a5706754870c SHA1 85824b177989973b92f96c578bb3f874194c7c99 SHA256 b3b43bf833fe834274fdfc1889c5f6c6f3542f36ff23a42bb7e4c38160c47a28
+EBUILD emacs-22.3-r2.ebuild 7918 RMD160 107255360dfae93ba25e44a45712a76c776c9886 SHA1 7b23860d2ea9b52e051327492cd253aad52c7e5b SHA256 f3805fc280d225d7982ac989363d24bad2dcea96bb061cb811aff0935e690f98
+MISC ChangeLog 44448 RMD160 a99a909b5b3c7bd4af29e426e0e83741080e7fab SHA1 0f57b616326438eda7f075de1c8d4873fc89ff79 SHA256 97a10b5b60941bbeb2a072da2881bf36bc8636d1b6cab4dd934661d0487d60db
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknRtSEACgkQOeoy/oIi7uyorACggqom2EjudjMu6oJABrbIXntV
-bvkAoOVgugvhLQ7gb6/XpHPB2OXTtJeb
-=IA1z
+iEYEARECAAYFAknSR0wACgkQOeoy/oIi7uzXvACfY24eCK49tRSt7X4OUGCRBXF2
+YdMAoOksdoFUtlMQ2eEuefVTRYpB2BRn
+=Y/Qk
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r18.ebuild b/app-editors/emacs/emacs-21.4-r18.ebuild
index e5ec3d974db7..e24aa21c6416 100644
--- a/app-editors/emacs/emacs-21.4-r18.ebuild
+++ b/app-editors/emacs/emacs-21.4-r18.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/app-editors/emacs/emacs-21.4-r18.ebuild,v 1.3 2009/03/31 06:14:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r18.ebuild,v 1.4 2009/03/31 16:38:13 ulm Exp $
 
 EAPI=2
 WANT_AUTOCONF="2.1"
@@ -145,9 +145,6 @@ src_install() {
 	keepdir /usr/share/emacs/${PV}/leim
 
 	dodoc BUGS ChangeLog README
-
-	stamp_subdirs_el=$(stat --format=%Y \
-		"${D}/usr/share/emacs/${FULL_VERSION}/lisp/subdirs.el")
 }
 
 emacs-infodir-rebuild() {
@@ -181,16 +178,6 @@ pkg_postinst() {
 		elog "You disabled sendmail support for Emacs. If you later install"
 		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
 	fi
-
-	local stamp=$(stat --format=%Y \
-		"${ROOT}/usr/share/emacs/${FULL_VERSION}/lisp/subdirs.el")
-	if [ "${stamp}" != "${stamp_subdirs_el}" ]; then
-		echo
-		ewarn "Your package manager does not preserve file modification times"
-		ewarn "when merging. This is a known issue with some package managers"
-		ewarn "and can trigger spurious warnings in Emacs at run time. These"
-		ewarn "warnings can be safely ignored."
-	fi
 }
 
 pkg_postrm() {
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index 1ead27462f26..f8c4cb3cf020 100644
--- a/app-editors/emacs/emacs-22.3-r2.ebuild
+++ b/app-editors/emacs/emacs-22.3-r2.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/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.5 2009/03/31 06:14:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.6 2009/03/31 16:38:13 ulm Exp $
 
 EAPI=2
 
@@ -209,9 +209,6 @@ src_install () {
 	elisp-site-file-install "${SITEFILE}" || die
 
 	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-
-	stamp_subdirs_el=$(stat --format=%Y \
-		"${D}/usr/share/emacs/${FULL_VERSION}/lisp/subdirs.el")
 }
 
 emacs-infodir-rebuild() {
@@ -252,16 +249,6 @@ pkg_postinst() {
 	elog "the Emacs eselect module, which also redirects man and info pages."
 	elog "Therefore, several Emacs versions can be installed at the same time."
 	elog "\"man emacs.eselect\" for details."
-
-	local stamp=$(stat --format=%Y \
-		"${ROOT}/usr/share/emacs/${FULL_VERSION}/lisp/subdirs.el")
-	if [ "${stamp}" != "${stamp_subdirs_el}" ]; then
-		echo
-		ewarn "Your package manager does not preserve file modification times"
-		ewarn "when merging. This is a known issue with some package managers"
-		ewarn "and can trigger spurious warnings in Emacs at run time. These"
-		ewarn "warnings can be safely ignored."
-	fi
 }
 
 pkg_postrm() {