public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/
@ 2011-02-22 12:42 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2011-02-22 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     a6f35e509ee0195220d4072efbb0c806d80c83e4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 12:41:56 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 12:41:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a6f35e50

www-apps/moodle: version bumps to address security issues

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 www-apps/moodle/ChangeLog            |    7 ++
 www-apps/moodle/Manifest             |    6 ++-
 www-apps/moodle/moodle-1.9.11.ebuild |  121 +++++++++++++++++++++++++++++++
 www-apps/moodle/moodle-2.0.2.ebuild  |  133 ++++++++++++++++++++++++++++++++++
 4 files changed, 266 insertions(+), 1 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index 2fff710..a8927f8 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/07/19 14:05:32 blueness Exp $
 
+*moodle-2.0.2 (22 Feb 2011)
+*moodle-1.9.11 (22 Feb 2011)
+
+  22 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +moodle-1.9.11.ebuild, +moodle-2.0.2.ebuild:
+  Version bumps.
+
   08 Jan 2011; Anthony G. Basile <blueness@gentoo.org> -moodle-2.0.1.ebuild:
   moved to tree
 

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 76710a0..59afe81 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,9 @@
 AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d
 AUX postinstall-en.txt 6524 RMD160 d3799bc5cdc283e787c1b5d08935a8d7851d0c8d SHA1 097744447c046848611bfe53d5191518465f1c6d SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667
 AUX postinstall-nodb-en.txt 171 RMD160 88ff71d95c63f1b5d76e398c3566ada75954cdf4 SHA1 26748e5f24207ef5cb145e3668e1f17cdcddf699 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a
-MISC ChangeLog 2405 RMD160 220e053cc3181eed055f28e5a702fe467b535f3b SHA1 e276d612fd479b72862f6d93ee8cc7b1cbd34e60 SHA256 3bfe2ef9de7b7109ffb6db76bff00fdf598e8e7bdfe63915f99e74d7eb1e8f61
+DIST moodle-1.9.11.tgz 14045392 RMD160 d50216d4cf535533aed7ca7dcc9211cbbe2fb52f SHA1 0355999061bff37693e2cf8f55e11abcfc0a7744 SHA256 b21da3a8e73c061b2115242b73e5328d078f979b9ca86523a392857c4fc59531
+DIST moodle-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4bb099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe
+EBUILD moodle-1.9.11.ebuild 3019 RMD160 e89e36d92c7a66a212b32d0c9e9b17544a001edc SHA1 7f51fd0eeb1821e0c44adc09a75421350f5ec094 SHA256 ca63bb55126abc1ad93d4670c2607440abeaae27ab2a4973a7fcec1730becba2
+EBUILD moodle-2.0.2.ebuild 3582 RMD160 7de28d2289a51b25a6ee06e908f127a1c6751589 SHA1 38dd39644547d2307a6e127803ad3e3c6f266eb4 SHA256 40497a4218c753fdc2d63baa3c321aa164b29ca052550f3b78d04310ee2c7709
+MISC ChangeLog 2583 RMD160 e5d88e582fc351705feb2c2499270db9e74cc226 SHA1 2e56d355290e041d70d34d4ea2241362e111f8ed SHA256 8dc0b2b8507d509d1ab49cb2019a991f4c0dfbe8dbbb071d81a00fc7493c55b1
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1

diff --git a/www-apps/moodle/moodle-1.9.11.ebuild b/www-apps/moodle/moodle-1.9.11.ebuild
new file mode 100644
index 0000000..d37fe0e
--- /dev/null
+++ b/www-apps/moodle/moodle-1.9.11.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.10.ebuild,v 1.1 2010/10/29 15:55:40 blueness Exp $
+
+EAPI="2"
+
+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="ctype,curl,gd,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}]
+	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=""
+	DBCOUNT=0
+	for db in ${DBTYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DBCOUNT=$(($DBCOUNT+1))
+		fi
+	done
+
+	if [[ ${DBCOUNT} -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 [[ ${DBCOUNT} -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 [[ ${DBCOUNT} -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} || die "Unable to insinto ${MOODLEROOT}"
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DBCOUNT} -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.2.ebuild b/www-apps/moodle/moodle-2.0.2.ebuild
new file mode 100644
index 0000000..b3c205d
--- /dev/null
+++ b/www-apps/moodle/moodle-2.0.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.1.ebuild,v 1.1 2011/01/08 23:21:15 blueness Exp $
+
+EAPI="2"
+
+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="gd,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_52="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}"
+
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
+
+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}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
+	)
+	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} || die "Unable to 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
+}



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/
@ 2011-07-08 21:05 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2011-07-08 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     fffb10230db17a16cb31a869d47c7405b9bfdba7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 21:05:33 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 21:05:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=fffb1023

