Fix build when configure is regenerated using autoconf-2.60 by

ed@catmur.co.uk, bug #138535. Use ewarn consistenly, bug #137484.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 31 insertions, 26 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 20aa967883d9..72cb5acba5e8 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.121 2006/06/29 20:31:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.122 2006/07/05 23:27:41 exg Exp $
+
+  05 Jul 2006; Emanuele Giaquinta <exg@gentoo.org> files/krb5.conf,
+  mit-krb5-1.4.3.ebuild, mit-krb5-1.4.3-r1.ebuild:
+  Fix build when configure is regenerated using autoconf-2.60 by
+  ed@catmur.co.uk, bug #138535. Use ewarn consistenly, bug #137484.
 
   29 Jun 2006; Seemant Kulleen <seemant@gentoo.org>
   mit-krb5-1.4.3-r1.ebuild:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 834bbdebc1b5..8cc50b39d90a 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,10 +2,10 @@ AUX kdc.conf 438 RMD160 c2f29dba3a0b270a5b219741d1ffad07dd62951d SHA1 25b204242b
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 RMD160 c2f29dba3a0b270a5b219741d1ffad07dd62951d files/kdc.conf 438
 SHA256 ad7507da8acfb7d8a37ca83f414e5eb25faf4374a879a48c7af6cdd8fb5ae113 files/kdc.conf 438
-AUX krb5.conf 541 RMD160 1f5a13d05a1ba7a559468a19c58de106309ed053 SHA1 d3ac19d8a26cd0f2bb900668e8e4dc79da105db3 SHA256 552280cb28430cef4384c1c6e8b9d35d6a1d86f03bd71d70bbc674752c2d1be9
-MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
-RMD160 1f5a13d05a1ba7a559468a19c58de106309ed053 files/krb5.conf 541
-SHA256 552280cb28430cef4384c1c6e8b9d35d6a1d86f03bd71d70bbc674752c2d1be9 files/krb5.conf 541
+AUX krb5.conf 535 RMD160 10def47f5a70343adfbca1efed1dd50621989b2c SHA1 4e2f63d4d727f07decd10ea53fee9568d1856c9e SHA256 2786ed970daeefbc2a2d1e43e9bc0b3f6b203455cc4732e084df035cf51fda42
+MD5 7b01aae6304a0f75d2edbbd8895e06ef files/krb5.conf 535
+RMD160 10def47f5a70343adfbca1efed1dd50621989b2c files/krb5.conf 535
+SHA256 2786ed970daeefbc2a2d1e43e9bc0b3f6b203455cc4732e084df035cf51fda42 files/krb5.conf 535
 AUX krb5.confd 233 RMD160 b85d8a56c17ea695e0ca7f3287cff5bd2691cc5e SHA1 5cb0b01beee0b85e305423df36886683cd3d398e SHA256 b8a885fbebe397f2c302e8fd7f2b038d649da2dea3b36e8fbcdc99d395d99ac5
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
 RMD160 b85d8a56c17ea695e0ca7f3287cff5bd2691cc5e files/krb5.confd 233
@@ -39,18 +39,18 @@ MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b files/mit-krb5kdc.initd 656
 SHA256 d813dbf3ee89f0da6b73455fd8759898223529c4cf7c1c2ec64a3128363194e2 files/mit-krb5kdc.initd 656
 DIST krb5-1.4.3-signed.tar 7290880 RMD160 838425b59bf37da69c927eb346be78d059fa6db7 SHA1 94bd12d664b1ef32bbf5b8ffe062fe473909f9a7 SHA256 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe
