diff options
author | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:28:30 +0000 |
---|---|---|
committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:28:30 +0000 |
commit | bdf5f6d40fc91ed6ff57fbcb1625fdc25e1b989f (patch) | |
tree | 3307c769eadfc49a1e96eb908207033ee3bae8d6 /www-apps/metadot | |
parent | Apache 1.X masking (fix ebuilds to not require apache-1*). (diff) | |
download | gentoo-2-bdf5f6d40fc91ed6ff57fbcb1625fdc25e1b989f.tar.gz gentoo-2-bdf5f6d40fc91ed6ff57fbcb1625fdc25e1b989f.tar.bz2 gentoo-2-bdf5f6d40fc91ed6ff57fbcb1625fdc25e1b989f.zip |
Apache 1.X masking (fix ebuilds to not require apache-1*).
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-apps/metadot')
-rw-r--r-- | www-apps/metadot/ChangeLog | 6 | ||||
-rw-r--r-- | www-apps/metadot/metadot-6.1.6.ebuild | 6 | ||||
-rw-r--r-- | www-apps/metadot/metadot-6.4.5.4.ebuild | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog index 67a7b5211f9f..dbb2adf40c97 100644 --- a/www-apps/metadot/ChangeLog +++ b/www-apps/metadot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/metadot # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.27 2007/01/02 22:39:53 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.28 2007/05/12 04:28:30 chtekk Exp $ + + 12 May 2007; Luca Longinotti <chtekk@gentoo.org> metadot-6.1.6.ebuild, + metadot-6.4.5.4.ebuild: + Apache 1.X masking (fix ebuilds to not require apache-1*). 02 Jan 2007; Renat Lumpau <rl03@gentoo.org> metadot-6.1.6.ebuild, metadot-6.4.5.4.ebuild: diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6.ebuild index 82ee41b2d249..303766155dd7 100644 --- a/www-apps/metadot/metadot-6.1.6.ebuild +++ b/www-apps/metadot/metadot-6.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.1.6.ebuild,v 1.13 2007/01/02 22:39:53 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.1.6.ebuild,v 1.14 2007/05/12 04:28:30 chtekk Exp $ inherit webapp MY_P=${P/-/} @@ -15,9 +15,9 @@ SRC_URI="http://download.metadot.com/${MY_P}.tar.gz" KEYWORDS="~x86 ppc" RDEPEND=" - >=net-www/apache-1.3.6 + >=net-www/apache-2.0 >=dev-lang/perl-5.005 - >=www-apache/mod_perl-1.21 + >=www-apache/mod_perl-2.0 dev-perl/DBI dev-perl/DBD-mysql dev-perl/Apache-DBI diff --git a/www-apps/metadot/metadot-6.4.5.4.ebuild b/www-apps/metadot/metadot-6.4.5.4.ebuild index 529997f97a76..ba04acb725b4 100644 --- a/www-apps/metadot/metadot-6.4.5.4.ebuild +++ b/www-apps/metadot/metadot-6.4.5.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/metadot/metadot-6.4.5.4.ebuild,v 1.5 2007/01/02 22:39:53 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.4.5.4.ebuild,v 1.6 2007/05/12 04:28:30 chtekk Exp $ inherit webapp MY_P="Metadot${PV}" S=${WORKDIR}/${PN} -IUSE="apache2" +IUSE="" DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features." HOMEPAGE="http://www.metadot.com" @@ -17,11 +17,8 @@ KEYWORDS="~x86 ~ppc" DEPEND="" RDEPEND=" >=dev-lang/perl-5.6 - !apache2? ( =net-www/apache-1* - <www-apache/mod_perl-1.99 ) - apache2? ( =net-www/apache-2* - =www-apache/mod_perl-2* ) - + =net-www/apache-2* + =www-apache/mod_perl-2* dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 dev-perl/Apache-DBI @@ -63,7 +60,7 @@ src_install() { cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR} cp ${FILESDIR}/${PN}.conf ${D}/${MY_HOSTROOTDIR} - use apache2 && sed -i "s|Apache::Registry|Modperl::Registry|" \ + sed -i "s|Apache::Registry|Modperl::Registry|" \ ${D}/${MY_HOSTROOTDIR}/${PN}.conf webapp_serverowned ${MY_HTDOCSDIR} |