www-apps/moodle: bump to 2.1

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 www-apps/moodle/ChangeLog         |    8 ++
 www-apps/moodle/Manifest          |   14 ++++
 www-apps/moodle/metadata.xml      |    9 +++
 www-apps/moodle/moodle-2.1.ebuild |  133 +++++++++++++++++++++++++++++++++++++
 4 files changed, 164 insertions(+), 0 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
new file mode 100644
index 0000000..a156f88
--- /dev/null
+++ b/www-apps/moodle/ChangeLog
@@ -0,0 +1,8 @@
+
+
+*moodle-2.1 (08 Jul 2011)
+
+  08 Jul 2011; Anthony G. Basile <blueness@gentoo.org> +moodle-2.1.ebuild,
+  +metadata.xml:
+  Bump to 2.1
+

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
new file mode 100644
index 0000000..0663f1d
--- /dev/null
+++ b/www-apps/moodle/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST moodle-2.1.tgz 23128617 RMD160 ed0758ffd1534c907ff27f5b9c5d1b285e499239 SHA1 9d7830f7b16621c22813634f19baae56cd565315 SHA256 8739ab133be99736ae7d9f004b4163b332dfd135c064899f84b24b8867ea2810
+EBUILD moodle-2.1.ebuild 3582 RMD160 1a8cf4d09c3ea6c68f1644e02be8d9d5d68a4690 SHA1 e61e0972e3d87fa74ebbb1632e5aa6be8dc36a54 SHA256 c5b2ec282ecb89b101d9a6c75839f95567736d6b3da66d48ff2e11a9ffe31947
+MISC ChangeLog 136 RMD160 fc9660fde19ae47a1042914c33b3122a7f4f3915 SHA1 68b48ffe651aa2fe5cd9b1668048476974c7dc58 SHA256 6ebbd5bae600a73b1d85e89ee5765d127d4feef5e8d04a48a4ac7b1dfd8fe243
+MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4XcR0ACgkQl5yvQNBFVTV0FQCghRJy0uLoMs/71jDn2dfwZJnL
+ZOcAn0JjY3g8SKF+UDeWerSRwQHIlOxl
+=vdxu
+-----END PGP SIGNATURE-----

diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
new file mode 100644
index 0000000..3cf0cd5
--- /dev/null
+++ b/www-apps/moodle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+</pkgmetadata>

diff --git a/www-apps/moodle/moodle-2.1.ebuild b/www-apps/moodle/moodle-2.1.ebuild
new file mode 100644
index 0000000..67e9a98
--- /dev/null
+++ b/www-apps/moodle/moodle-2.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.3.ebuild,v 1.1 2011/05/11 19:14:39 blueness Exp $
+
+EAPI="2"
+
+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="gd,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_52="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}"
+
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
+
+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}]
+		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
+	)
+	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} || die "Unable to 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
+}



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/
@ 2012-01-29  2:57 Anthony G. Basile
  0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2012-01-29  2:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4fe26258a4643e791d454f6efb4896d307a2d4ff
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 02:57:24 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 02:57:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=4fe26258

www-apps/moodle: added session to PHP_REQUIRED_FLAGS_53, bug #400853

