Merge branch 'master' of ssh://git.animux.de/overlay

8 files changed, 291 insertions, 4 deletions

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
new file mode 100644
index 0000000..3928720
--- /dev/null
+++ b/www-apps/davical/ChangeLog
@@ -0,0 +1,130 @@
+# ChangeLog for www-apps/davical
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  22 Jan 2012; Mike Gilbert <floppym@gentoo.org> davical-1.0.2.ebuild:
+  www-apps/davical: rm || die
+
+  16 Jan 2012; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.7.ebuild, +davical-1.0.2.ebuild, files/awl_location.patch,
+  +files/inc_path.patch, files/postinstall-en.txt, files/vhost-example:
+  New version of davical
+
+  05 Nov 2011; Sven Schwyn (svoop) <gentoo@bitcetera.com>
+  -davical-0.9.9.6.ebuild, +davical-0.9.9.7.ebuild:
+  Version bump for davical
+
+  05 Oct 2011; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.4.ebuild, -files/postinstall-en-0.9.9.4.txt,
+  +davical-0.9.9.6.ebuild, +files/awl_location.patch,
+  +files/postinstall-en.txt:
+  New version of davical
+
+  14 Jan 2011; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.3.ebuild, -files/postinstall-en-0.9.9.3.txt,
+  +davical-0.9.9.4.ebuild, +files/postinstall-en-0.9.9.4.txt:
+  New version of davical
+
+  05 Nov 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.ebuild, +davical-0.9.9.3.ebuild,
+  +files/postinstall-en-0.9.9.3.txt, -files/postinstall-en-0.9.9.txt:
+  New version of davical
+
+  03 Nov 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  davical-0.9.9.ebuild:
+  Dropped the pcre use for >=php-5.3 as done for awl by Michael Weber (xmw)
+  (See bug #342597 - Thanks to Sven Schwyn (svoop) <svoop@delirium.ch>
+  reporting this on bug #343691)
+
+  21 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.4-r1.ebuild, -files/postinstall-en-0.9.8.4.txt,
+  +davical-0.9.9.ebuild, +files/postinstall-en-0.9.9.txt, -files/rscds.conf,
+  +files/vhost-example:
+  New version for davical New installation layout. (Thanks to Aurelien Requiem
+  <aurelien@menfin.net>
+
+  12 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.4.ebuild, +davical-0.9.8.4-r1.ebuild:
+  Source archive modified by upstream
+
+  12 Mar 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.3.ebuild, -files/postinstall-en-0.9.8.3.txt,
+  +davical-0.9.8.4.ebuild, +files/postinstall-en-0.9.8.4.txt:
+  New version for davical
+
+  27 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  davical-0.9.8.3.ebuild:
+  drop unnecessary pkg_setup
+
+  26 Feb 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.1.ebuild, -files/postinstall-en-0.9.8.1.txt,
+  +davical-0.9.8.3.ebuild, +files/postinstall-en-0.9.8.3.txt:
+  New version for davical
+
+  11 Feb 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.ebuild, +davical-0.9.8.1.ebuild,
+  +files/postinstall-en-0.9.8.1.txt, -files/postinstall-en-0.9.8.txt:
+  New version for davical
+
+  07 Jan 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.6.ebuild, -files/postinstall-en-0.9.7.6.txt,
+  +davical-0.9.8.ebuild, +files/postinstall-en-0.9.8.txt:
+  Version bump, now depends on php with pdo
+
+  28 Oct 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.4.ebuild, -files/postinstall-en-0.9.7.4.txt,
+  +davical-0.9.7.6.ebuild, +files/postinstall-en-0.9.7.6.txt:
+  version bump
+
+  12 Oct 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.2.ebuild, -files/postinstall-en-0.9.7.2.txt,
+  +davical-0.9.7.4.ebuild, +files/postinstall-en-0.9.7.4.txt:
+  New version for davical
+
+  17 Sep 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.1.ebuild, -files/postinstall-en-0.9.7.1.txt,
+  +davical-0.9.7.2.ebuild, +files/postinstall-en-0.9.7.2.txt:
+  New version
+
+  03 Sep 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.ebuild, +davical-0.9.7.1.ebuild,
+  +files/postinstall-en-0.9.7.1.txt, -files/postinstall-en-0.9.7.txt:
+  Version bump for davical
+
+  01 Jul 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.3.ebuild, -files/postinstall-en-0.9.6.3.txt,
+  +davical-0.9.7.ebuild, +files/postinstall-en-0.9.7.txt:
+  New version for davical
+
+  22 Apr 2009; Christian Ruppert <idl0r@gentoo.org> davical-0.9.6.3.ebuild:
+  Removed unused inherits, added missing die statements.
+
+  22 Apr 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.2.ebuild, -files/postinstall-en-0.9.6.2.txt,
+  +davical-0.9.6.3.ebuild, +files/postinstall-en-0.9.6.3.txt:
+  Version bump to 0.9.6.3
+
+  16 Mar 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
+  davical-0.9.6.2.ebuild:
+  Update ebuild to use EAPI 2. Thanks to Cristian Ruppert and Thomas Sachau
+  for review
+
+  24 Nov 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.1.ebuild, -files/postinstall-en-0.9.6.1.txt,
+  +davical-0.9.6.2.ebuild, +files/postinstall-en-0.9.6.2.txt:
+  New version for davical - Better ical calendar support
+
+  05 Nov 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.2.ebuild, -files/postinstall-en-0.9.5.txt,
+  +davical-0.9.6.1.ebuild, +files/postinstall-en-0.9.6.1.txt:
+  New version
+
+  16 Sep 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.ebuild, +davical-0.9.5.2.ebuild, -files/driver_ldap.patch:
+  New version for davical (Ex-rscds)
+
+  23 Jun 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  +davical-0.9.5.ebuild, +files/postinstall-en-0.9.5.txt,
+  +files/driver_ldap.patch, +files/rscds.conf, +metadata.xml:
+  New ebuild for bug 195118 - (initial work by Cory Coager <ccoager@gmail.com>)
+
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
new file mode 100644
index 0000000..ab621c9
--- /dev/null
+++ b/www-apps/davical/Manifest
@@ -0,0 +1,8 @@
+AUX awl_location.patch 1156 RMD160 1f1e81043fe66de8a0dbe5b67010c0aef018e4a5 SHA1 81cc1dc55ab866103f2eaf5e56060a007d4ef634 SHA256 67a0bc37c10a2468919e647953766b8121009c0f3d0eb17c08580987300a0219
+AUX inc_path.patch 1065 RMD160 eaf82caeebc53c4821762b6a81dc347e5d079980 SHA1 36f233e88d20a363df96125ce9c9c0b63a1b74b1 SHA256 cb27a236e33612b5172af659b93c28151e4ee796766c4e79f3ecd4e82dd2a134
+AUX postinstall-en.txt 730 RMD160 a39674de7cefa276aab4d02945b63216cf62a8d9 SHA1 77edb005c8576d681218e4fa471f7492feaafb31 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1
+AUX vhost-example 366 RMD160 aa9831be71c50e608b09c0f9a92ad30c52fc18ba SHA1 2b79bdcbd5d995f6014b86eaceab24418296e5d6 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97951807235b333
+DIST davical-1.0.2.tar.gz 2739740 RMD160 d24ccc16363f30789ec3c0b384f99999405fee7d SHA1 5d8b87018411d6f3995809d959450dd7522a149c SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6
+EBUILD davical-1.0.2-r1.ebuild 1815 RMD160 289a768d9a8791dfdf6628e37914d68911b7d854 SHA1 5042102d5d473fb5940463e5b052d953d67f70f2 SHA256 31bb449ca660d0fc10f0c5b26112c6da4a2b7e41f7d2a8b8c9ff5e004911d153
+MISC ChangeLog 5386 RMD160 14e97b6cc2db4c0898747f852e8c636b85fe6923 SHA1 2464554f7580a104c3050cae537dde1e62348371 SHA256 d3eb5df1516b2cb33089fdec6a8e25ed4efec25026bd706493c6a98d68e5d6eb
+MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/www-apps/davical/davical-1.0.2-r1.ebuild b/www-apps/davical/davical-1.0.2-r1.ebuild
new file mode 100644
index 0000000..5525ef0
--- /dev/null
+++ b/www-apps/davical/davical-1.0.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit depend.php webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="app-admin/pwgen
+	dev-lang/php[pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/yaml
+	>=dev-php/awl-0.51
+	www-servers/apache"
+
+need_php5
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	if use doc ; then
+		einfo "Generating documentation"
+		phpdoc -q -c "docs/api/phpdoc.ini"\
+			|| die "Documentation failed to build"
+	fi
+	emake built-po || die "emake failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc-php INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog \
+		|| die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess || die "doins failed"
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale || die "doins failed"
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/* || die "doins failed"
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/ || die "dohtml failed"
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example" \
+		|| die "newins failed"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
new file mode 100644
index 0000000..7eee3d8
--- /dev/null
+++ b/www-apps/davical/files/awl_location.patch
@@ -0,0 +1,21 @@
+--- scripts/po/rebuild-translations.sh.orig	2011-09-29 21:23:48.122625252 +0200
++++ scripts/po/rebuild-translations.sh	2011-09-29 21:49:55.642929743 +0200
+@@ -10,7 +10,7 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
++AWL_LOCATION="/usr/share/php/awl/inc"
+ 
+ if [ ! -d "${AWL_LOCATION}" ]; then
+   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+@@ -25,7 +25,8 @@
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+ sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+-sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
++sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
++sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
+ xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
+ sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
+ rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch
new file mode 100644
index 0000000..bc646f1
--- /dev/null
+++ b/www-apps/davical/files/inc_path.patch
@@ -0,0 +1,20 @@
+--- htdocs/always.php.orig	2012-01-05 21:28:16.382878446 +0100
++++ htdocs/always.php	2012-01-05 21:30:06.828431957 +0100
+@@ -48,7 +48,7 @@
+ // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt');  // An array of locales to try, or just a single locale
+ // $c->local_tzid = 'Pacific/Auckland';  // Perhaps we should read from /etc/timezone - I wonder how standard that is?
+ $c->default_locale = 'en';
+-$c->locale_path = '../locale';
++$c->locale_path = '../../davical/locale';
+ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
+ $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
+ $c->default_privileges = array('read-free-busy', 'schedule-deliver');
+@@ -95,7 +96,7 @@
+ }
+ 
+ // Ensure that ../inc is in our included paths as early as possible
+-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path());
+ 
+ 
+ /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */
diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt
new file mode 100644
index 0000000..5a88a2b
--- /dev/null
+++ b/www-apps/davical/files/postinstall-en.txt
@@ -0,0 +1,18 @@
+You will need access to postgresql database to use davical.
+
+Read /usr/share/doc/www-apps/davical-${PVR}/INSTALL.gz for installation
+instructions.
+Release notes are available at
+http://wiki.davical.org/w/Release_Notes/${PVR}.
+Full documentation and wiki on http://davical.org
+
+If you are upgrading from a previous version of davical, don't forget to
+upgrade the database structure with
+	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
+	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
+
+You can safely ignore any message about missing time_zone table.
+
+If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
+have been moved away from the htdocs directory and placed into hostroot for
+safety reasons.
diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example
new file mode 100644
index 0000000..d6f0da2
--- /dev/null
+++ b/www-apps/davical/files/vhost-example
@@ -0,0 +1,16 @@
+<VirtualHost 123.4.56.78 >
+	ServerName davical.example.net
+
+	DocumentRoot /var/www/myvhost/htdocs
+
+	<Directory /var/www/myvhost/htdocs/>
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	php_value magic_quotes_gpc 0
+	php_value register_globals 0
+	php_value error_reporting "E_ALL & ~E_NOTICE"
+	php_value default_charset "utf-8"
+</VirtualHost>
diff --git a/media-video/nvidia-settings/metadata.xml b/www-apps/davical/metadata.xml
index 7dfbf76..31dc017 100644
--- a/media-video/nvidia-settings/metadata.xml
+++ b/www-apps/davical/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 </pkgmetadata>