-EBUILD mit-krb5-1.4.3-r1.ebuild 3101 RMD160 e22afb760f7974c2669263ad1811091881f1c670 SHA1 121063c40d075f074a5a02cafd8c40750352be68 SHA256 1d5d44a579ab3e1aef6b83e3d18b00d2f7ef0dcc055cc208735538be2609dc34
-MD5 c56838923c98d2a524cbb20a5ce76102 mit-krb5-1.4.3-r1.ebuild 3101
-RMD160 e22afb760f7974c2669263ad1811091881f1c670 mit-krb5-1.4.3-r1.ebuild 3101
-SHA256 1d5d44a579ab3e1aef6b83e3d18b00d2f7ef0dcc055cc208735538be2609dc34 mit-krb5-1.4.3-r1.ebuild 3101
-EBUILD mit-krb5-1.4.3.ebuild 2733 RMD160 be04f6098eaff9b40a02d58c1451a0a850f36e9b SHA1 6d613d8b9f28d5d6d5b3a559c5b670d65b8f6f18 SHA256 dbe9f30be3fc2c0ab4f22f3dae3b6a56d5a08abd534b0d4f1087ae5e560c6f4a
-MD5 868d6455f084c2dfacfc1a0989a1295a mit-krb5-1.4.3.ebuild 2733
-RMD160 be04f6098eaff9b40a02d58c1451a0a850f36e9b mit-krb5-1.4.3.ebuild 2733
-SHA256 dbe9f30be3fc2c0ab4f22f3dae3b6a56d5a08abd534b0d4f1087ae5e560c6f4a mit-krb5-1.4.3.ebuild 2733
-MISC ChangeLog 20256 RMD160 a7423461532e3c19280d12734462352768151d0d SHA1 e5eb4bec2d0e35c907953367811300727a08d546 SHA256 1e561436e606a5cb1ae706e4a1ad127337f264d1fd69728a91e575c969ec38e1
-MD5 53afe1fabb2f9bd7e65f9dcbcf2a492a ChangeLog 20256
-RMD160 a7423461532e3c19280d12734462352768151d0d ChangeLog 20256
-SHA256 1e561436e606a5cb1ae706e4a1ad127337f264d1fd69728a91e575c969ec38e1 ChangeLog 20256
+EBUILD mit-krb5-1.4.3-r1.ebuild 3162 RMD160 558321abf9a9dd0b61cfbb921732629067383813 SHA1 df23adfb9f84d27babe433fe9503c4fae33cab47 SHA256 9fd1e63f7a1d0882d68b076af9ae7cfd259398ad413ff807d752e437f2c3706a
+MD5 5ea980ea492325fcf99d32cdf3ed5473 mit-krb5-1.4.3-r1.ebuild 3162
+RMD160 558321abf9a9dd0b61cfbb921732629067383813 mit-krb5-1.4.3-r1.ebuild 3162
+SHA256 9fd1e63f7a1d0882d68b076af9ae7cfd259398ad413ff807d752e437f2c3706a mit-krb5-1.4.3-r1.ebuild 3162
+EBUILD mit-krb5-1.4.3.ebuild 2729 RMD160 2e286302e7d7479c4416fe555416cdbe6d8c8c9a SHA1 d227a6fbf908ef0ab669393ce7a6aad8b84b7dd5 SHA256 731df169e38eacfa6ed5a27be0c1446fc999ec40f7d19a751ef2bb978434c49d
+MD5 f58cf92a14b72d684b83e7a1a9ce5a38 mit-krb5-1.4.3.ebuild 2729
+RMD160 2e286302e7d7479c4416fe555416cdbe6d8c8c9a mit-krb5-1.4.3.ebuild 2729
+SHA256 731df169e38eacfa6ed5a27be0c1446fc999ec40f7d19a751ef2bb978434c49d mit-krb5-1.4.3.ebuild 2729
+MISC ChangeLog 20505 RMD160 f1a0b21b5f6c59eebf3e0df3bb1c015cf80b1833 SHA1 2327056bb7736e028310cb654901e6e52b2a339d SHA256 93a495f56899cebc8c755529d7a75b029a3d4f40f918cb393bd768b14dfefac2
+MD5 c20e3a0657448b2f6a623bdc01062962 ChangeLog 20505
+RMD160 f1a0b21b5f6c59eebf3e0df3bb1c015cf80b1833 ChangeLog 20505
+SHA256 93a495f56899cebc8c755529d7a75b029a3d4f40f918cb393bd768b14dfefac2 ChangeLog 20505
 MISC metadata.xml 241 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 SHA1 97dc5c2f74beed14ac9e171f36380370afae95be SHA256 119a622b44a5b38856cb9398389cf060f93a077b369161a5ab9a193234af763f
 MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 metadata.xml 241
diff --git a/app-crypt/mit-krb5/files/krb5.conf b/app-crypt/mit-krb5/files/krb5.conf
index e68a5ccbbf48..2b7231d1c9da 100644
--- a/app-crypt/mit-krb5/files/krb5.conf
+++ b/app-crypt/mit-krb5/files/krb5.conf
@@ -22,4 +22,3 @@
 	kdc = FILE:/var/log/krb5kdc.log
 	admin_server = FILE:/var/log/kadmin.log
 	default = FILE:/var/log/krb5lib.log
-	    
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild
index a8d2ae1ecc1f..1484aa68d56d 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild,v 1.12 2006/06/29 20:31:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild,v 1.13 2006/07/05 23:27:41 exg Exp $
 
 inherit eutils flag-o-matic versionator autotools
 
@@ -38,6 +38,7 @@ src_unpack() {
 	ebegin "Reconfiguring configure scripts (be patient)"
 	cd ${S}/appl/telnet
 	autoreconf --force -I ${S}
+	sed -i 's/^# \(@lib\(obj\)\?_frag@\)/\1/' libtelnet/Makefile.in
 	eend $?
 }
 
@@ -133,9 +134,9 @@ pkg_postinst() {
 	fi
 	echo ""
 	ewarn "PLEASE READ THIS"
-	einfo "This release of mit-krb5 now depends on an external version"
-	einfo "of the com_err library.  Please make sure to run revdep-rebuild"
-	einfo "to ensure the integrity of the linking on your system"
+	ewarn "This release of mit-krb5 now depends on an external version"
+	ewarn "of the com_err library.  Please make sure to run revdep-rebuild"
+	ewarn "to ensure the integrity of the linking on your system"
 	echo ""
 	epause 10
 	ebeep
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild
index 1903f7b54a6a..c1e8ff60f7e4 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild,v 1.12 2006/05/22 13:44:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3.ebuild,v 1.13 2006/07/05 23:27:41 exg Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -121,9 +121,9 @@ pkg_postinst() {
 	fi
 	echo ""
 	ewarn "PLEASE READ THIS"
-	einfo "This release of mit-krb5 now depends on an external version"
-	einfo "of the com_err library.  Please make sure to run revdep-rebuild"
-	einfo "to ensure the integrity of the linking on your system"
+	ewarn "This release of mit-krb5 now depends on an external version"
+	ewarn "of the com_err library.  Please make sure to run revdep-rebuild"
+	ewarn "to ensure the integrity of the linking on your system"
 	echo ""
 	epause 10
 	ebeep