Apache 1.X masking (fix ebuilds to not require apache-1*).

Package-Manager: portage-2.1.2.7

6 files changed, 37 insertions, 227 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 36f2043f7671..5948e3793666 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.50 2007/01/20 15:12:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.51 2007/05/12 04:44:46 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> -rt-3.2.1.ebuild,
+  rt-3.4.5.ebuild, rt-3.6.3.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   20 Jan 2007; Michael Cummings <mcummings@gentoo.org> rt-3.4.5.ebuild,
   rt-3.6.3.ebuild:
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 844212ca65be..37e5ce3182f7 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.2.1/postinstall-en.txt 1648 RMD160 9c815e52de1437f2dffaf21dfdb9e385c9304542 SHA1 e55e498670fe2897b22af8c292d4a0b34c67d94a SHA256 fb97b5637b5f02679b937b6113c28370ed06389d3527598f0a2887928a300d66
 MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
 RMD160 9c815e52de1437f2dffaf21dfdb9e385c9304542 files/3.2.1/postinstall-en.txt 1648
@@ -45,42 +42,27 @@ AUX rt_apache2_fcgi.conf 993 RMD160 a59e337ff39bf9a1cb8793d63f5cc6583f2a0615 SHA
 MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/rt_apache2_fcgi.conf 993
 RMD160 a59e337ff39bf9a1cb8793d63f5cc6583f2a0615 files/rt_apache2_fcgi.conf 993
 SHA256 166f5a60e443351228ba215a460603b106074e6f150e878a34ccd18b825026aa files/rt_apache2_fcgi.conf 993
-DIST rt-3.2.1.tar.gz 1201592 RMD160 31e7dd475a61a33454fc9ce06ebb545fbf216a82 SHA1 b1ce672b99cebe19895d1b9d3536c74fbcddbbb6 SHA256 b12241e83575d78dcb1e4dea50d3c8d6545a97eb10efec9c45a84a65304739a9
 DIST rt-3.4.5.tar.gz 1410154 RMD160 aa86f6cd4039ce6f6fdfaabf0e2807e93d0786b5 SHA1 a2609ffc168829a179bea70006e57aee6d6367f9 SHA256 20eb89af3245b7021e53cdefd0ed0716443c3a4f9e8536e0c2c29b901942e917
 DIST rt-3.6.3.tar.gz 1602818 RMD160 3eab454d374334e5df4939c2c4af316628b12965 SHA1 793de4655c0fa7bbfd3aa6eeefe5a1d143d07677 SHA256 fc29f1fd95b3cd4813e3fbdef1882e8cd6c4516c66b3e78237272bdd200a1a67
