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

Package-Manager: portage-2.1.2.7

4 files changed, 31 insertions, 45 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index d5a7d9455e6b..b2836e90c6bb 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.31 2007/05/01 11:53:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.32 2007/05/12 04:50:56 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> otrs-2.0.4.ebuild,
+  otrs-2.1.5.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> otrs-2.1.5.ebuild:
   Added ~ppc64; bug #175869
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index b15b676b0330..1d2ff39cca5c 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -20,18 +20,18 @@ RMD160 eb71fbb7b086e60e648f06828353baf9b3f8bec7 files/reconfig-2 880
 SHA256 f08ef6e1258bb64d77fbf34bad33eee2e8556580509706eb17cbd2ae079e0a29 files/reconfig-2 880
 DIST otrs-2.0.4-01.tar.bz2 11560233 RMD160 f68650e86273cffe82382de57a6d4efa6b080d68 SHA1 251bd2507147a1d150caeaf58916d082663bde40 SHA256 6d3a357e4beee75c0267e6dc3dd16cf31d94946a75063b15081db0d2864d1866
 DIST otrs-2.1.5.tar.bz2 12621955 RMD160 579b90c850e813a6f3c625020e42a762e2817a25 SHA1 dfe21c3840ca9d0725c2ebc3e5fee5210aae42e5 SHA256 857a2b79ce37e54f7b1870ec4d148aa8083498609e02967b74adddfe3e54f350
-EBUILD otrs-2.0.4.ebuild 3120 RMD160 c33e6a7110540f0f9aedcce40848c8f2c7c955dd SHA1 22c566ed7ddc65e692624bb9cf3700de9f0789ee SHA256 121d0ea6873d7308e48ad0e6530591f4271d5a4ad21787353136be52706ec2e6
-MD5 b5ee1577d65fc4b78f43fcf21bbd3bc0 otrs-2.0.4.ebuild 3120
-RMD160 c33e6a7110540f0f9aedcce40848c8f2c7c955dd otrs-2.0.4.ebuild 3120
-SHA256 121d0ea6873d7308e48ad0e6530591f4271d5a4ad21787353136be52706ec2e6 otrs-2.0.4.ebuild 3120
-EBUILD otrs-2.1.5.ebuild 3240 RMD160 27a6b526d90b65f52ea10c4571704ae41bc3a33a SHA1 cd4d2ba3e167dbc4169280479e1151a0e52472ed SHA256 b510b8300fc81eae4de9173cd1f30c21e6b98c2dd4429cdbb60822ccace227a9
-MD5 dee655a85c67caa946112d47c5425f47 otrs-2.1.5.ebuild 3240
-RMD160 27a6b526d90b65f52ea10c4571704ae41bc3a33a otrs-2.1.5.ebuild 3240
-SHA256 b510b8300fc81eae4de9173cd1f30c21e6b98c2dd4429cdbb60822ccace227a9 otrs-2.1.5.ebuild 3240
-MISC ChangeLog 4593 RMD160 1658cb6696b408951b5044baa3b93057d6593cbe SHA1 c5295ccdf473f5c790431f6807127aff2a7a5239 SHA256 f08a7c21555c3e681e936d895ea8b4322ea68d86caaee8c05395a01fee322ff5
-MD5 570b184735f844c1600889370fd2cd76 ChangeLog 4593
-RMD160 1658cb6696b408951b5044baa3b93057d6593cbe ChangeLog 4593
-SHA256 f08a7c21555c3e681e936d895ea8b4322ea68d86caaee8c05395a01fee322ff5 ChangeLog 4593
+EBUILD otrs-2.0.4.ebuild 2823 RMD160 65470ab80f07d30c6bd94f4f040800b4ea66a825 SHA1 a47a2b1a3824b16e2bb8e0d6a98f77423322000e SHA256 48f69ca6d337e41d8fc2d4cf473860b3278adc642c67f15c5fb8d2b7d5e1ca8d
+MD5 c1a50d323d1387415b1c9626457a6479 otrs-2.0.4.ebuild 2823
+RMD160 65470ab80f07d30c6bd94f4f040800b4ea66a825 otrs-2.0.4.ebuild 2823
+SHA256 48f69ca6d337e41d8fc2d4cf473860b3278adc642c67f15c5fb8d2b7d5e1ca8d otrs-2.0.4.ebuild 2823
+EBUILD otrs-2.1.5.ebuild 2945 RMD160 13300b225a471c7755a652186e44cfc2de25f335 SHA1 1ebde9bf13ecad6820a0587a97c420102489b357 SHA256 18471387ce5b708c9699bb4b3d426a7fb81ddf5bd3948608f7d39f10b2b0e8b8
+MD5 52c1401ce752fca5ae0c746107177fe8 otrs-2.1.5.ebuild 2945
+RMD160 13300b225a471c7755a652186e44cfc2de25f335 otrs-2.1.5.ebuild 2945
+SHA256 18471387ce5b708c9699bb4b3d426a7fb81ddf5bd3948608f7d39f10b2b0e8b8 otrs-2.1.5.ebuild 2945
+MISC ChangeLog 4745 RMD160 c9cdc3b410cee443dca42aa41ccde512ffa79f8e SHA1 fc4409901d79e5908dec8b1fa83277d0b9ef0743 SHA256 80edec239a52cf8ddce322329eb1ac179332edb55ae73b422291849509d0caa1
+MD5 4a22e010cd58f1cf17bcd9852becd2a9 ChangeLog 4745
+RMD160 c9cdc3b410cee443dca42aa41ccde512ffa79f8e ChangeLog 4745
+SHA256 80edec239a52cf8ddce322329eb1ac179332edb55ae73b422291849509d0caa1 ChangeLog 4745
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
diff --git a/www-apps/otrs/otrs-2.0.4.ebuild b/www-apps/otrs/otrs-2.0.4.ebuild
index bbf0910f5573..37eae30e5583 100644
--- a/www-apps/otrs/otrs-2.0.4.ebuild
+++ b/www-apps/otrs/otrs-2.0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.0.4.ebuild,v 1.10 2007/01/20 15:14:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.0.4.ebuild,v 1.11 2007/05/12 04:50:56 chtekk Exp $
 
 inherit webapp eutils
 
 S=${WORKDIR}/${PN}
 
