dependency fix, see bug #86052

(Portage version: 2.0.51.19)

6 files changed, 134 insertions, 64 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index 441a6c64752a..99f892eb98b3 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.66 2005/03/21 11:25:47 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.67 2005/04/09 15:28:14 hollow Exp $
+
+*mod_ssl-2.8.22-r1 (09 Apr 2005)
+
+  09 Apr 2005; Benedikt Boehm <hollow@gentoo.org> mod_ssl-2.8.21.ebuild,
+  mod_ssl-2.8.22.ebuild, +mod_ssl-2.8.22-r1.ebuild:
+  fixed dependency issues: moved 2.8.22 to 2.8.22-r1, fixed deps in 2.8.21
+  and moved 2.8.21 to 2.8.22 to support 1.3.33-r1, see bug #86052
 
   21 Mar 2005; Elfyn McBratney <beu@gentoo.org> mod_ssl-2.8.21.ebuild:
   Fix DEPEND.
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index f8469349915e..67f460130e04 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,29 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 27bb70b8dcb104299de9a34c2fa01481 ChangeLog 8270
 MD5 41d6c0ba999d7b4af929e07368693a3f metadata.xml 261
 MD5 609be93e28d891306f418387b75ce2b7 mod_ssl-2.8.17.ebuild 2182
 MD5 48f150354d6b2e4ca36a0d093cb1a163 mod_ssl-2.8.18.ebuild 2181
-MD5 d9f339a959f17cb630cadf5c08ee32fd ChangeLog 7969
-MD5 8ca0688117f55aa5bdded72aa78cb6a9 mod_ssl-2.8.22.ebuild 1769
-MD5 57a374eec3e448726d28e0e8289cd740 mod_ssl-2.8.21.ebuild 2447
-MD5 41fcd0884bdc50fde055a124928bee00 mod_ssl-2.8.20.ebuild 2283
 MD5 5733724945a027232dbf298c455eca94 mod_ssl-2.8.19.ebuild 2284
-MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
-MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
+MD5 41fcd0884bdc50fde055a124928bee00 mod_ssl-2.8.20.ebuild 2283
+MD5 845a98719239bf92108189c4996839a0 mod_ssl-2.8.21.ebuild 2291
+MD5 8ca0688117f55aa5bdded72aa78cb6a9 mod_ssl-2.8.22-r1.ebuild 1769
+MD5 234b204ad4d99cc1a2a96706e56c0cb6 mod_ssl-2.8.22.ebuild 2298
 MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
+MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
 MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
-MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
 MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
 MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
+MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
+MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
+MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
 MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
 MD5 289c880e2ff1c2de91eda32e7e486085 files/digest-mod_ssl-2.8.21 73
-MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
-MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCPq9IjUHll2nfF60RAiJAAKCIEoHqwzlsaeUXQ2xMFzMDcLT2jQCgmfFT
-9fLaXWTqtmb6dNyDvzH5ca0=
-=voOE
------END PGP SIGNATURE-----
+MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22-r1 73
+MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.22-r1 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.22-r1
new file mode 100644
index 000000000000..267b39a4c268
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.22-r1
@@ -0,0 +1 @@
+MD5 cdfdf1f576f77768c90825b43b462405 mod_ssl-2.8.22-1.3.33.tar.gz 754606
diff --git a/net-www/mod_ssl/mod_ssl-2.8.21.ebuild b/net-www/mod_ssl/mod_ssl-2.8.21.ebuild
index dc4c3863878a..8d92df484439 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.21.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.21.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/mod_ssl/mod_ssl-2.8.21.ebuild,v 1.15 2005/03/21 11:25:47 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.21.ebuild,v 1.16 2005/04/09 15:28:14 hollow Exp $
 
 MY_P=${P}-1.3.32
 S=${WORKDIR}/${MY_P}
@@ -13,12 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
 IUSE=""
 