-EBUILD rt-3.2.1.ebuild 4293 RMD160 a1c20fc97a907193eed66763ff90a1cab7844ae1 SHA1 4d350c2aec5e6651e4cad4916568c354c52ae05d SHA256 9bc59124a4ec7432eaee6a1ebf0d2d1be8956a56bae6140682e0f3e62ba98527
-MD5 cdc4f41d51443794786fe2a3d68cddaa rt-3.2.1.ebuild 4293
-RMD160 a1c20fc97a907193eed66763ff90a1cab7844ae1 rt-3.2.1.ebuild 4293
-SHA256 9bc59124a4ec7432eaee6a1ebf0d2d1be8956a56bae6140682e0f3e62ba98527 rt-3.2.1.ebuild 4293
-EBUILD rt-3.4.5.ebuild 6315 RMD160 adfc09f3ee53f8deadf460a7dd5d0f8ab33df446 SHA1 ae58e40b8048f57f62eab5d0c9014ff89454c634 SHA256 61544e67c0c38a9d84a96c3542782db1acba84789c070d25c555fca35800af0b
-MD5 d8881b5b8470c64e55c638aeab9ab679 rt-3.4.5.ebuild 6315
-RMD160 adfc09f3ee53f8deadf460a7dd5d0f8ab33df446 rt-3.4.5.ebuild 6315
-SHA256 61544e67c0c38a9d84a96c3542782db1acba84789c070d25c555fca35800af0b rt-3.4.5.ebuild 6315
-EBUILD rt-3.6.3.ebuild 6519 RMD160 7e88bd7c8260d7e0f0d0ac67055e3fbcb4cfaa71 SHA1 77eb988bdd8d3be58148497018d033613c4aee69 SHA256 f8e986280a71ad432b1641829369f3a3b4521e7031eeb6b233fb77df3c0145c2
-MD5 4d4df581ab6c0006e7557e0debd55906 rt-3.6.3.ebuild 6519
-RMD160 7e88bd7c8260d7e0f0d0ac67055e3fbcb4cfaa71 rt-3.6.3.ebuild 6519
-SHA256 f8e986280a71ad432b1641829369f3a3b4521e7031eeb6b233fb77df3c0145c2 rt-3.6.3.ebuild 6519
-MISC ChangeLog 7578 RMD160 3a86761b4968224219812a754cd2b42c60f05766 SHA1 79a4dd907c39228d530f1844f0e32d45c061074c SHA256 c9b28fc2c308633a79f4ddf3cb6232487f051036e8c05defed3e612d176d869f
-MD5 a22f1faf286d4da2b9a19f39e644b928 ChangeLog 7578
-RMD160 3a86761b4968224219812a754cd2b42c60f05766 ChangeLog 7578
-SHA256 c9b28fc2c308633a79f4ddf3cb6232487f051036e8c05defed3e612d176d869f ChangeLog 7578
+EBUILD rt-3.4.5.ebuild 5996 RMD160 a7b4a0a76960fe6c74d8d2dd8a91bee257b6e0ed SHA1 9815ddc219d5e37e9ec11e0c3f3af0ffc0f80805 SHA256 c232434cf567d704eeacde2418e54694b349d73a15bcdd8b8bfe8f69c8a0196e
+MD5 5b50f85e3700406d6ed2293432f6043b rt-3.4.5.ebuild 5996
+RMD160 a7b4a0a76960fe6c74d8d2dd8a91bee257b6e0ed rt-3.4.5.ebuild 5996
+SHA256 c232434cf567d704eeacde2418e54694b349d73a15bcdd8b8bfe8f69c8a0196e rt-3.4.5.ebuild 5996
+EBUILD rt-3.6.3.ebuild 6200 RMD160 1f5fd88e1d563240b8a8b3b4dec1510c588aafc3 SHA1 6f5280889eac307836b59cafb594a17c0b1c7273 SHA256 b47dfe28c3e4e4bb94de25ce3b47db1590ebfd994ebd26c5d4ace5eb40a988be
+MD5 169c2448ab8ea3fa5728f290c8d8f6bd rt-3.6.3.ebuild 6200
+RMD160 1f5fd88e1d563240b8a8b3b4dec1510c588aafc3 rt-3.6.3.ebuild 6200
+SHA256 b47dfe28c3e4e4bb94de25ce3b47db1590ebfd994ebd26c5d4ace5eb40a988be rt-3.6.3.ebuild 6200
+MISC ChangeLog 7742 RMD160 46552db0dd1697b414a3d33e7ec035822a6c6a65 SHA1 080fb868f006d4e614001a05be0af71a3a350609 SHA256 a084d71a30d4a16ba4a9132f05b48c5730048e89e02a8dc98beb8403ae9689e2
+MD5 c8e61e4147ab83ec332e6dd6ee90a4d9 ChangeLog 7742
+RMD160 46552db0dd1697b414a3d33e7ec035822a6c6a65 ChangeLog 7742
+SHA256 a084d71a30d4a16ba4a9132f05b48c5730048e89e02a8dc98beb8403ae9689e2 ChangeLog 7742
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
 SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a metadata.xml 221