---
 www-apps/moodle/ChangeLog               |    4 ++++
 www-apps/moodle/Manifest                |   20 +++++---------------
 www-apps/moodle/moodle-1.9.16-r1.ebuild |    2 +-
 www-apps/moodle/moodle-2.0.7-r1.ebuild  |   11 ++---------
 www-apps/moodle/moodle-2.1.4-r1.ebuild  |    2 +-
 www-apps/moodle/moodle-2.2.1-r1.ebuild  |    2 +-
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog
index f23b819..4069a30 100644
--- a/www-apps/moodle/ChangeLog
+++ b/www-apps/moodle/ChangeLog
@@ -1,5 +1,9 @@
 
 
+  29 Jan 2012; Anthony G. Basile <blueness@gentoo.org> moodle-1.9.16-r1.ebuild,
+  moodle-2.0.7-r1.ebuild, moodle-2.1.4-r1.ebuild, moodle-2.2.1-r1.ebuild:
+  testing bug #400853
+
 *moodle-2.2.1-r1 (16 Jan 2012)
 *moodle-2.1.4-r1 (16 Jan 2012)
 *moodle-2.0.7-r1 (16 Jan 2012)

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index c1b890f..819b1e5 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d
 AUX postinstall-en.txt 6524 RMD160 d3799bc5cdc283e787c1b5d08935a8d7851d0c8d SHA1 097744447c046848611bfe53d5191518465f1c6d SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667
 AUX postinstall-nodb-en.txt 171 RMD160 88ff71d95c63f1b5d76e398c3566ada75954cdf4 SHA1 26748e5f24207ef5cb145e3668e1f17cdcddf699 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a
@@ -8,16 +5,9 @@ DIST moodle-1.9.16.tgz 14052946 RMD160 4618557f3e8886010713ebfb1bbcd0042f3a1d10
 DIST moodle-2.0.7.tgz 22512947 RMD160 7ab98f36da35d03aff85f74f4e3392daaecceca5 SHA1 8c2fe470bf3de2150d2ca5878b7deb4457110555 SHA256 6ac7ae83dc5827d2054ab58d6e70a980b18bb28def18704fa5831ca578c6fc12
 DIST moodle-2.1.4.tgz 23938102 RMD160 b6c3993cfcbecca25d2c39bac33dc37a91480055 SHA1 6d8032953d94803a92234b6fb2cc57dcfb1fbb51 SHA256 9d0fe131f6a5cee9ba98bfb5ac1dcef703bec43b77cf5f8e0d6377ea45d80cdb
 DIST moodle-2.2.1.tgz 24892608 RMD160 d6d5e7c4b6c77ccee05fb794ccdfdfcb9029132e SHA1 051cdc4030b961585029302edc8417a096547c59 SHA256 863b8bc071c3999b2a61ffa86ee8fade6b4c121d4690a0fd74450648f57ac1fc
-EBUILD moodle-1.9.16-r1.ebuild 2987 RMD160 a7c2fe1fef6307270a6920669f7ae9bdcd576c70 SHA1 d66f287ab169a96a3d9d8313f9585c7514ac85e5 SHA256 84e3a93258b83f82c39b7352fa67b8974edaf18c5cfbc5f0ef8d921eae4e57ff
-EBUILD moodle-2.0.7-r1.ebuild 3541 RMD160 078f8e76fb7d9b4df914678ebfbbb44602296cdb SHA1 63e3d3bbfca161a9e6d573570c2216ddfeca73a4 SHA256 87bf92ef8a2ab763b044080bcdd363c1543985e4ed4bba9d324a8b50319a7fd9
-EBUILD moodle-2.1.4-r1.ebuild 3265 RMD160 7ab9658a77dfb99c0080ce742cd875c7ba810d17 SHA1 bd95aea54d8fa74268d97054d9fcd0701eaa6b29 SHA256 d9ddcfd1710eb5139b9e77f46780edde56aecd9a3a8b88ea92861f744803f2d3
-EBUILD moodle-2.2.1-r1.ebuild 3265 RMD160 9faaf6cc334c49889691ea5b49a2b968516c33ec SHA1 e47ca78008dc4e931c4d2026d55736f89977f65c SHA256 88528913895dd8e10d077db26d478978417042a47927c4ef74108f6c6fc7bbc3
-MISC ChangeLog 456 RMD160 b22d9d1560efbf01128950cf9d79e10cc2fa79f7 SHA1 a7dee2a13fbf74f29d5adc5525fd6c414bd11f2e SHA256 e56d6e8355aa6c30a4f2da5b2190f85049275f7c8f339c0ad3ada1afe7514e71
+EBUILD moodle-1.9.16-r1.ebuild 2995 RMD160 5fed7d2df5950c39a57bf5a9fb528d22814484c2 SHA1 fed9dda80b6f68209832225ad737daf68dcd5e1f SHA256 f40892a6969802eafb52bb929b73314fc8d94bd05e9089df4601d85bcfb8e85b
+EBUILD moodle-2.0.7-r1.ebuild 3273 RMD160 f9e9f04879d6b4ba6829858aab328004f13657f9 SHA1 f8105f6c688856990b5174c62d7a9ca3c97c578a SHA256 c60694213607832e29cd64b5bc004be7639a835fbb5d730a70cfe87947827dbc
+EBUILD moodle-2.1.4-r1.ebuild 3273 RMD160 740fa15ab3cf978e4923fe1b68bc7d7099bdd112 SHA1 279b0ec3635ae8745d4a8f6f80be2480afae4a8c SHA256 b07309597b0bfbaa0a254d900312549c8e05a445e2ab0b19e336952ecda166ed
+EBUILD moodle-2.2.1-r1.ebuild 3273 RMD160 b69ea843c995a3abb533cf16ec2c73a9079b06fc SHA1 27c0f007667603e4d7bba9e5418d80735f274340 SHA256 7bce7530f865d66ddbfeb4e35d80227960fe5fa68e82510ffdcc246355bf3d4e
+MISC ChangeLog 633 RMD160 6b45e9b8c3cca27bae63690c8ca17566f2b2ee0d SHA1 2e43e29ca13b1e178da2cdd601cc4c1be95b96f9 SHA256 3e04f313dddce514c4489cc731fab29dd3df782634bdaf5e9e9c82193ed7fd60
 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SHA1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c7de54671126820f89bf05ca96ec5f03842b12378e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk8UdswACgkQl5yvQNBFVTUBcACfbOUffYZGqS7zAf7Q4H1BxB7w