-IUSE="mysql postgres fastcgi apache2 ldap gd"
+IUSE="mysql postgres fastcgi ldap gd"
 
 DESCRIPTION="OTRS is an Open source Ticket Request System"
 HOMEPAGE="http://otrs.org/"
@@ -38,12 +38,9 @@ RDEPEND="
 	ldap? ( dev-perl/perl-ldap net-nds/openldap )
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
-	apache2? ( >=net-www/apache-2
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq2-2* ) )
-	!apache2? ( =net-www/apache-1*
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq-1* ) )
+	>=net-www/apache-2
+	fastcgi? ( dev-perl/FCGI )
+	!fastcgi? ( =www-misc/libapreq2-2* )
 	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
 "
 
@@ -64,14 +61,8 @@ src_unpack() {
 	rm -rf auto_* redhat* suse*
 
 	if use fastcgi; then
-		if ! use apache2; then
-			epatch ${FILESDIR}/apache1.patch
-			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache-httpd.include.conf
-		fi
-		if use apache2; then
-			epatch ${FILESDIR}/apache2.patch
-			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
-		fi
+		epatch ${FILESDIR}/apache2.patch
+		sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
 		sed -e "s|index.pl|index.fpl|" -i ${S}/var/httpd/htdocs/index.html
 	fi
 }
diff --git a/www-apps/otrs/otrs-2.1.5.ebuild b/www-apps/otrs/otrs-2.1.5.ebuild
index 5725cc27b58b..477e3dc8e004 100644
--- a/www-apps/otrs/otrs-2.1.5.ebuild
+++ b/www-apps/otrs/otrs-2.1.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/otrs/otrs-2.1.5.ebuild,v 1.2 2007/05/01 11:53:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.1.5.ebuild,v 1.3 2007/05/12 04:50:56 chtekk Exp $
 
 inherit webapp eutils
 
-IUSE="mysql postgres fastcgi apache2 ldap gd pdf"
+IUSE="mysql postgres fastcgi ldap gd pdf"
 
 DESCRIPTION="OTRS is an Open source Ticket Request System"
 HOMEPAGE="http://otrs.org/"
@@ -35,12 +35,9 @@ RDEPEND="
 	ldap? ( dev-perl/perl-ldap net-nds/openldap )
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
-	apache2? ( >=net-www/apache-2
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq2-2* ) )
-	!apache2? ( =net-www/apache-1*
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq-1* ) )
+	>=net-www/apache-2
+	fastcgi? ( dev-perl/FCGI )
+	!fastcgi? ( =www-misc/libapreq2-2* )
 	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
 "
 
@@ -66,14 +63,8 @@ src_unpack() {
 	rm -rf auto_* redhat* suse*
 
 	if use fastcgi; then
-		if ! use apache2; then
-			epatch ${FILESDIR}/apache1.patch
-			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache-httpd.include.conf
-		fi
-		if use apache2; then
-			epatch ${FILESDIR}/apache2.patch
-			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
-		fi
+		epatch ${FILESDIR}/apache2.patch
+		sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
 		sed -e "s|index.pl|index.fpl|" -i ${S}/var/httpd/htdocs/index.html
 	fi
 }