version bump wrt #211985

Package-Manager: portage-2.1.4.4

4 files changed, 233 insertions, 5 deletions

diff --git a/www-apps/mod_survey/ChangeLog b/www-apps/mod_survey/ChangeLog
index a6dac7ed4fe3..2400dc4fbdd7 100644
--- a/www-apps/mod_survey/ChangeLog
+++ b/www-apps/mod_survey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mod_survey
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.5 2008/02/04 09:05:30 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/ChangeLog,v 1.6 2008/03/04 09:40:26 hollow Exp $
+
+*mod_survey-3.2.5 (04 Mar 2008)
+
+  04 Mar 2008; Benedikt Böhm <hollow@gentoo.org> +files/98_mod_survey.conf,
+  +mod_survey-3.2.5.ebuild:
+  version bump wrt #211985
 
   04 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mod_survey-3.2.4.ebuild:
   readd config file
diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest
index 44aae9d0e633..aff3ffeb700e 100644
--- a/www-apps/mod_survey/Manifest
+++ b/www-apps/mod_survey/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 98_mod_survey.conf 4327 RMD160 aff246a68c594f081afb9f1e6484eed23de3b083 SHA1 6f66f2fd38600b17dd7c7e81dc94d8348605fb50 SHA256 b55acb2bec39e3875d68e2e30b02720a72889fef26e20d7a17ad89a5780a64f2
 AUX language-list.txt 15 RMD160 75371acf87bd4a0878d4537edb0a8c5b5e3f6163 SHA1 2ee552c72259773dc86ae739f466fbc8fe9a1179 SHA256 8390c1de74985e4afe829a5d872796e83ce732503a789a74b2fd22e345facffa
 AUX postinstall-en.txt 158 RMD160 768b75129232255af63e41edc310ae5f551223d2 SHA1 788951b68461fda482114ccab220ea2f8ff6bbae SHA256 d879718ca7eafb8b61f86f00d2f9360be231e27f4d762688b371d5d113697c4a
 AUX reconfig 304 RMD160 d86461a6aa2b23d933099336c7f95be09f04170b SHA1 3ba22fc2321e60e6c895a45a043113e0db7b142c SHA256 40f8ddfd701c7be72dbe0346fe57484f39b9cd65c8d3de18b5ceabb57cd12216
 DIST modsurvey-3.2.4.tgz 496604 RMD160 46027f08ddcb581dceb52121c1c37b177d6fde24 SHA1 23b93e84da6aa63ef430bc278cbaa950ab939305 SHA256 6130501fb6f39817fe842a613f9b2770519c59fed060b16447f1d75345aa14af
+DIST modsurvey-3.2.5.tgz 508271 RMD160 cd8997bd36076614103115975cc73aca829b722d SHA1 1411c68068b848b16f85bb699dbd87f2480984db SHA256 5ad6f0de509e09a6842e3a56372f40122800397befed10dd78b37c4c0676e47b
 DIST modsurvey-docs-3.2.4.tgz 678356 RMD160 507b89416cc1f39cc19d90c3f795191c8ca7a4b6 SHA1 dd85990bcdc4cde6afe7e91269b05471028653ba SHA256 53c0e0d4335ded221c30fa52c4202793b86aef370d7b92341fb4fcaac12c1fd6
+DIST modsurvey-docs-3.2.5.tgz 678356 RMD160 507b89416cc1f39cc19d90c3f795191c8ca7a4b6 SHA1 dd85990bcdc4cde6afe7e91269b05471028653ba SHA256 53c0e0d4335ded221c30fa52c4202793b86aef370d7b92341fb4fcaac12c1fd6
 EBUILD mod_survey-3.2.4.ebuild 2859 RMD160 a55f43f10be8c8d936ebfcbe96983ee24f10192c SHA1 28598875ce8ac1aff9d5480e8572adde6968e946 SHA256 c6c73a99d4066740bc0dbf75850b9d7924c8d088541a194fe237229530c2e310