-tncAnRzFzF/pcA7gOOApFS7pPg1++r7W
-=+5xe
------END PGP SIGNATURE-----

diff --git a/www-apps/moodle/moodle-1.9.16-r1.ebuild b/www-apps/moodle/moodle-1.9.16-r1.ebuild
index 3d6d5c5..b166e9d 100644
--- a/www-apps/moodle/moodle-1.9.16-r1.ebuild
+++ b/www-apps/moodle/moodle-1.9.16-r1.ebuild
@@ -26,7 +26,7 @@ AUTHFLAGS="imap?,ldap?,odbc?"
 AUTHMODES=${AUTHFLAGS//\?/}
 AUTHMODES=${AUTHMODES//,/ }
 
-PHPFLAGS="ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib"
+PHPFLAGS="ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib"
 
 IUSE="${DBTYPES} ${AUTHMODES} vhosts"
 

diff --git a/www-apps/moodle/moodle-2.0.7-r1.ebuild b/www-apps/moodle/moodle-2.0.7-r1.ebuild
index 129b422..54c96b0 100644
--- a/www-apps/moodle/moodle-2.0.7-r1.ebuild
+++ b/www-apps/moodle/moodle-2.0.7-r1.ebuild
@@ -26,11 +26,7 @@ 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="gd,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_52="${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}"
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
 PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 
@@ -42,10 +38,7 @@ IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
 # which may live on another server
 DEPEND=""
 RDEPEND="
-	|| (
-		=dev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_52}]
-		=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
-	)
+	=dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
 	virtual/httpd-php
 	virtual/cron"
 

diff --git a/www-apps/moodle/moodle-2.1.4-r1.ebuild b/www-apps/moodle/moodle-2.1.4-r1.ebuild
index f1c1424..670aad7 100644
--- a/www-apps/moodle/moodle-2.1.4-r1.ebuild
+++ b/www-apps/moodle/moodle-2.1.4-r1.ebuild
@@ -26,7 +26,7 @@ AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
 AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
 AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
 
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
 PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 

diff --git a/www-apps/moodle/moodle-2.2.1-r1.ebuild b/www-apps/moodle/moodle-2.2.1-r1.ebuild
index a231256..6744801 100644
--- a/www-apps/moodle/moodle-2.2.1-r1.ebuild
+++ b/www-apps/moodle/moodle-2.2.1-r1.ebuild
@@ -26,7 +26,7 @@ AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
 AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
 AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
 
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,simplexml,xml,zip"
+PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
 PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
 



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-01-29  2:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 12:42 [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2011-07-08 21:05 Anthony G. Basile
2012-01-29  2:57 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox