From 24a0341054cc290298b78f392bd389d6b0f87f47 Mon Sep 17 00:00:00 2001 From: Peter Alfredsen Date: Sun, 18 Jan 2009 17:46:53 +0000 Subject: Bump to 2.2, bug 254929 Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28 x86_64 --- www-apache/mod_mono/ChangeLog | 12 +++- www-apache/mod_mono/Manifest | 11 ++-- www-apache/mod_mono/files/1.2.5/70_mod_mono.conf | 78 ------------------------ www-apache/mod_mono/mod_mono-1.2.5.ebuild | 57 ----------------- www-apache/mod_mono/mod_mono-1.2.6.ebuild | 57 ----------------- www-apache/mod_mono/mod_mono-1.9.ebuild | 57 ----------------- www-apache/mod_mono/mod_mono-2.2.ebuild | 59 ++++++++++++++++++ 7 files changed, 73 insertions(+), 258 deletions(-) delete mode 100644 www-apache/mod_mono/files/1.2.5/70_mod_mono.conf delete mode 100644 www-apache/mod_mono/mod_mono-1.2.5.ebuild delete mode 100644 www-apache/mod_mono/mod_mono-1.2.6.ebuild delete mode 100644 www-apache/mod_mono/mod_mono-1.9.ebuild create mode 100644 www-apache/mod_mono/mod_mono-2.2.ebuild (limited to 'www-apache/mod_mono') diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog index c6d3f236c1e9..91ea56c10789 100644 --- a/www-apache/mod_mono/ChangeLog +++ b/www-apache/mod_mono/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-apache/mod_mono -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.46 2008/12/08 22:32:52 loki_val Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.47 2009/01/18 17:46:53 loki_val Exp $ + +*mod_mono-2.2 (18 Jan 2009) + + 18 Jan 2009; Peter Alfredsen + -files/1.2.5/70_mod_mono.conf, +files/2.2/70_mod_mono.conf, + -mod_mono-1.2.5.ebuild, -mod_mono-1.2.6.ebuild, -mod_mono-1.9.ebuild, + +mod_mono-2.2.ebuild: + Bump to 2.2, bug 254929. *mod_mono-2.0 (08 Dec 2008) diff --git a/www-apache/mod_mono/Manifest b/www-apache/mod_mono/Manifest index 449a38a75bf8..3d0e214f45ee 100644 --- a/www-apache/mod_mono/Manifest +++ b/www-apache/mod_mono/Manifest @@ -1,21 +1,18 @@ AUX 1.2.1/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04 SHA1 1408c8ab42cb11ee16f3989c1d04485568c9536e SHA256 a3d2ae2316592fcc9b697b6ab297402b5344ee40d25c11a10375e3be84344f74 AUX 1.2.4/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04 SHA1 1408c8ab42cb11ee16f3989c1d04485568c9536e SHA256 a3d2ae2316592fcc9b697b6ab297402b5344ee40d25c11a10375e3be84344f74 -AUX 1.2.5/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04 SHA1 1408c8ab42cb11ee16f3989c1d04485568c9536e SHA256 a3d2ae2316592fcc9b697b6ab297402b5344ee40d25c11a10375e3be84344f74 AUX 1.2.6/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba AUX 1.9/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba +AUX 2.2/70_mod_mono.conf 2867 RMD160 74ea030e1ad235602348fd8ab133cb780197949f SHA1 36eb66e462a9ff387d0b8665685614f0ff46f335 SHA256 272df4e82a310b44ab29526a01531f0ab07256a7c7ff7c47703cd7e578d017f5 AUX mono_auto_application_aspnet2.patch 426 RMD160 0a42409e521d0b64c3dcfe363a55030093d435b0 SHA1 6fe254ce56665cdf71bcfc2947a364eea940860d SHA256 166e09aae2ce8a44dbdb7793b6d02eaf610b76050f4cb7bec341ee6fcbf86393 DIST mod_mono-1.2.1.tar.gz 335399 RMD160 2d19954cc0f3e349d9f025d277519395f243e8db SHA1 902f1904123816fd94304f92450fccc83509167a SHA256 078554a25ff0cf4b6196702b1b75ee341dd969a4a3ae34bb2f889f1b7542f646 DIST mod_mono-1.2.4.tar.bz2 252763 RMD160 9508440272b53dbea2a086aad60fda563e00eb31 SHA1 c579227e020aaa6e244562f1f1e198343b54a1f3 SHA256 9c77a263680fa5bd00ebbb222d607a2a19121b501d86bfd7e259a402c8cdea4f -DIST mod_mono-1.2.5.tar.bz2 261156 RMD160 7847b31473c7906facaa67aaf2a74e4bfda43cba SHA1 518ab2dab86b47aabad163dc253d3fa4e915a6ed SHA256 4cc422bd6aff6aceab1cb2c844afe599c4c50ff0c735fde49bc3857297b570f0 DIST mod_mono-1.2.6.tar.bz2 247057 RMD160 d13d7b264c5925a9b5c26d612123cf88699eb1ce SHA1 96df70e4f2daf3a93ef570202aa5818afa27d47b SHA256 3dbb78251a465f881784715c169efdbacfc0463ca7d56c8a4ec23fb4dbb24565 -DIST mod_mono-1.9.tar.bz2 248485 RMD160 b2457035469742be8aea0a0298b9fedafa7d03e7 SHA1 40db8c5196526a6cb24e77f32d6d06532ca07ffa SHA256 bf7319ddd57d740a8d3724cf816d98f4222b93c11e4b008ec57fc38a0d2e1735 DIST mod_mono-2.0.tar.bz2 254709 RMD160 3b311d23afcf85069e293314932bf0728f093d26 SHA1 0302f945371356110d28d80fb3b77ceba6f230c8 SHA256 0980cc63b29c471ff52b67f9d21756854dd1514e6c4ec1125067333650a71b0b +DIST mod_mono-2.2.tar.bz2 268107 RMD160 444841cdae619d2670d1f15879d1d44791d430c4 SHA1 a422024cbd5c2b7bb406ae504b49da44599d2a02 SHA256 e6f0be7d422be2b7b1933481ec85bc7308664dd13f8c4167711d37b10ccce29c EBUILD mod_mono-1.2.1.ebuild 1428 RMD160 b9d05f675515303f22ea9c3270c7839cfa3beb91 SHA1 874b411063c821c67e4a69c92b89e49a8b536dd7 SHA256 fdf2f673ffa049046dd35ccff03bed5fc56ac2bf45b8bf899292fd8ca77ce375 EBUILD mod_mono-1.2.4.ebuild 1429 RMD160 87172715f2cc908ebb6be34e9c745a850b39b75d SHA1 de4b8c875e489c7a702a85960ec873b8c214712e SHA256 035eb562655d636b88632ae89663a1d8291f8a292dd59055df805ff0c80ca502 -EBUILD mod_mono-1.2.5.ebuild 1431 RMD160 274e73a66493779d17ae1aa9e92ded350fa39b56 SHA1 96ce339d149793dda0c668c1940b2749dc8d438b SHA256 e1de2a5bb109901641a2fba93d351634d198eff71a8feb3b43c73420d5e6fcd9 EBUILD mod_mono-1.2.6-r1.ebuild 1433 RMD160 14295dc44cea5aa711951d5fcecac418fe5f3db0 SHA1 81718e5c516734613577336f5973113071c3466c SHA256 0ca6fee9b4e801814783da4b2964c33f67a2ab8cfe5849ef3c5324c11e696122 -EBUILD mod_mono-1.2.6.ebuild 1430 RMD160 b5693f771d2131f066ac2f24762b4814e26c1f1f SHA1 0f62e778721958ee0f01e31e796f163c06b09a6b SHA256 9f30dc6159772c66caf5b81d9b0841567b518b3d1b35902328ec508678384caf -EBUILD mod_mono-1.9.ebuild 1428 RMD160 f3f01d11f2b0dcb0e3c614d9d43890a83ad0dd5b SHA1 79be51f6d9bde13ed7134fb5d7102190e803eab9 SHA256 0b2f0f49353aa12966aa021e19246ba94d34c3ec00f988098a589d4f1f9ea4ca EBUILD mod_mono-2.0.ebuild 1444 RMD160 2ea585f43c897f5983ca7d516e312458693c2993 SHA1 e3adc79bd6f49b26c3992983b62fbb9be093cf1a SHA256 fabde3357e46b55ffcdc15c43d20afb13178d2ffdb552dae6ecaa0df71bea3fc -MISC ChangeLog 9389 RMD160 d530ac1637914445cd3f4b3c00224df932fc1dde SHA1 2d572ba0194601b57c52a36c2dbef7021c42fe23 SHA256 675c38fb4d0fb12eedcb32b0f014a9f6ad5ff6bc5be3bf58c095a0abd1d33dc1 +EBUILD mod_mono-2.2.ebuild 1573 RMD160 5ab78fd203d18f86fb046ea7873bd1d701574e28 SHA1 1defc6906e70976d9d209c6a32b2e1a57d3da7fd SHA256 f8b091b019d86e3b80a0a2f594f27297a7e1faeb2ecf3da621bc65bd421f2653 +MISC ChangeLog 9657 RMD160 43d393501824b93bae8dd896de85fdf3a33f6983 SHA1 ccc59bd4a289b313307c55faa57171164fd2b6b9 SHA256 9c36f4349c6680bb1a68acf10cfb1f9d0f77b3f77a8ac49e43c7ac5e5a372336 MISC metadata.xml 636 RMD160 467d975ed94c4ee63b7efed6bc150218da18f2f2 SHA1 3d777853d126987468af2aed231be4ab99b57a4f SHA256 be234bbb8b48e2b0335462ef8183b6e9756ace4e3ea08c96419b400727f934e9 diff --git a/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf b/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf deleted file mode 100644 index eff05b13d1fc..000000000000 --- a/www-apache/mod_mono/files/1.2.5/70_mod_mono.conf +++ /dev/null @@ -1,78 +0,0 @@ -# For more information on the Mono* directives, see the man page for -# mod_mono(8) - - - # Set this to False if you manage your ASP.Net server manually through - # /etc/init.d/mod-mono-server - MonoRunXSP True - - # Set this to Enabled if you want to enable AutoHosting. - # See http://www.mono-project.com/AutoConfiguration for more info. - # Note that if you want your automatically hosted applications - # handled by ASP.NET 2.0 engine you have to enable the aspnet2 USE flag. - MonoAutoApplication Enabled - - - LoadModule mono_module modules/mod_mono.so - - - - AddType application/x-asp-net .aspx - AddType application/x-asp-net .asmx - AddType application/x-asp-net .ashx - AddType application/x-asp-net .asax - AddType application/x-asp-net .ascx - AddType application/x-asp-net .soap - AddType application/x-asp-net .rem - AddType application/x-asp-net .axd - AddType application/x-asp-net .cs - AddType application/x-asp-net .config - AddType application/x-asp-net .Config - AddType application/x-asp-net .dll - - DirectoryIndex index.aspx - DirectoryIndex Default.aspx - DirectoryIndex default.aspx - - -### Please also add "-D MONO_DEMO" in order to activate out-of-the-box mono demo -### - - # Note that the test application runs on a separate mod-mono-server - # instance named "testinst". Athought this is not mandatory, it shows how to - # distribute workload between multiple mod-mono-servers. For more info see: - # http://www.mono-project.com/Mod_mono - - - - Alias /mono "/usr/lib/xsp/test" - - - # You might want to specify the version of mod-mono-server - # instance that will handle your application. The default - # value depends on whether the aspnet2 USE flag was set - # during compilation - #MonoServerPath testinst /usr/lib/mono/1.0/mod-mono-server.exe - #MonoServerPath testinst /usr/lib/mono/2.0/mod-mono-server2.exe - - AddMonoApplications testinst "/mono:/usr/lib/xsp/test" - - - SetHandler mono - MonoSetServerAlias testinst - - - Order allow,deny - Allow from all - - - # Sample ASP.NET 1.1/2.0 applications can be accessed - # via index2.aspx. - DirectoryIndex index.aspx - #DirectoryIndex index2.aspx - - - -### MONO_DEMO end. - - diff --git a/www-apache/mod_mono/mod_mono-1.2.5.ebuild b/www-apache/mod_mono/mod_mono-1.2.5.ebuild deleted file mode 100644 index 3bb2f8c1e6e2..000000000000 --- a/www-apache/mod_mono/mod_mono-1.2.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.2.5.ebuild,v 1.2 2007/09/21 20:55:57 hollow Exp $ - -inherit apache-module eutils - -KEYWORDS="~amd64 ~ppc ~x86" - -DESCRIPTION="Apache module for Mono." -HOMEPAGE="http://www.go-mono.com/" -SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2" -LICENSE="Apache-1.1" -SLOT="0" -IUSE="aspnet2 debug" - -DEPEND=">=dev-dotnet/xsp-${PV}" -RDEPEND="${DEPEND}" - -APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so" -APACHE2_MOD_CONF="${PV}/70_${PN}" -APACHE2_MOD_DEFINE="MONO" - -DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch" -} - -src_compile() { - econf \ - $(use_enable debug) \ - --disable-dependency-tracking \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so" - apache-module_src_install - doman man/mod_mono.8 -} - -pkg_postinst() { - apache-module_pkg_postinst - - elog "To enable mod_mono, add \"-D MONO\" to your Apache's" - elog "conf.d configuration file. Additionally, to view sample" - elog "ASP.NET applications, add \"-D MONO_DEMO\" too." - elog "" - elog "If you want mod_mono to handle AutoHosting requests using" - elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag." -} diff --git a/www-apache/mod_mono/mod_mono-1.2.6.ebuild b/www-apache/mod_mono/mod_mono-1.2.6.ebuild deleted file mode 100644 index 70a0a42b3831..000000000000 --- a/www-apache/mod_mono/mod_mono-1.2.6.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.2.6.ebuild,v 1.1 2007/12/14 20:14:46 jurek Exp $ - -inherit apache-module eutils - -KEYWORDS="~amd64 ~ppc ~x86" - -DESCRIPTION="Apache module for Mono." -HOMEPAGE="http://www.go-mono.com/" -SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2" -LICENSE="Apache-1.1" -SLOT="0" -IUSE="aspnet2 debug" - -DEPEND=">=dev-dotnet/xsp-${PV}" -RDEPEND="${DEPEND}" - -APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so" -APACHE2_MOD_CONF="${PV}/70_${PN}" -APACHE2_MOD_DEFINE="MONO" - -DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch" -} - -src_compile() { - econf \ - $(use_enable debug) \ - --disable-dependency-tracking \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so" - apache-module_src_install - doman man/mod_mono.8 -} - -pkg_postinst() { - apache-module_pkg_postinst - - elog "To enable mod_mono, add \"-D MONO\" to your Apache's" - elog "conf.d configuration file. Additionally, to view sample" - elog "ASP.NET applications, add \"-D MONO_DEMO\" too." - elog "" - elog "If you want mod_mono to handle AutoHosting requests using" - elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag." -} diff --git a/www-apache/mod_mono/mod_mono-1.9.ebuild b/www-apache/mod_mono/mod_mono-1.9.ebuild deleted file mode 100644 index 7b99b2772b96..000000000000 --- a/www-apache/mod_mono/mod_mono-1.9.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.9.ebuild,v 1.1 2008/05/31 12:44:12 jurek Exp $ - -inherit apache-module eutils - -KEYWORDS="~amd64 ~ppc ~x86" - -DESCRIPTION="Apache module for Mono." -HOMEPAGE="http://www.go-mono.com/" -SRC_URI="http://go-mono.com/sources/${PN}/${P}.tar.bz2" -LICENSE="Apache-1.1" -SLOT="0" -IUSE="aspnet2 debug" - -DEPEND=">=dev-dotnet/xsp-${PV}" -RDEPEND="${DEPEND}" - -APACHE2_MOD_FILE="${S}/src/.libs/${PN}.so" -APACHE2_MOD_CONF="${PV}/70_${PN}" -APACHE2_MOD_DEFINE="MONO" - -DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch" -} - -src_compile() { - econf \ - $(use_enable debug) \ - --disable-dependency-tracking \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - mv -f "src/.libs/${PN}.so.0.0.0" "src/.libs/${PN}.so" - apache-module_src_install - doman man/mod_mono.8 -} - -pkg_postinst() { - apache-module_pkg_postinst - - elog "To enable mod_mono, add \"-D MONO\" to your Apache's" - elog "conf.d configuration file. Additionally, to view sample" - elog "ASP.NET applications, add \"-D MONO_DEMO\" too." - elog "" - elog "If you want mod_mono to handle AutoHosting requests using" - elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag." -} diff --git a/www-apache/mod_mono/mod_mono-2.2.ebuild b/www-apache/mod_mono/mod_mono-2.2.ebuild new file mode 100644 index 000000000000..139f51076f5b --- /dev/null +++ b/www-apache/mod_mono/mod_mono-2.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.2.ebuild,v 1.1 2009/01/18 17:46:53 loki_val Exp $ + +EAPI=2 + +# DRAGONS: Watch the order of these. + +inherit apache-module eutils go-mono mono + +KEYWORDS="~x86 ~amd64" + +DESCRIPTION="Apache module for Mono." +HOMEPAGE="http://www.go-mono.com/" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="aspnet2 debug" + +DEPEND="=dev-dotnet/xsp-${GO_MONO_REL_PV}*" +RDEPEND="${DEPEND}" + +APACHE2_MOD_CONF="2.2/70_${PN}" +APACHE2_MOD_DEFINE="MONO" + +DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README" + +need_apache2 + +src_prepare() { + use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch" +} + +src_configure() { + go-mono_src_configure \ + $(use_enable debug) \ + || die "econf failed" +} + +src_install() { + go-mono_src_install + find "${D}" -name 'mod_mono.conf' -delete || die "failed to remove mod_mono.conf" + if [[ -n "${APACHE2_MOD_CONF}" ]] ; then + insinto "${APACHE_MODULES_CONFDIR}" + set -- ${APACHE2_MOD_CONF} + newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \ + || die "internal ebuild error: '${FILESDIR}/${1}.conf' not found" + fi +} + +pkg_postinst() { + apache-module_pkg_postinst + + elog "To enable mod_mono, add \"-D MONO\" to your Apache's" + elog "conf.d configuration file. Additionally, to view sample" + elog "ASP.NET applications, add \"-D MONO_DEMO\" too." + elog "" + elog "If you want mod_mono to handle AutoHosting requests using" + elog "ASP.NET 2.0 engine, enable the aspnet2 USE flag." +} -- cgit v1.2.3-65-gdbad