-MISC ChangeLog 3553 RMD160 e1f4fcb5468d95dd524de31bd82297e33f283f03 SHA1 a2b7fb9ddbdb39f239a875403e110cbb5c91ba21 SHA256 fc973df7cfc7f08b6f563f39080a1eb19b4c44f88e29af3dce70ebfa9202aff2
+EBUILD mod_survey-3.2.5.ebuild 2458 RMD160 714fc93e76e4f76f9c305b5b0a75684f39c3acab SHA1 2a3f5ad995aa67ef85c30145a6438706dd3b0e6e SHA256 5930b7f8ac73b8af0c03855fa5c5f841939dfeb8553152e446de844656d7404d
+MISC ChangeLog 3719 RMD160 927aa11568154da04c47f2c921a8e13dd048d3f1 SHA1 8d00bb896bc8062c7e5f1909be9cc081bd0c60b8 SHA256 655543852d53a8dd2eba993f9b02c782a8528fa7fbab85e6baa10ca1570d7a60
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkem1WMACgkQmPFBzbX68WFNvgCdFquDBQs1rlsefi25W2m0SZBR
-YuEAnjajxAOCqPc2/HIW0GEghoO5i+gd
-=4Pz9
+iEYEARECAAYFAkfNGRMACgkQmPFBzbX68WEkUACfdlQWSwH6e6hpzniGWH4PBhy3
+KPAAn3auKrWT9JmmsiDoj6wfH0J/lSVQ
+=VA1w
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mod_survey/files/98_mod_survey.conf b/www-apps/mod_survey/files/98_mod_survey.conf
new file mode 100644
index 000000000000..1791c5a88f8e
--- /dev/null
+++ b/www-apps/mod_survey/files/98_mod_survey.conf
@@ -0,0 +1,115 @@
+# -----------------------------------------
+# Config new for 32x
+# -----------------------------------------
+
+PerlSetEnv _SURVEY_ALLOWED_EXPORTS   "html,spss,sql,delim,fixed,xml,r"
+PerlSetEnv _SURVEY_OPTIONAL_EXPORTS  "browse,desc,freq,gfreq"
+PerlSetEnv _SURVEY_EXPORT_html       "Survey::Export::HtmlTables"
+PerlSetEnv _SURVEY_EXPORT_spss       "Survey::Export::SPSS"
+PerlSetEnv _SURVEY_EXPORT_xml        "Survey::Export::XML"
+PerlSetEnv _SURVEY_EXPORT_sql        "Survey::Export::SQL"
+PerlSetEnv _SURVEY_EXPORT_delim      "Survey::Export::DelimitedFields"
+PerlSetEnv _SURVEY_EXPORT_fixed      "Survey::Export::FixedColumns"
+PerlSetEnv _SURVEY_EXPORT_r          "Survey::Export::R"
+PerlSetEnv _SURVEY_EXPORT_browse     "Survey::Export::CaseBrowser"
+PerlSetEnv _SURVEY_EXPORT_desc       "Survey::Export::Descriptive"
+PerlSetEnv _SURVEY_EXPORT_freq       "Survey::Export::Frequency"
+PerlSetEnv _SURVEY_EXPORT_gfreq      "Survey::Export::GroupedFrequency"
+
+# -----------------------------------------
+# Mail settings
+# -----------------------------------------
+
+PerlSetEnv _SURVEY_SMTP_HOST         "127.0.0.1"
+PerlSetEnv _SURVEY_MAIL_ADMIN        "root@localhost"
+
+# -----------------------------------------
+# Set global survey configuration variables
+# -----------------------------------------
+
+# Directory where caches, autodata files and keys should be stored
+PerlSetEnv _SURVEY_SYSBASE           "/var/lib/mod_survey/"
+
+# Whether parser is allowed to write and read cache at all (overrides
+# ALLOWCACHE in survey docs if set to 0)
+PerlSetEnv _SURVEY_PARSERCACHE       1
+
+# Whether display module is allowed to write and read html output cache
+# (overrides ALLOWCACHE in survey docs if set to 0)
+PerlSetEnv _SURVEY_DISPLAYCACHE      1
+
+# Where mod_survey is installed
+PerlSetEnv _SURVEY_HOME              "/usr/lib/mod_survey/"
+
+# Where mod_survey web root is
+PerlSetEnv _SURVEY_ROOT              "/var/www/mod_survey/"
+
+# Which root alias to use for doc links and similar
+PerlSetEnv _SURVEY_ROOT_ALIAS        "/mod_survey/"
+
+# Whether we have installed on a sensible (unixoid) system
+PerlSetEnv _SURVEY_SENSIBLE          1
+
+# -------------------------
+# Security related settings
+# -------------------------
+
+# If you plan to use DBI tables, you must install DBI 1.13 or later and
+# set the below to 1. Even if you have DBI installed, you may want to
+# choose to not enable it in Mod_Survey for security reasons.
+PerlSetEnv _SURVEY_USEDBI            1
+
+# Whether is is allowed to let system automatically handle data submission
+# It would a stupid idea to change this unless you know what you are doing.
+PerlSetEnv _SURVEY_ALLOWAUTO         1
+
+# Whether submit should protest at illegal characters and ask the user
+# to go back and correct these. This will be ignored if _SURVEY_USENEWAUTo
+PerlSetEnv _SURVEY_PROTESTILLEGAL    1
+
+# Whether to use safe delimiters in the AutoData file. This makes things
+# safer, but also makes the AutoData file partially binary. Most users
+# want to enable this.
+PerlSetEnv _SURVEY_USENEWAUTO        1
+
+# -------------------------------------
+# Internationalization related settings
+# -------------------------------------
+
+# Where to find language files
+PerlSetEnv _SURVEY_LANG_DIRECTORY    "/usr/lib/mod_survey/Lang/"
+
+# Which language to use
+PerlSetEnv _SURVEY_LANG              "en"
+
+# ---------------------------------------------------
+# Startup check and addition of survey folder to @INC
+# ---------------------------------------------------
+
+PerlRequire "/usr/lib/mod_survey/startup.pl"
+
+# --------------------------------------------------------------------
+# Add type for survey files. If you change this, please change pattern
+# for the files tag below too
+# --------------------------------------------------------------------
+
+AddType text/html .survey
+
+# ---------------------------------------------------------------
+# Match all files containing ".survey" (tail "*" is necessary for
+# admin part). Enclosure in Directory necessary to avoid clash with
+# mod_proxy.
+# ---------------------------------------------------------------
+
+<Directory "/">
+	<Files *.survey*>
+		SetHandler perl-script
+		PerlHandler Survey::Handler
+		PerlSendHeader "Off"
+		AuthType Basic
+		AuthName Mod_Survey
+		PerlAuthenHandler Apache::AuthAny
+	</Files>
+</Directory>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apps/mod_survey/mod_survey-3.2.5.ebuild b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
new file mode 100644
index 000000000000..0f54f15b0bec
--- /dev/null
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mod_survey/mod_survey-3.2.5.ebuild,v 1.1 2008/03/04 09:40:26 hollow Exp $
+
+inherit depend.apache webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+MY_PN=${PN/_/}
+
+DESCRIPTION="XML-defined web questionnaires as a plug-in module using Apache."
+HOMEPAGE="http://www.modsurvey.org"
+SRC_URI="http://www.modsurvey.org/download/tarballs/${MY_PN}-${PV}.tgz
+	doc? ( http://www.modsurvey.org/download/tarballs/${MY_PN}-docs-${PV}.tgz )"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mysql nls postgres"
+
+LANGS="en de fr it sv"
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done
+
+DEPEND=">=dev-lang/perl-5.6.1"
+RDEPEND="${DEPEND}
+	>=www-apache/mod_perl-1.99
+	postgres? ( >=dev-perl/DBI-1.38 dev-perl/DBD-Pg )
+	mysql? ( >=dev-perl/DBI-1.38 dev-perl/DBD-mysql )
+	>=virtual/perl-CGI-3.0.0"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_apache
+
+	if use nls; then
+		for i in ${LINGUAS}; do
+			if has linguas_${i} ${IUSE}; then
+				if use linguas_${i}; then
+					locallang="${i}"
+					ewarn "${i} from the LINGUAS variable has been set as the"
+					ewarn "default language. This can be overriden on a"
+					ewarn "per-survey basis, or changed in"
+					ewarn "/etc/apache2/modules.d/98_mod_survey.conf"
+					ewarn
+					break
+				fi
+			else
+				einfo "LINGUAS=${i} is not supported by ${P}"
+				shift
+			fi
+		done
+	fi
+
+	if [[ -z ${locallang} ]]; then
+		[[ -n "${LINGUAS}" ]] && ewarn "None of ${LINGUAS} supported."
+		use nls && ewarn "Will use English as default language."
+		locallang="en"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s|\$lang = \"en\"|\$lang = \"${locallang}\"|" \
+		-e "s|/usr/local/mod_survey/|${D}/usr/lib/mod_survey/|g" \
+		installer.pl
+
+	rm -f docs/LICENSE.txt
+	use doc && unpack ${MY_PN}-docs-${PV}.tgz
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir /usr/lib/mod_survey
+	dodir /var/lib/mod_survey
+
+	dodoc README.txt docs/*
+	rm -rf README.txt docs/
+
+	insinto /usr/share/doc/${PF}
+	doins -r webroot/examples*
+	rm -rf webroot/examples*
+
+	perl installer.pl < /dev/null > /dev/null 2>&1
+	rm -rf "${D}"/usr/lib/mod_survey/{survey.conf,data,docs,webroot}
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r webroot/{main.css,system}
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/98_${PN}.conf
+
+	fowners apache:apache /var/lib/mod_survey
+
+	webapp_src_install
+}