remove old warning cruft

(Portage version: 2.2_pre8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64)

2 files changed, 7 insertions, 89 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 0d32cc15c709..db864063b08e 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.75 2008/06/15 16:03:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.76 2008/06/15 16:09:37 hollow Exp $
+
+  15 Jun 2008; Benedikt Böhm <hollow@gentoo.org> apache-2.2.9.ebuild:
+  remove old warning cruft
 
 *apache-2.2.9 (15 Jun 2008)
 
diff --git a/www-servers/apache/apache-2.2.9.ebuild b/www-servers/apache/apache-2.2.9.ebuild
index dc891f335ec5..188b657ae4c0 100644
--- a/www-servers/apache/apache-2.2.9.ebuild
+++ b/www-servers/apache/apache-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9.ebuild,v 1.1 2008/06/15 16:03:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9.ebuild,v 1.2 2008/06/15 16:09:37 hollow Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20080615"
@@ -77,7 +77,7 @@ inherit apache-2
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
 
-# some helper scripts are apache-1.1, thus both are here
+# some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
@@ -98,41 +98,8 @@ src_unpack() {
 }
 
 pkg_preinst() {
-	has_version ">=${CATEGORY}/${PN}-2.2.4"
-	remove_upstream_configs=$?
-
-	has_version "<${CATEGORY}/${PN}-2.2.6-r1"
-	auth_ldap_define_changed=$?
-
-	has_version "<${CATEGORY}/${PN}-2.2.4-r7"
-	vhost_directives_moved=$?
-
-	has_version "<${CATEGORY}/${PN}-2.2.4-r5"
-	config_layout_changed=$?
-
-	has_version "<${CATEGORY}/${PN}-2.2.0"
-	previous_less_than_2_2_0=$?
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst
-
-	# previous installations of apache-2.2 installed the upstream configuration
-	# files, which shouldn't even have been installed!
-	if [[ $remove_upstream_configs = 0 ]] ; then
-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
-		fi
-
-		for i in extra original ; do
-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then
-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1
-			fi
-		done
-	fi
-
 	# note regarding IfDefine changes
-	if [[ $auth_ldap_define_changed = 0 ]] ; then
+	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
 		elog
 		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
 		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
@@ -140,56 +107,4 @@ pkg_postinst() {
 		elog "with AUTH_DIGEST now."
 		elog
 	fi
-
-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if [[ $vhost_directives_moved = 0 ]] ; then
-		elog
-		elog "Listen directives have been moved into the default virtual host"
-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
-		elog "(depending on your USE-flags.)"
-		elog
-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"
-		elog "be no listening sockets available."
-		elog
-	fi
-
-	# note the user of the config changes
-	if [[ $config_layout_changed = 0 ]] ; then
-		elog
-		elog "Please make sure that you update your /etc directory."
-		elog "Between the versions, we had to changes some config files"
-		elog "and move some stuff out of the main httpd.conf file to a seperate"
-		elog "modules.d entry."
-		elog
-		elog "Thus please update your /etc directory either via etc-update,"
-		elog "dispatch-conf or conf-update !"
-		elog
-	fi
-
-	# check for dual/upgrade install
-	if [[ $previous_less_than_2_2_0 = 0 ]] ; then
-		elog
-		elog "When upgrading from versions below 2.2.0 to this version, you"
-		elog "need to rebuild all your modules. Please do so for your modules"
-		elog "to continue working correctly."
-		elog
-		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"
-		elog "and that some modules, foremost the authentication related ones,"
-		elog "have been renamed."
-		elog
-		elog "Some examples:"
-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
-		elog
-		elog "For more information on what you may need to change, please"
-		elog "see the overview of changes at:"
-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-		elog "and the upgrading guide at:"
-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
-		elog
-	fi
-
-	# cleanup the vim backup files, placed in /etc/apache2 by the last
-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)
-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"
 }