-DEPEND="|| (
-		=net-www/apache-1.3.32*
-		=net-www/apache-1.3.33
-		=net-www/apache-1.3.33-r1
-	)
-	>=dev-libs/openssl-0.9.6k"
+DEPEND="=net-www/apache-1.3.32*
+		>=dev-libs/openssl-0.9.6k"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
@@ -29,16 +25,10 @@ src_unpack() {
 }
 
 src_compile() {
-	myconf=""
-
 	if has_version '=sys-libs/gdbm-1.8.3*' ; then
 	     myconf="--enable-rule=SSL_SDBM"
 	fi
 
-	if has_version '=net-www/apache-1.3.33' ; then
-		myconf="${myconf} --force"
-	fi
-
 	SSL_BASE=SYSTEM \
 	./configure \
 		--with-apxs=/usr/sbin/apxs ${myconf} || die "bad ./configure"
diff --git a/net-www/mod_ssl/mod_ssl-2.8.22-r1.ebuild b/net-www/mod_ssl/mod_ssl-2.8.22-r1.ebuild
new file mode 100644
index 000000000000..056849a8fd06
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.22-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.22-r1.ebuild,v 1.1 2005/04/09 15:28:14 hollow Exp $
+
+inherit apache-module
+
+MY_P=${P}-1.3.33
+
+DESCRIPTION="An SSL module for the Apache Web server"
+HOMEPAGE="http://www.modssl.org/"
+SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
+
+KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6k"
+
+S=${WORKDIR}/${MY_P}
+
+APACHE1_MOD_FILE="${S}/pkg.sslmod/libssl.so"
+APACHE1_MOD_CONF="10_${PN}"
+APACHE1_MOD_DEFINE="SSL"
+
+VHOSTFILE="default-ssl"
+
+DOCFILES="ANNOUNCE CHANGES CREDITS LICENSE NEWS README*"
+
+need_apache1
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	# proper path to openssl
+	sed -i -e 's:^\(openssl=\).*:\1"/usr/bin/openssl":' pkg.contrib/cca.sh
+}
+
+src_compile() {
+	if has_version '=sys-libs/gdbm-1.8.3*' ; then
+	     myconf="--enable-rule=SSL_SDBM"
+	fi
+
+	SSL_BASE=SYSTEM \
+	./configure \
+		--with-apxs=${APXS1} ${myconf} || die "bad ./configure"
+	make || die "compile problem"
+}
+
+src_install() {
+	apache1_src_install
+
+	insinto ${APACHE1_VHOSTDIR}
+	doins ${FILESDIR}/${VHOSTFILE}.conf
+
+	exeinto /usr/lib/ssl/mod_ssl
+	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
+
+	dodir /usr/share/doc/${PF}/html
+	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+	install -d -o root -g root -m0755 ${ROOT}${APACHE1_CONFDIR}/ssl
+
+	apache1_pkg_postinst
+
+	cd ${ROOT}${APACHE1_CONFDIR}/ssl
+	einfo "Generating self-signed test certificate in ${APACHE1_CONFDIR}/ssl..."
+	einfo "(Ignore any message from the yes command below)"
+	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
+	einfo
+}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.22.ebuild b/net-www/mod_ssl/mod_ssl-2.8.22.ebuild
index 31fae36a9635..36ad16ceb937 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.22.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.22.ebuild
@@ -1,40 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.22.ebuild,v 1.2 2005/03/09 19:04:33 corsair Exp $
-
-inherit apache-module
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.22.ebuild,v 1.3 2005/04/09 15:28:14 hollow Exp $
 
 MY_P=${P}-1.3.33
-
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="An SSL module for the Apache Web server"
 HOMEPAGE="http://www.modssl.org/"
 SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
 
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6k"
-
-S=${WORKDIR}/${MY_P}
-
-APACHE1_MOD_FILE="${S}/pkg.sslmod/libssl.so"
-APACHE1_MOD_CONF="10_${PN}"
-APACHE1_MOD_DEFINE="SSL"
-
-VHOSTFILE="default-ssl"
-
-DOCFILES="ANNOUNCE CHANGES CREDITS LICENSE NEWS README*"
-
-need_apache1
+DEPEND="=net-www/apache-1.3.33*
+		>=dev-libs/openssl-0.9.6k"
 
 src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
+	unpack ${A} ; cd ${S}
 	# proper path to openssl
-	sed -i -e 's:^\(openssl=\).*:\1"/usr/bin/openssl":' pkg.contrib/cca.sh
+	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
+	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
+		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
 }
 
 src_compile() {
@@ -44,31 +31,50 @@ src_compile() {
 
 	SSL_BASE=SYSTEM \
 	./configure \
-		--with-apxs=${APXS1} ${myconf} || die "bad ./configure"
+		--with-apxs=/usr/sbin/apxs ${myconf} || die "bad ./configure"
 	make || die "compile problem"
 }
 
 src_install() {
-	apache1_src_install
-
-	insinto ${APACHE1_VHOSTDIR}
-	doins ${FILESDIR}/${VHOSTFILE}.conf
+	exeinto /usr/lib/apache-extramodules
+	doexe pkg.sslmod/libssl.so
 
 	exeinto /usr/lib/ssl/mod_ssl
 	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
 
+	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
 	dodir /usr/share/doc/${PF}/html
 	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
+
+	insinto /etc/apache/conf/vhosts
+	doins ${FILESDIR}/ssl.default-vhost.conf
+
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mod_ssl.conf
 }
 
 pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}${APACHE1_CONFDIR}/ssl
+	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
 
-	apache1_pkg_postinst
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
 
-	cd ${ROOT}${APACHE1_CONFDIR}/ssl
-	einfo "Generating self-signed test certificate in ${APACHE1_CONFDIR}/ssl..."
+	cd ${ROOT}/etc/apache/conf/ssl
+	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
 	einfo "(Ignore any message from the yes command below)"
 	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
 	einfo
 }
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libssl.so mod_ssl.c ssl_module \
+		define=SSL addconf=conf/addon-modules/mod_ssl.conf
+
+	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
+		>> ${ROOT}/etc/apache/conf/apache.conf
+}