-MD5 a1ae528570b0d72e5f01c5e07f432406 files/digest-rt-3.2.1 229
-RMD160 db4010d738fcabc7c71865258e0ba05eb6080fe4 files/digest-rt-3.2.1 229
-SHA256 91a4f4a4b54017091ca8bb736deb6d25ca840574f2a0da7398b42c6d0bffb0ed files/digest-rt-3.2.1 229
 MD5 344efb41e7d9b208c17507b446e9169f files/digest-rt-3.4.5 229
 RMD160 387a7902e7e37ea8fb3fa41b1f19c2794dc62b67 files/digest-rt-3.4.5 229
 SHA256 f8d66759e366aa8d9a0a629072bd4f0557474da2110540cd45390fc62e38d510 files/digest-rt-3.4.5 229
 MD5 f4aa66d5c6541f5264b48fe672a9ba61 files/digest-rt-3.6.3 229
 RMD160 213be60f918d87001667e41bdd451ab0f8ced09c files/digest-rt-3.6.3 229
 SHA256 44e695aa5654ea84157adda01441a5d33fcdd395891f7931e00ec8fc45fd4851 files/digest-rt-3.6.3 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFsjFxtG5z4I8BtQoRApZhAJ9hUH6gWMC7misVWQqrOjqVe242vQCfc9W1
