summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-07-16 16:51:15 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-07-16 16:51:15 +0000
commit2cd2facf8cd2494d9394fde85ba19a2ad18680be (patch)
tree8905e55dbf4d67ce951b39b06ed3f1323b43cda7
parentVersion bump. (diff)
downloadgentoo-2-2cd2facf8cd2494d9394fde85ba19a2ad18680be.tar.gz
gentoo-2-2cd2facf8cd2494d9394fde85ba19a2ad18680be.tar.bz2
gentoo-2-2cd2facf8cd2494d9394fde85ba19a2ad18680be.zip
Cleanups and a typo fix in the reconfig script.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
-rw-r--r--www-apps/mythweb/ChangeLog6
-rw-r--r--www-apps/mythweb/files/reconfig6
-rw-r--r--www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild10
3 files changed, 13 insertions, 9 deletions
diff --git a/www-apps/mythweb/ChangeLog b/www-apps/mythweb/ChangeLog
index d78b47509604..7486508f8f16 100644
--- a/www-apps/mythweb/ChangeLog
+++ b/www-apps/mythweb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/mythweb
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.92 2012/07/15 23:37:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/ChangeLog,v 1.93 2012/07/16 16:51:14 cardoe Exp $
+
+ 16 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+ mythweb-0.25.1_p20120715.ebuild, files/reconfig:
+ Cleanups and a typo fix in the reconfig script.
*mythweb-0.25.1_p20120715 (15 Jul 2012)
diff --git a/www-apps/mythweb/files/reconfig b/www-apps/mythweb/files/reconfig
index d4508ea356a6..662cfb0c195a 100644
--- a/www-apps/mythweb/files/reconfig
+++ b/www-apps/mythweb/files/reconfig
@@ -11,16 +11,16 @@ if [[ $1 = "install" ]]; then
if [[ "${VHOST_SERVER}" = "apache" ]]; then
sed -e "s|/var/www/html/data|${MY_INSTALLDIR}/data|g" \
-e "s|/var/www/html|${VHOST_ROOT}/${PN}|g" \
- -i ${MY_SERVERCONFIGIR}/mythweb.conf || \
+ -i ${MY_SERVERCONFIGDIR}/mythweb.conf || \
die "apache sed failed"
elif [[ "${VHOST_SERVER}" = "lighttpd" ]]; then
sed -e "s|/var/www/html/data|${MY_INSTALLDIR}/data|g" \
-e "s|/var/www/html|${VHOST_ROOT}/${PN}|g" \
- -i ${MY_SERVERCONFIGIR}/mythweb.conf || \
+ -i ${MY_SERVERCONFIGDIR}/mythweb.conf || \
die "lighttpd sed failed"
elif [[ "${VHOST_SERVER}" = "nginx" ]]; then
sed -e "s|/var/www/localhost/htdocs|${MY_INSTALLDIR}/htdocs|g" \
- -i ${MY_SERVERCONFIGIR}/mythweb.include || \
+ -i ${MY_SERVERCONFIGDIR}/mythweb.include || \
die "nginx sed failed"
fi
diff --git a/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild b/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild
index e2d2e6fd540c..dde5a3fbd908 100644
--- a/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild
+++ b/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild,v 1.1 2012/07/15 23:37:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.25.1_p20120715.ebuild,v 1.2 2012/07/16 16:51:14 cardoe Exp $
EAPI=4
-inherit webapp depend.php
+inherit webapp
BACKPORTS="4f6ac2a60b"
# Release version
@@ -20,6 +20,7 @@ IUSE=""
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="dev-lang/php:5.3[json,mysql,session,posix]
+ virtual/httpd-php:5.3
dev-perl/DBI
dev-perl/DBD-mysql
dev-perl/HTTP-Date
@@ -27,10 +28,9 @@ RDEPEND="dev-lang/php:5.3[json,mysql,session,posix]
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}/${PN}"
-
need_httpd_cgi
-need_php5_httpd
+
+S="${WORKDIR}/${MY_P}/${PN}"
src_prepare() {
cd "${S}"/../