summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-03-07 21:02:27 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-03-07 21:02:27 +0000
commitd6e5a217afc10735dbc6c7f943e6df8862483521 (patch)
tree387be424cad7dbab61013c9b902a7a4edcb783a6 /www-apps/moodle
parentMarking mtl-1.1.1.1 ppc64 for bug 399983 (diff)
downloadgentoo-2-d6e5a217afc10735dbc6c7f943e6df8862483521.tar.gz
gentoo-2-d6e5a217afc10735dbc6c7f943e6df8862483521.tar.bz2
gentoo-2-d6e5a217afc10735dbc6c7f943e6df8862483521.zip
Remove older versions depending on php with gd-external
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/moodle')
-rw-r--r--www-apps/moodle/ChangeLog8
-rw-r--r--www-apps/moodle/moodle-1.9.16-r1.ebuild14
-rw-r--r--www-apps/moodle/moodle-1.9.16.ebuild126
-rw-r--r--www-apps/moodle/moodle-2.0.7-r1.ebuild14
-rw-r--r--www-apps/moodle/moodle-2.0.7.ebuild139
-rw-r--r--www-apps/moodle/moodle-2.1.4-r1.ebuild14
-rw-r--r--www-apps/moodle/moodle-2.1.4.ebuild139
-rw-r--r--www-apps/moodle/moodle-2.2.1-r1.ebuild14
-rw-r--r--www-apps/moodle/moodle-2.2.1.ebuild139
9 files changed, 35 insertions, 572 deletions
diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index afbaba012f23..e4b45e5cc34e 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-apps/moodle
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.19 2012/01/29 03:09:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.20 2012/03/07 21:02:27 blueness Exp $
+
+ 07 Mar 2012; Anthony G. Basile <blueness@gentoo.org> -moodle-1.9.16.ebuild,
+ moodle-1.9.16-r1.ebuild, -moodle-2.0.7.ebuild, moodle-2.0.7-r1.ebuild,
+ -moodle-2.1.4.ebuild, moodle-2.1.4-r1.ebuild, -moodle-2.2.1.ebuild,
+ moodle-2.2.1-r1.ebuild:
+ Remove older versions depending on php with gd-external
*moodle-2.2.1-r1 (29 Jan 2012)
*moodle-2.1.4-r1 (29 Jan 2012)
diff --git a/www-apps/moodle/moodle-1.9.16-r1.ebuild b/www-apps/moodle/moodle-1.9.16-r1.ebuild
index 956619bd4278..3f6f07d0636e 100644
--- a/www-apps/moodle/moodle-1.9.16-r1.ebuild
+++ b/www-apps/moodle/moodle-1.9.16-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.16-r1.ebuild,v 1.1 2012/01/29 03:09:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.16-r1.ebuild,v 1.2 2012/03/07 21:02:27 blueness Exp $
EAPI="4"
@@ -55,10 +55,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -eq 0 ]]; then
eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror "No database selected in your USE flags,"
eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror
die
fi
@@ -66,10 +66,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -gt 1 ]]; then
MYDB=""
ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn "Multiple databases selected in your USE flags,"
ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn
fi
}
@@ -111,12 +111,12 @@ src_install() {
pkg_postinst() {
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
einfo "To see the post install instructions, do"
einfo
einfo " webapp-config --show-postinst ${PN} ${PVR}"
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
}
diff --git a/www-apps/moodle/moodle-1.9.16.ebuild b/www-apps/moodle/moodle-1.9.16.ebuild
deleted file mode 100644
index 10a4d85b4bd5..000000000000
--- a/www-apps/moodle/moodle-1.9.16.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.16.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DBFLAGS="mysql?,postgres?"
-DBTYPES=${DBFLAGS//\?/}
-DBTYPES=${DBTYPES//,/ }
-
-AUTHFLAGS="imap?,ldap?,odbc?"
-AUTHMODES=${AUTHFLAGS//\?/}
-AUTHMODES=${AUTHMODES//,/ }
-
-PHPFLAGS_A="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-PHPFLAGS_B="ctype,curl,gd-external,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
-
-IUSE="${DBTYPES} ${AUTHMODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- || (
- >=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_A}]
- >=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS_B}]
- )
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DBTYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- #
- # Moodle expect postgres7, not postgres
- #
- MYDB=${MYDB/postgres/postgres7}
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.0.7-r1.ebuild b/www-apps/moodle/moodle-2.0.7-r1.ebuild
index cf649090c753..01fd147df21d 100644
--- a/www-apps/moodle/moodle-2.0.7-r1.ebuild
+++ b/www-apps/moodle/moodle-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.7-r1.ebuild,v 1.1 2012/01/29 03:09:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.7-r1.ebuild,v 1.2 2012/03/07 21:02:27 blueness Exp $
EAPI="4"
@@ -57,10 +57,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -eq 0 ]]; then
eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror "No database selected in your USE flags,"
eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror
die
fi
@@ -68,10 +68,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -gt 1 ]]; then
MYDB=""
ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn "Multiple databases selected in your USE flags,"
ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn
fi
}
@@ -115,12 +115,12 @@ src_install() {
pkg_postinst() {
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
einfo "To see the post install instructions, do"
einfo
einfo " webapp-config --show-postinst ${PN} ${PVR}"
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
}
diff --git a/www-apps/moodle/moodle-2.0.7.ebuild b/www-apps/moodle/moodle-2.0.7.ebuild
deleted file mode 100644
index 79888427ab8f..000000000000
--- a/www-apps/moodle/moodle-2.0.7.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.7.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
-PHP_OPTIONAL_FLAGS_52_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- || (
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_A}]
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
- )
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.1.4-r1.ebuild b/www-apps/moodle/moodle-2.1.4-r1.ebuild
index 0aa6ffebb84c..a417b0501dc7 100644
--- a/www-apps/moodle/moodle-2.1.4-r1.ebuild
+++ b/www-apps/moodle/moodle-2.1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.4-r1.ebuild,v 1.1 2012/01/29 03:09:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.4-r1.ebuild,v 1.2 2012/03/07 21:02:27 blueness Exp $
EAPI="4"
@@ -57,10 +57,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -eq 0 ]]; then
eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror "No database selected in your USE flags,"
eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror
die
fi
@@ -68,10 +68,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -gt 1 ]]; then
MYDB=""
ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn "Multiple databases selected in your USE flags,"
ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn
fi
}
@@ -115,12 +115,12 @@ src_install() {
pkg_postinst() {
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
einfo "To see the post install instructions, do"
einfo
einfo " webapp-config --show-postinst ${PN} ${PVR}"
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
}
diff --git a/www-apps/moodle/moodle-2.1.4.ebuild b/www-apps/moodle/moodle-2.1.4.ebuild
deleted file mode 100644
index e9269803c387..000000000000
--- a/www-apps/moodle/moodle-2.1.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.4.ebuild,v 1.1 2012/01/08 17:47:30 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
-PHP_OPTIONAL_FLAGS_52_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- || (
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_A}]
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
- )
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.2.1-r1.ebuild b/www-apps/moodle/moodle-2.2.1-r1.ebuild
index 18e4cb09f8f8..b25cbfa2195b 100644
--- a/www-apps/moodle/moodle-2.2.1-r1.ebuild
+++ b/www-apps/moodle/moodle-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.1-r1.ebuild,v 1.1 2012/01/29 03:09:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.1-r1.ebuild,v 1.2 2012/03/07 21:02:27 blueness Exp $
EAPI="4"
@@ -57,10 +57,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -eq 0 ]]; then
eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror "No database selected in your USE flags,"
eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
+ eerror "\033[1;31m**************************************************\033[00m"
eerror
die
fi
@@ -68,10 +68,10 @@ pkg_setup() {
if [[ ${DB_COUNT} -gt 1 ]]; then
MYDB=""
ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn "Multiple databases selected in your USE flags,"
ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
+ ewarn "\033[1;33m**************************************************\033[00m"
ewarn
fi
}
@@ -115,12 +115,12 @@ src_install() {
pkg_postinst() {
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
einfo "To see the post install instructions, do"
einfo
einfo " webapp-config --show-postinst ${PN} ${PVR}"
einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
+ einfo "\033[1;32m**************************************************\033[00m"
einfo
}
diff --git a/www-apps/moodle/moodle-2.2.1.ebuild b/www-apps/moodle/moodle-2.2.1.ebuild
deleted file mode 100644
index adf7baf036ba..000000000000
--- a/www-apps/moodle/moodle-2.2.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.1.ebuild,v 1.1 2012/01/08 18:07:28 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_52="ctype,curl,iconv,json,pcre,simplexml,spl,xml,zip"
-PHP_OPTIONAL_FLAGS_52_A="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_52_B="gd-external,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52_A="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_A}"
-PHP_FLAGS_52_B="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52_B}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53_A="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_OPTIONAL_FLAGS_53_B="gd-external,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53_A="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_A}"
-PHP_FLAGS_53_B="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53_B}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- || (
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_A}]
- =dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52_B}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_A}]
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53_B}]
- )
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[1;31m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[1;33m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[1;32m"
- einfo
-}