Install the sample conf files as .conf.example files instead, fixing bug #115443 by Trev Peterson, with the fix by Axel Dyks

Package-Manager: portage-2.1_rc1-r4

5 files changed, 21 insertions, 40 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 5a53e30c5932..1ecb0696ebe7 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.101 2006/05/21 21:18:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.102 2006/05/22 14:50:19 seemant Exp $
+
+  22 May 2006; Seemant Kulleen <seemant@gentoo.org> heimdal-0.7.2.ebuild,
+  heimdal-0.7.2-r1.ebuild:
+  Install the sample conf files as .conf.example files instead, fixing bug
+  #115443 by Trev Peterson, with the fix by Axel Dyks
 
 *heimdal-0.7.2-r1 (21 May 2006)
 
diff --git a/app-crypt/heimdal/heimdal-0.7.2-r1.ebuild b/app-crypt/heimdal/heimdal-0.7.2-r1.ebuild
index a833f10a9d6f..d1788f184f77 100644
--- a/app-crypt/heimdal/heimdal-0.7.2-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-0.7.2-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/heimdal/heimdal-0.7.2-r1.ebuild,v 1.1 2006/05/21 21:18:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r1.ebuild,v 1.2 2006/05/22 14:50:19 seemant Exp $
 
 inherit autotools libtool eutils virtualx toolchain-funcs
 
@@ -124,9 +124,9 @@ src_install() {
 	doinitd ${GENTOODIR}/configs/heimdal-kpasswdd
 
 	insinto /etc
-	doins ${GENTOODIR}/configs/krb5.conf
+	newins ${GENTOODIR}/configs/krb5.conf krb5.conf.example
 
-	sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf
+	sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf.example
 
 	if use ldap; then
 		insinto /etc/openldap/schema
@@ -136,18 +136,3 @@ src_install() {
 	# default database dir
 	keepdir /var/heimdal
 }
-
-pkg_postinst() {
-	echo
-	ewarn "DANGER WILL ROBINSON!"
-	einfo "There has been a change in the libgssapi shared library version"
-	einfo "This means that _EVERYTHING_ that linked against libgssapi.so.1"
-	einfo "will now be broken.  Examples include, but may not be limited to:"
-	einfo "samba, mozilla, mozilla-firefox, subversion and neon, cvs, "
-	einfo "evolution-data-server, and gnome-vfs.  As a consequence:"
-	ewarn "PLEASE PLEASE PLEASE PLEASE PLEASE run revdep-rebuild right now"
-	epause
-	ebeep 10
-	echo
-}
-
diff --git a/app-crypt/heimdal/heimdal-0.7.2.ebuild b/app-crypt/heimdal/heimdal-0.7.2.ebuild
index 5c6d037b9f5e..446aa2c11fbb 100644
--- a/app-crypt/heimdal/heimdal-0.7.2.ebuild
+++ b/app-crypt/heimdal/heimdal-0.7.2.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/heimdal/heimdal-0.7.2.ebuild,v 1.11 2006/05/21 20:44:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2.ebuild,v 1.12 2006/05/22 14:50:19 seemant Exp $
 
 inherit autotools libtool eutils virtualx toolchain-funcs
 
@@ -124,9 +124,9 @@ src_install() {
 	doinitd ${GENTOODIR}/configs/heimdal-kpasswdd
 
 	insinto /etc
-	doins ${GENTOODIR}/configs/krb5.conf
+	newins ${GENTOODIR}/configs/krb5.conf krb5.conf.example
 
-	sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf
+	sed -i "s:/lib:/$(get_libdir):" ${D}/etc/krb5.conf.example
 
 	if use ldap; then
 		insinto /etc/openldap/schema
@@ -136,18 +136,3 @@ src_install() {
 	# default database dir
 	keepdir /var/heimdal
 }
-
-pkg_postinst() {
-	echo
-	ewarn "DANGER WILL ROBINSON!"
-	einfo "There has been a change in the libgssapi shared library version"
-	einfo "This means that _EVERYTHING_ that linked against libgssapi.so.1"
-	einfo "will now be broken.  Examples include, but may not be limited to:"
-	einfo "samba, mozilla, mozilla-firefox, subversion and neon, cvs, "
-	einfo "evolution-data-server, and gnome-vfs.  As a consequence:"
-	ewarn "PLEASE PLEASE PLEASE PLEASE PLEASE run revdep-rebuild right now"
-	epause
-	ebeep 10
-	echo
-}
-
diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 1ab428b6c29c..b4868adbee0d 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.114 2006/05/22 13:44:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.115 2006/05/22 14:46:28 seemant Exp $
+
+  22 May 2006; Seemant Kulleen <seemant@gentoo.org>
+  mit-krb5-1.4.3-r1.ebuild:
+  Install the sample conf files as .conf.example files instead, fixing bug
+  #115443 by Trev Peterson, with the fix by Axel Dyks
 
   22 May 2006; Seemant Kulleen <seemant@gentoo.org> mit-krb5-1.4.3.ebuild,
   mit-krb5-1.4.3-r1.ebuild:
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 3c4cd9c2596f..60955bedff7a 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.5 2006/05/22 13:44:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3-r1.ebuild,v 1.6 2006/05/22 14:46:28 seemant Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -116,7 +116,8 @@ src_install() {
 	newinitd ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
 
 	insinto /etc
-	doins ${FILESDIR}/k{rb5,dc}.conf
+	newins ${FILESDIR}/krb5.conf krb5.conf.example
+	newins ${FILESDIR}/kdc.conf kdc.conf.example
 }
 
 pkg_postinst() {