diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:08:33 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:08:33 +0000 |
| commit | 53d042dd4b1de7184a7c9fd1a8118d2b4329ae17 (patch) | |
| tree | 189e07e585af0e61d0764f550bc9d3288d878d33 /net-mail/mailman | |
| parent | Stable on mips. (diff) | |
| download | gentoo-2-53d042dd4b1de7184a7c9fd1a8118d2b4329ae17.tar.gz gentoo-2-53d042dd4b1de7184a7c9fd1a8118d2b4329ae17.tar.bz2 gentoo-2-53d042dd4b1de7184a7c9fd1a8118d2b4329ae17.zip | |
Apache 1.X masking (fix ebuilds to not require apache-1*).
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-mail/mailman')
| -rw-r--r-- | net-mail/mailman/ChangeLog | 6 | ||||
| -rw-r--r-- | net-mail/mailman/mailman-2.1.9.ebuild | 16 | ||||
| -rw-r--r-- | net-mail/mailman/mailman-2.1.9_rc1.ebuild | 16 |
3 files changed, 15 insertions, 23 deletions
diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog index 1d872354ee0f..100764ac05b5 100644 --- a/net-mail/mailman/ChangeLog +++ b/net-mail/mailman/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/mailman # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.90 2007/05/06 15:08:52 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.91 2007/05/12 04:08:33 chtekk Exp $ + + 12 May 2007; Luca Longinotti <chtekk@gentoo.org> mailman-2.1.9_rc1.ebuild, + mailman-2.1.9.ebuild: + Apache 1.X masking (fix ebuilds to not require apache-1*). 06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> mailman-2.1.9.ebuild: diff --git a/net-mail/mailman/mailman-2.1.9.ebuild b/net-mail/mailman/mailman-2.1.9.ebuild index 55a858aa5382..56657f2751ae 100644 --- a/net-mail/mailman/mailman-2.1.9.ebuild +++ b/net-mail/mailman/mailman-2.1.9.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9.ebuild,v 1.5 2007/05/06 15:08:52 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9.ebuild,v 1.6 2007/05/12 04:08:33 chtekk Exp $ inherit eutils depend.apache -IUSE="apache2 postfix sendmail qmail courier exim xmail" +IUSE="postfix sendmail qmail courier exim xmail" DESCRIPTION="A python-based mailing list server with an extensive web interface" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" @@ -78,11 +78,7 @@ src_install () { keepdir ${INSTALLDIR}/lists keepdir ${INSTALLDIR}/qfiles - if use apache2; then - insinto ${APACHE2_MODULES_CONFDIR} - else - insinto ${APACHE1_MODULES_CONFDIR} - fi + insinto ${APACHE2_MODULES_CONFDIR} doins ${FILESDIR}/50_mailman.conf dodoc ${FILESDIR}/README.gentoo @@ -126,11 +122,9 @@ pkg_postinst() { einfo "" einfo "An example Mailman configuration file for Apache has been installed into:" - use apache2 && einfo " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" - use apache2 || einfo " ${APACHE1_MODULES_CONFDIR}/50_mailman.conf" + einfo " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" einfo "" einfo "To enable, you will need to add \"-D MAILMAN\" to" - use apache2 && einfo "/etc/conf.d/apache2." - use apache2 || einfo "/etc/conf.d/apache." + einfo "/etc/conf.d/apache2." einfo "" } diff --git a/net-mail/mailman/mailman-2.1.9_rc1.ebuild b/net-mail/mailman/mailman-2.1.9_rc1.ebuild index fa6817abec73..da6f84fd9ce4 100644 --- a/net-mail/mailman/mailman-2.1.9_rc1.ebuild +++ b/net-mail/mailman/mailman-2.1.9_rc1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9_rc1.ebuild,v 1.6 2007/04/28 17:32:05 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9_rc1.ebuild,v 1.7 2007/05/12 04:08:33 chtekk Exp $ inherit eutils depend.apache -IUSE="apache2 postfix sendmail qmail courier exim xmail" +IUSE="postfix sendmail qmail courier exim xmail" MY_PV=${PV/_rc/rc} @@ -79,11 +79,7 @@ src_install () { keepdir ${INSTALLDIR}/lists keepdir ${INSTALLDIR}/qfiles - if use apache2; then - insinto ${APACHE2_MODULES_CONFDIR} - else - insinto ${APACHE1_MODULES_CONFDIR} - fi + insinto ${APACHE2_MODULES_CONFDIR} newins ${FILESDIR}/mailman.conf 50_mailman.conf dodoc ${FILESDIR}/README.gentoo @@ -127,11 +123,9 @@ pkg_postinst() { einfo "" einfo "An example Mailman configuration file for Apache has been installed into:" - use apache2 && einfo " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" - use apache2 || einfo " ${APACHE1_MODULES_CONFDIR}/50_mailman.conf" + einfo " ${APACHE2_MODULES_CONFDIR}/50_mailman.conf" einfo "" einfo "To enable, you will need to add \"-D MAILMAN\" to" - use apache2 && einfo "/etc/conf.d/apache2." - use apache2 || einfo "/etc/conf.d/apache." + einfo "/etc/conf.d/apache2." einfo "" } |