diff options
| author |   Renat Lumpau <rl03@gentoo.org> | 2006-05-19 13:15:25 +0000 |
|---|---|---|
| committer | Renat Lumpau <rl03@gentoo.org> | 2006-05-19 13:15:25 +0000 |
| commit | 982ab032b5e2448f8c4c2a616ea6722bae3b522e (patch) | |
| tree | 1e4a31d83fc7628398eff0ab63ac9d11b2468421 /www-apps/metadot | |
| parent | Update rsbac-sources mask (2.4 is OK). (diff) | |
| download | historical-982ab032b5e2448f8c4c2a616ea6722bae3b522e.tar.gz historical-982ab032b5e2448f8c4c2a616ea6722bae3b522e.tar.bz2 historical-982ab032b5e2448f8c4c2a616ea6722bae3b522e.zip | |
Properly handle Apache2 config file wrt bug #133611.
Package-Manager: portage-2.1_pre10-r5
Diffstat (limited to 'www-apps/metadot')
| -rw-r--r-- | www-apps/metadot/ChangeLog | 5 | ||||
| -rw-r--r-- | www-apps/metadot/Manifest | 22 | ||||
| -rw-r--r-- | www-apps/metadot/metadot-6.4.5.3.ebuild | 12 |
3 files changed, 23 insertions, 16 deletions
diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog index 4ab072bbe256..fc520e7c295d 100644 --- a/www-apps/metadot/ChangeLog +++ b/www-apps/metadot/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/metadot # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.19 2006/05/16 12:51:05 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.20 2006/05/19 13:15:25 rl03 Exp $ + + 19 May 2006; Renat Lumpau <rl03@gentoo.org> metadot-6.4.5.3.ebuild: + Properly handle Apache2 config file wrt bug #133611. *metadot-6.4.5.3 (16 May 2006) diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest index dc045a5bda47..c3851be97255 100644 --- a/www-apps/metadot/Manifest +++ b/www-apps/metadot/Manifest @@ -27,14 +27,14 @@ EBUILD metadot-6.1.6.ebuild 1421 RMD160 d3ba1663cad9480d5dc9129f194a9c8726cc1d46 MD5 53c0e81aa0c4f5d8febaa1977ed39a1a metadot-6.1.6.ebuild 1421 RMD160 d3ba1663cad9480d5dc9129f194a9c8726cc1d46 metadot-6.1.6.ebuild 1421 SHA256 dc8f3e678e696559ca22547cfb25422513ca1f1f341e2639a71a896b07c1d243 metadot-6.1.6.ebuild 1421 -EBUILD metadot-6.4.5.3.ebuild 1794 RMD160 6559a5b36e431356a7a5ef0ebea2c99a658e167e SHA1 7abc6e4803d2234213ccc14da5b4a0bbca12e344 SHA256 bed01b98f413c08e6736814aeaf116384aba5b573b903ced990873aae2f24912 size 1794 -MD5 e42a7c1e157206dd60422f01af47d6e9 metadot-6.4.5.3.ebuild 1794 -RMD160 6559a5b36e431356a7a5ef0ebea2c99a658e167e metadot-6.4.5.3.ebuild 1794 -SHA256 bed01b98f413c08e6736814aeaf116384aba5b573b903ced990873aae2f24912 metadot-6.4.5.3.ebuild 1794 -MISC ChangeLog 2872 RMD160 482d0d4bfa1242126ca774cc9e925fea440cc708 SHA1 9a191c76c829f94978ae0bf1e5357d15777711f4 SHA256 1705120384f38c5f71a58ba2d42a43c8c0773942788b412c906e0d8470755225 size 2872 -MD5 9e2030f488dbc9432b42b1d201f1c3e3 ChangeLog 2872 -RMD160 482d0d4bfa1242126ca774cc9e925fea440cc708 ChangeLog 2872 -SHA256 1705120384f38c5f71a58ba2d42a43c8c0773942788b412c906e0d8470755225 ChangeLog 2872 +EBUILD metadot-6.4.5.3.ebuild 1971 RMD160 7a025d98c056648b1be0ff71b0a6456804b05daf SHA1 b2126bde05aad0d24e93beb725bd1ac79aa228fe SHA256 89513e3030b5ca4947e0a4dc999db9af60f75331dc232938983f19d06bd67266 size 1971 +MD5 fc9d232cdaf29d5bc906d17407812dfb metadot-6.4.5.3.ebuild 1971 +RMD160 7a025d98c056648b1be0ff71b0a6456804b05daf metadot-6.4.5.3.ebuild 1971 +SHA256 89513e3030b5ca4947e0a4dc999db9af60f75331dc232938983f19d06bd67266 metadot-6.4.5.3.ebuild 1971 +MISC ChangeLog 2998 RMD160 7f646d472b51b720c31ca96b4e301ca91dcd0fe2 SHA1 5cb28a4d27ebcee715387b7c7ca99bd4196aab10 SHA256 4af3f60feee61113dbfccf176571880175734fae5ee144f06363af284a642d1e size 2998 +MD5 3a4b7b2f00deeb552741d89fa6be9e1d ChangeLog 2998 +RMD160 7f646d472b51b720c31ca96b4e301ca91dcd0fe2 ChangeLog 2998 +SHA256 4af3f60feee61113dbfccf176571880175734fae5ee144f06363af284a642d1e ChangeLog 2998 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 size 161 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161 @@ -48,7 +48,7 @@ SHA256 47623953c229f82cb4def7bdda9c862061f5a5a3eff3dcb8ecf1f1c4f71a4aa7 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEacrCEzitwsaoONoRAvVaAKDMt3V5oYr8f57yUadcNowF4O/iMACgpjoM -CfOcDFJfsa5DrlDoH1sC4bs= -=/R64 +iD8DBQFEbcT2EzitwsaoONoRAnVhAKCkrmS8hKbHsdhaKaLiRMTtK/14twCeMFbB +fAvjzeCypqBCTeYlvA00bQs= +=Tepd -----END PGP SIGNATURE----- diff --git a/www-apps/metadot/metadot-6.4.5.3.ebuild b/www-apps/metadot/metadot-6.4.5.3.ebuild index 872c4c797d6b..a8a024e1c771 100644 --- a/www-apps/metadot/metadot-6.4.5.3.ebuild +++ b/www-apps/metadot/metadot-6.4.5.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2006 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.3.ebuild,v 1.1 2006/05/16 12:51:05 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.4.5.3.ebuild,v 1.2 2006/05/19 13:15:25 rl03 Exp $ inherit webapp MY_P="Metadot${PV}" S=${WORKDIR}/${PN} -IUSE="" +IUSE="apache2" DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features." HOMEPAGE="http://www.metadot.com" @@ -16,9 +16,11 @@ KEYWORDS="~x86 ~ppc" DEPEND="" RDEPEND="<dev-db/mysql-5 - >=net-www/apache-1.3.6 >=dev-lang/perl-5.6 - >=www-apache/mod_perl-1.21 + !apache2? ( =net-www/apache-1* + <www-apache/mod_perl-1.99 ) + apache2? ( =net-www/apache-2* + =www-apache/mod_perl-2* ) dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 @@ -60,6 +62,8 @@ 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|" \ + ${D}/${MY_HOSTROOTDIR}/${PN}.conf webapp_serverowned ${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public |