diff options
author | Michael Stewart <vericgar@gentoo.org> | 2005-01-25 13:10:01 +0000 |
---|---|---|
committer | Michael Stewart <vericgar@gentoo.org> | 2005-01-25 13:10:01 +0000 |
commit | e4a4abd02467747a31ab699d1785a438bf4e23f8 (patch) | |
tree | 040572ad2933bf6f54f0afffd7e44b5ac750b1ea /net-www | |
parent | New local USE-flag for gentoo-webroot-default (diff) | |
download | gentoo-2-e4a4abd02467747a31ab699d1785a438bf4e23f8.tar.gz gentoo-2-e4a4abd02467747a31ab699d1785a438bf4e23f8.tar.bz2 gentoo-2-e4a4abd02467747a31ab699d1785a438bf4e23f8.zip |
Added no-htdocs local USE-flag to not install anything to /var/www/localhost. Closes bug #63465
(Portage version: 2.0.51-r14)
Diffstat (limited to 'net-www')
-rw-r--r-- | net-www/gentoo-webroot-default/ChangeLog | 7 | ||||
-rw-r--r-- | net-www/gentoo-webroot-default/Manifest | 4 | ||||
-rw-r--r-- | net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild | 23 |
3 files changed, 28 insertions, 6 deletions
diff --git a/net-www/gentoo-webroot-default/ChangeLog b/net-www/gentoo-webroot-default/ChangeLog index ec73bae4f6ca..8bfdc26d5bc4 100644 --- a/net-www/gentoo-webroot-default/ChangeLog +++ b/net-www/gentoo-webroot-default/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/gentoo-webroot-default # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gentoo-webroot-default/ChangeLog,v 1.2 2005/01/23 07:32:04 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gentoo-webroot-default/ChangeLog,v 1.3 2005/01/25 13:10:01 vericgar Exp $ + + 25 Jan 2005; Michael Stewart <vericgar@gentoo.org> + gentoo-webroot-default-0.1.ebuild: + Added no-htdocs USE-flag to not install anything to /var/www/localhost. Closes + bug #63465 23 Jan 2005; Christian Parpart <trapni@gentoo.org> gentoo-webroot-default-0.1.ebuild: diff --git a/net-www/gentoo-webroot-default/Manifest b/net-www/gentoo-webroot-default/Manifest index 01b554ccad61..16a58126cbc7 100644 --- a/net-www/gentoo-webroot-default/Manifest +++ b/net-www/gentoo-webroot-default/Manifest @@ -1,4 +1,4 @@ -MD5 5d0f5eb88005eca4543c795a9636aaf4 gentoo-webroot-default-0.1.ebuild 567 +MD5 ba8da97f76c43642b3c15f43868b64e1 ChangeLog 686 +MD5 9c169effb937ebb417e47aa0c7a41717 gentoo-webroot-default-0.1.ebuild 953 MD5 c5683447f4654608f8b9bc6ce7f5f3c8 metadata.xml 264 -MD5 a0f063cc40c9a2b46609eaebb85f961b ChangeLog 501 MD5 07902a01b0d7b7ccff7d9fb671078f2b files/digest-gentoo-webroot-default-0.1 78 diff --git a/net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild b/net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild index 533e39b261ca..0694f892f506 100644 --- a/net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild +++ b/net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.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/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild,v 1.5 2005/01/23 07:32:04 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gentoo-webroot-default/gentoo-webroot-default-0.1.ebuild,v 1.6 2005/01/25 13:10:01 vericgar Exp $ DESCRIPTION="This is the default Gentoo WebServer content" HOMEPAGE="http://www.gentoo.org/" @@ -8,14 +8,31 @@ SRC_URI="mirror://gentoo/${PF}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="" +IUSE="no-htdocs" DEPEND="" S=${WORKDIR}/${PF} src_install() { - insinto /var/www/localhost/ + if useq no-htdocs; then + insinto /usr/share/doc/${PF}/webroot/ + else + insinto /var/www/localhost/ + fi doins -r webroot/htdocs dodoc AUTHORS README TODO } + +pkg_postinst() { + if useq no-htdocs; then + einfo "Default webroot not installed into /var/www/localhost." + einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\"" + einfo "to install it there." + fi +} + +pkg_config() { + cp -r /usr/share/doc/${PF}/webroot/htdocs /var/www/localhost +} + |