Remove version from DESCRIPTION, fixes bug 105691

Package-Manager: portage-2.0.52-r1

5 files changed, 13 insertions, 13 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 652106020150..ef4f0b0a8030 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -16,10 +16,10 @@ MD5 2c34b40a3fe461014b19ca5e4763203e apache-1.3.33-r4.ebuild 8673
 MD5 eb173dd548089cf594c543d29b48948c apache-1.3.33-r5.ebuild 7105
 MD5 4076cfc82dfd527b50eba2a0dd479c8f apache-1.3.33-r6.ebuild 7104
 MD5 ca6b47f0c2a0006b71fc1153937824e5 apache-1.3.33.ebuild 6927
-MD5 ba03c4e043789f82af1967df63f04e5c apache-2.0.54-r15.ebuild 12613
-MD5 2ddaadd5674de61b49fbbb0bcf859036 apache-2.0.54-r30.ebuild 12945
-MD5 958e5da244d9e413badd69b3a3c9d421 apache-2.0.54-r31.ebuild 13233
-MD5 6984dca404209fbedd4492e8ffdd8298 apache-2.0.54-r9.ebuild 12609
+MD5 25d5c2729eb45c9f20da7fd62854d4d7 apache-2.0.54-r15.ebuild 12598
+MD5 be59fbc220730a0212fbf6f34a1a6652 apache-2.0.54-r30.ebuild 12930
+MD5 48f0869e6b3b01ab0f3de03d7a0a0aaf apache-2.0.54-r31.ebuild 13261
+MD5 e1e33b99a1b8f95a419f0e95a6ebb2dc apache-2.0.54-r9.ebuild 12595
 MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
diff --git a/net-www/apache/apache-2.0.54-r15.ebuild b/net-www/apache/apache-2.0.54-r15.ebuild
index 945863584ee1..779fde8379c3 100644
--- a/net-www/apache/apache-2.0.54-r15.ebuild
+++ b/net-www/apache/apache-2.0.54-r15.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r15.ebuild,v 1.7 2005/09/17 15:21:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r15.ebuild,v 1.8 2005/09/23 04:36:51 vericgar Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
 PATCH_LEVEL="${PVR}"
 S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
+DESCRIPTION="Apache Web Server"
 HOMEPAGE="http://www.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
diff --git a/net-www/apache/apache-2.0.54-r30.ebuild b/net-www/apache/apache-2.0.54-r30.ebuild
index df192b9ef768..d7a7eda8748c 100644
--- a/net-www/apache/apache-2.0.54-r30.ebuild
+++ b/net-www/apache/apache-2.0.54-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.3 2005/09/15 01:11:22 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.4 2005/09/23 04:36:51 vericgar Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ GENTOO_PATCHSTAMP="20050910"
 GENTOO_DEVSPACE="vericgar"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
+DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
diff --git a/net-www/apache/apache-2.0.54-r31.ebuild b/net-www/apache/apache-2.0.54-r31.ebuild
index 40e4de9104b0..6f925d191045 100644
--- a/net-www/apache/apache-2.0.54-r31.ebuild
+++ b/net-www/apache/apache-2.0.54-r31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.9 2005/09/20 21:17:58 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.10 2005/09/23 04:36:51 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -10,7 +10,7 @@ GENTOO_PATCHSTAMP="20050918-02"
 GENTOO_DEVSPACE="vericgar"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
-DESCRIPTION="The Apache Web Server, Version 2.0.x"
+DESCRIPTION="The Apache Web Server"
 HOMEPAGE="http://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
@@ -308,7 +308,7 @@ src_install () {
 pkg_postinst() {
 
 	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
+	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
 		cd ${ROOT}/etc/apache2/ssl
 		einfo
 		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
diff --git a/net-www/apache/apache-2.0.54-r9.ebuild b/net-www/apache/apache-2.0.54-r9.ebuild
index 9906e7266cdc..ff23a00a12c7 100644
--- a/net-www/apache/apache-2.0.54-r9.ebuild
+++ b/net-www/apache/apache-2.0.54-r9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r9.ebuild,v 1.10 2005/09/04 11:13:57 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r9.ebuild,v 1.11 2005/09/23 04:36:51 vericgar Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
 PATCH_LEVEL="${PVR}"
 S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server, Version 2.0.x"
+DESCRIPTION="Apache Web Server"
 HOMEPAGE="http://www.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2