-OADBNUpbuxJlo5Maa7V13NA=
-=+C+b
------END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/digest-rt-3.2.1 b/www-apps/rt/files/digest-rt-3.2.1
deleted file mode 100644
index 966fb30e981e..000000000000
--- a/www-apps/rt/files/digest-rt-3.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 adf0c77827c8f84829bb44e28752a1d8 rt-3.2.1.tar.gz 1201592
-RMD160 31e7dd475a61a33454fc9ce06ebb545fbf216a82 rt-3.2.1.tar.gz 1201592
-SHA256 b12241e83575d78dcb1e4dea50d3c8d6545a97eb10efec9c45a84a65304739a9 rt-3.2.1.tar.gz 1201592
diff --git a/www-apps/rt/rt-3.2.1.ebuild b/www-apps/rt/rt-3.2.1.ebuild
deleted file mode 100644
index 9ee8b840197c..000000000000
--- a/www-apps/rt/rt-3.2.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.2.1.ebuild,v 1.12 2007/01/20 14:42:43 mcummings Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi"
-#IUSE="mysql postgres fastcgi apache2"
-
-DESCRIPTION="RT is an industrial-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://www.fsck.com/pub/${PN}/release/${P}.tar.gz
-	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
-	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="
-	>=dev-lang/perl-5.8.3
-	>=dev-perl/Params-Validate-0.02
-	dev-perl/Cache-Cache
-	>=dev-perl/Exception-Class-1.14
-	>=dev-perl/HTML-Mason-1.23
-	dev-perl/MLDBM
-	dev-perl/FreezeThaw
-	>=dev-perl/Apache-Session-1.53
-	dev-perl/XML-RSS
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/libwww-perl
-	>=dev-perl/Apache-DBI-0.92
-	>=dev-perl/DBI-1.37
-	dev-perl/Test-Inline
-	>=dev-perl/class-returnvalue-0.40
-	>=dev-perl/dbix-searchbuilder-1.01
-	dev-perl/text-template
-	dev-perl/HTML-Parser
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/log-dispatch-2.0
-	>=dev-perl/locale-maketext-lexicon-0.32
-	dev-perl/locale-maketext-fuzzy
-	>=dev-perl/MIME-tools-5.411a-r2
-	>=dev-perl/MailTools-1.60
-	dev-perl/text-wrapper
-	dev-perl/Time-modules
-	dev-perl/TermReadKey
-	dev-perl/text-autoformat
-	>=dev-perl/Text-Quoted-1.3
-	>=dev-perl/Tree-Simple-1.04
-	dev-perl/Module-Versions-Report
-	dev-perl/regexp-common
-	dev-perl/WWW-Mechanize
-
-	dev-perl/Font-AFM
-	dev-perl/text-autoformat
-	dev-perl/text-reform
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/mta
-	mysql? ( >=dev-perl/DBD-mysql-2.0416 )
-	postgres? ( dev-perl/DBD-Pg )
-	fastcgi? ( dev-perl/FCGI )
-	!fastcgi? ( =www-misc/libapreq-1* )
-	=net-www/apache-1*
-"
-#	apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
-#	!apache2? ( =net-www/apache-1* =www-misc/libapreq-1* )
-
-LICENSE="GPL-2"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-#	if use apache2; then
-#		ewarn "mod_perl2 isn't ready for prime time, fastcgi will be used instead"
-#		ewarn "If you really want mod_perl2, you can edit the ebuild and uncomment a few lines"
-#		ewarn "but if your RT breaks, you get to keep the pieces."
-#		ewarn
-#	fi
-	ewarn "RT needs MySQL with innodb support"
-	ewarn
-	ewarn "If you are upgrading from an existing _RT2_ installation,"
-	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
-	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-	ewarn "and follow the included instructions."
-	ewarn
-	enewgroup rt >/dev/null
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s|/opt/rt3/bin/rt-mailgate|/usr/bin/rt-mailgate|g" -i README
-}
-
-src_compile() {
-	# capture the list of files from configure to patch later on
-	files=$(./configure --prefix=${D}/usr \
-		--with-web-user=apache \
-		--with-web-group=apache | grep creating | cut -d':' -f2 | cut -d' ' -f3)
-	# ./configure doesn't accept locations, so patch these files directly
-	sed -i "s|/usr/etc|${MY_HOSTROOTDIR}/rt-config|
-			s|/usr/man|/usr/share/man|
-			s|/usr/var|/var|
-			s|/var/mason_data|/var/rt/mason_data|
-			s|/var/session_data|/var/rt/session_data|
-			s|/var/log|/var/log/rt|
-			s|/usr/local/html|${MY_HTDOCSDIR}|
-			s|/usr/share/html|${MY_HTDOCSDIR}|
-			s|/usr/local|${MY_HOSTROOTDIR}/rt|
-	" ${files}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies --verbose \
-		$(use_with mysql) \
-		$(use_with postgres pg) > ${T}/t
-	if grep -q "MISSING" ${T}/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat ${T}/t
-		ewarn
-		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
-		ewarn "and assign it to rl03@gentoo.org"
-		die "Missing dependencies."
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README Changelog
-	rm -f COPYING README Changelog
-
-	make install
-
-	# copy upgrade schemas
-	cd etc
-	cp -R upgrade ${D}/${MY_HOSTROOTDIR}/rt-config
-
-	# delete RT_SiteConfig.pm so we don't accidentally overwrite existing
-	# configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/rt-config/RT_SiteConfig.pm
-
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
-	chmod +r ${D}/${MY_HOSTROOTDIR}/rt-config/RT*
-
-	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-3.4.5.ebuild b/www-apps/rt/rt-3.4.5.ebuild
index fe80d36d74c2..b0e8fd534201 100644
--- a/www-apps/rt/rt-3.4.5.ebuild
+++ b/www-apps/rt/rt-3.4.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.15 2007/01/20 15:12:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.16 2007/05/12 04:44:46 chtekk Exp $
 
 inherit webapp eutils
 
-IUSE="mysql postgres fastcgi apache2 lighttpd"
+IUSE="mysql postgres fastcgi lighttpd"
 
 DESCRIPTION="RT is an enterprise-grade ticketing system"
 HOMEPAGE="http://www.bestpractical.com/rt/"
@@ -32,13 +32,10 @@ DEPEND="
 
 	!lighttpd? (
 		>=dev-perl/Apache-DBI-0.92
-		apache2? (
-			!fastcgi? ( >=www-misc/libapreq2-2.06
-						>=dev-perl/HTML-Mason-1.31 )
-			fastcgi? ( dev-perl/FCGI ) )
-		!apache2? (
-			fastcgi? ( dev-perl/FCGI )
-			!fastcgi? ( =www-misc/libapreq-1* ) ) )
+		!fastcgi? ( >=www-misc/libapreq2-2.06
+					>=dev-perl/HTML-Mason-1.31 )
+		fastcgi? ( dev-perl/FCGI )
+	)
 	lighttpd? ( dev-perl/FCGI )
 
 	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
@@ -82,9 +79,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	virtual/mta
-	!lighttpd? (
-		apache2? ( >=net-www/apache-2
-		!apache2? ( =net-www/apache-1* ) ) )
+	!lighttpd? ( >=net-www/apache-2 )
 	lighttpd? ( >=www-servers/lighttpd-1.3.13 )
 "
 
@@ -197,9 +192,8 @@ src_compile() {
 		$(use_with postgres pg) \
 		$(use_with fastcgi) \
 		$(use_with lighttpd fastcgi)"
-	if ! useq fastcgi && ! useq lighttpd; then
-		myconf="${myconf} $(use_with apache2 modperl2)"
-		! useq apache2 && myconf="${myconf} --with-modperl1"
+	if ! useq fastcgi && ! useq lighttpd ; then
+		myconf="${myconf} --with-modperl2"
 	fi
 
 	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
@@ -232,11 +226,7 @@ src_install() {
 		newinitd ${FILESDIR}/${PN}.init.d ${PN}
 		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
 	else
-		if useq apache2; then
-			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
-		else
-			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
-		fi
+		local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
 		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
 	fi
 	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
diff --git a/www-apps/rt/rt-3.6.3.ebuild b/www-apps/rt/rt-3.6.3.ebuild
index 88d32e74433d..e8c038efc998 100644
--- a/www-apps/rt/rt-3.6.3.ebuild
+++ b/www-apps/rt/rt-3.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.3.ebuild,v 1.5 2007/01/20 15:12:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.3.ebuild,v 1.6 2007/05/12 04:44:46 chtekk Exp $
 
 inherit webapp eutils
 
-IUSE="mysql postgres fastcgi apache2 lighttpd"
+IUSE="mysql postgres fastcgi lighttpd"
 
 DESCRIPTION="RT is an enterprise-grade ticketing system"
 HOMEPAGE="http://www.bestpractical.com/rt/"
@@ -35,13 +35,10 @@ DEPEND="
 
 	!lighttpd? (
 		>=dev-perl/Apache-DBI-0.92
-		apache2? (
-			!fastcgi? ( >=www-misc/libapreq2-2.06
-						>=dev-perl/HTML-Mason-1.31 )
-			fastcgi? ( dev-perl/FCGI ) )
-		!apache2? (
-			fastcgi? ( dev-perl/FCGI )
-			!fastcgi? ( =www-misc/libapreq-1* ) ) )
+		!fastcgi? ( >=www-misc/libapreq2-2.06
+					>=dev-perl/HTML-Mason-1.31 )
+		fastcgi? ( dev-perl/FCGI )
+	)
 	lighttpd? ( dev-perl/FCGI )
 
 	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
@@ -90,9 +87,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	virtual/mta
-	!lighttpd? (
-		apache2? ( >=net-www/apache-2
-		!apache2? ( =net-www/apache-1* ) ) )
+	!lighttpd? ( >=net-www/apache-2 )
 	lighttpd? ( >=www-servers/lighttpd-1.3.13 )
 "
 
@@ -203,9 +198,8 @@ src_compile() {
 		$(use_with postgres postgresql) \
 		$(use_with fastcgi) \
 		$(use_with lighttpd fastcgi)"
-	if ! useq fastcgi && ! useq lighttpd; then
-		myconf="${myconf} $(use_with apache2 modperl2)"
-		! useq apache2 && myconf="${myconf} --with-modperl1"
+	if ! useq fastcgi && ! useq lighttpd ; then
+		myconf="${myconf} --with-modperl2"
 	fi
 
 	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
@@ -238,11 +232,7 @@ src_install() {
 		newinitd ${FILESDIR}/${PN}.init.d ${PN}
 		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
 	else
-		if useq apache2; then
-			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
-		else
-			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
-		fi
+		local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
 		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
 	fi
 	webapp_postinst_txt en ${FILESDIR}/3.4.5/postinstall-en.txt