public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/agendav/files/, www-apps/agendav/
@ 2018-03-20 19:06 Fabian Groffen
  0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2018-03-20 19:06 UTC (permalink / raw
  To: gentoo-commits

commit:     1ed7a1ca5ca23db14d7a915ef61b3bc372b34a6d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 19:06:33 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 19:06:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed7a1ca

www-apps/agendav: version bump, bug #650922

Closes: https://bugs.gentoo.org/650922
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-apps/agendav/Manifest                       |  1 +
 www-apps/agendav/agendav-2.2.0.ebuild           | 48 +++++++++++++++++++++++++
 www-apps/agendav/files/postinstall-2.2.0-en.txt | 14 ++++++++
 3 files changed, 63 insertions(+)

diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
index 2e58abf4833..4c8863519f3 100644
--- a/www-apps/agendav/Manifest
+++ b/www-apps/agendav/Manifest
@@ -1 +1,2 @@
 DIST agendav-1.2.6.2.tar.gz 2586820 BLAKE2B 440bb7d8fafb482e99d1a9745c71914668d8aa262a1e5ea72c65a0feaa527cdebb8191551971e46661221b558f1fe78ed3aa937b1a5ed723407649c45e1cad19 SHA512 bfae7c00ab7f8baf239310e2c04229ee76a56befc57d9ab449654bb0c28dd30aab628a2292670dc8c1ce479593bd1b6a57ba1e4f3bcffb4de27214c855ccabab
+DIST agendav-2.2.0.tar.gz 5313351 BLAKE2B 3d7f47900f0030c87fe00c187faee5c508cd740afee2a5021a38e2e2f3986207d324891fc71b53c6b8938684981933f29c7c3022179e90f3b9e5b19e2437df99 SHA512 4bf3c6152d69d8c58cea4e4377acdc30ef90d7d40946ad495715a34348051db8d2c20c60d495fb629dd9ad143836025082109c2102149ab143e98ad2ba4b191b

diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild
new file mode 100644
index 00000000000..b2cd58dfa2a
--- /dev/null
+++ b/www-apps/agendav/agendav-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+DESCRIPTION="multilanguage CalDAV web client"
+HOMEPAGE="http://agendav.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND=">=dev-lang/php-5.5.9[ctype,curl,crypt,unicode,tokenizer,xml,xmlreader,xmlwriter]
+	virtual/httpd-php
+	|| ( >=virtual/mysql-5.1 >=dev-db/postgresql-8.1 )"
+
+src_install() {
+	webapp_src_preinst
+
+	einfo "Installing web files"
+	# fix references to the rest of the application code
+	sed -i -e '/__DIR__/s:/\.\./:/../../agendav/:' web/public/index.php || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r web/public/* || die
+
+	einfo "Installing main files"
+	cp web/config/{default.,}settings.php || die
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r web/{app,config,lang,src,templates,var,vendor} || die
+
+	einfo "Installing agendavcli utility"
+	sed -i -e '/__DIR__/s:/web/:/:' agendavcli || die
+	sed -i -e '/migrations_directory/s:web/::' || die
+	doins migrations.yml
+	exeinto "${MY_HOSTROOTDIR}/${PN}"
+	doexe agendavcli
+
+	local f
+	for f in "${ED}"/${MY_HOSTROOTDIR}/${PN}/config/* ; do
+		webapp_configfile "${f#${ED%/}}"
+	done
+	webapp_serverowned -R "${MY_HOSTROOTDIR}"/${PN}/var
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-2.2.0-en.txt"
+	webapp_src_install
+}

diff --git a/www-apps/agendav/files/postinstall-2.2.0-en.txt b/www-apps/agendav/files/postinstall-2.2.0-en.txt
new file mode 100644
index 00000000000..76b44064aab
--- /dev/null
+++ b/www-apps/agendav/files/postinstall-2.2.0-en.txt
@@ -0,0 +1,14 @@
+Next to a CalDAV server, you need access to a mysql or postgresql
+database to use agendav.
+
+Read http://docs.agendav.org/en/2.2.0/admin/installation/ for
+installation instructions of the database.  This includes loading the
+SQL statements using agendavcli utility.
+
+Next you have to edit all config files in your installation's
+  /path/to/hostroot/agendav/config.
+
+Before you can use agendav, you need to upgrade the database (you also
+need this on a new install) using:
+
+  $ /path/to/hostroot/agendav/agendavcli dbupdate


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/agendav/files/, www-apps/agendav/
@ 2019-10-20 14:13 Fabian Groffen
  0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2019-10-20 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9b3c9c28f082ce8c2468e55f176dd14f6e7ab2f2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 14:12:54 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:13:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3c9c28

www-apps/agendav: remove old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 www-apps/agendav/Manifest                 |  1 -
 www-apps/agendav/agendav-1.2.6.2.ebuild   | 78 -------------------------------
 www-apps/agendav/files/postinstall-en.txt | 13 ------
 3 files changed, 92 deletions(-)

diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
index 4c8863519f3..c19f4e989f0 100644
--- a/www-apps/agendav/Manifest
+++ b/www-apps/agendav/Manifest
@@ -1,2 +1 @@
-DIST agendav-1.2.6.2.tar.gz 2586820 BLAKE2B 440bb7d8fafb482e99d1a9745c71914668d8aa262a1e5ea72c65a0feaa527cdebb8191551971e46661221b558f1fe78ed3aa937b1a5ed723407649c45e1cad19 SHA512 bfae7c00ab7f8baf239310e2c04229ee76a56befc57d9ab449654bb0c28dd30aab628a2292670dc8c1ce479593bd1b6a57ba1e4f3bcffb4de27214c855ccabab
 DIST agendav-2.2.0.tar.gz 5313351 BLAKE2B 3d7f47900f0030c87fe00c187faee5c508cd740afee2a5021a38e2e2f3986207d324891fc71b53c6b8938684981933f29c7c3022179e90f3b9e5b19e2437df99 SHA512 4bf3c6152d69d8c58cea4e4377acdc30ef90d7d40946ad495715a34348051db8d2c20c60d495fb629dd9ad143836025082109c2102149ab143e98ad2ba4b191b

diff --git a/www-apps/agendav/agendav-1.2.6.2.ebuild b/www-apps/agendav/agendav-1.2.6.2.ebuild
deleted file mode 100644
index 81eb9196577..00000000000
--- a/www-apps/agendav/agendav-1.2.6.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="multilanguage CalDAV web client"
-HOMEPAGE="http://agendav.org/"
-SRC_URI="https://github.com/adobo/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-3+ LGPL-2.1+ GPL-3+"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-lang/php-5.3[curl,unicode]
-	virtual/httpd-php
-	|| ( >=virtual/mysql-5.1 >=dev-db/postgresql-8.1 )"
-
-S=${WORKDIR}/adobo-${PN}-84f869e
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc \
-		doc/source/admin/configuration.rst \
-		doc/source/admin/installation.rst \
-		doc/source/admin/troubleshooting.rst \
-		doc/source/admin/upgrading.rst \
-		|| die
-
-	# fix locations
-	sed -i \
-		-e "s:\(system_path = \)'[^']\+':\1'${MY_HOSTROOTDIR}/${PN}/system':" \
-		-e "s:\(application_folder = \)'[^']\+':\1'${MY_HOSTROOTDIR}/${PN}/application':" \
-		web/public/index.php || die
-	sed -i \
-		-e "/require_once/s:'../:'${MY_HOSTROOTDIR}/${PN}/:" \
-		web/config/autoload.php || die
-	sed -i \
-		-e "1a\set_include_path(get_include_path() . PATH_SEPARATOR . APPPATH.'config');" \
-		web/config/constants.php || die
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r web/public/* || die
-
-	einfo "Creating configuration container"
-	dodir "/etc/agendav"
-	local f
-	for f in caldav database config ; do
-		cp web/config/${f}.php.template "${ED}"/etc/agendav/${f}.php || die
-		ln -s "${EPREFIX}"/etc/agendav/${f}.php web/config/${f}.php || die
-	done
-
-	einfo "Installing main files"
-	insinto "${MY_HOSTROOTDIR}/${PN}"
-	doins -r web/{application,config,css_src,lang,system,templates_src,public} \
-		|| die
-	insinto "${MY_HOSTROOTDIR}/${PN}/application/libraries"
-	doins libs/icalcreator/*.php \
-		libs/caldav-client/*.php \
-		libs/awl/*.php \
-		|| die
-	dodir /usr/bin
-	cat > "${ED}"/usr/bin/agendavcli <<-EOF
-		#!/usr/bin/env bash
-
-		exec php "${MY_HOSTROOTDIR}/${PN}/public/index.php" cli "\${@}"
-	EOF
-	chmod 755 "${ED}"/usr/bin/agendavcli
-
-	einfo "Installing sql files"
-	insinto "${MY_SQLSCRIPTSDIR}"
-	doins -r sql/* || die
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_src_install
-}

diff --git a/www-apps/agendav/files/postinstall-en.txt b/www-apps/agendav/files/postinstall-en.txt
deleted file mode 100644
index 5301576c649..00000000000
--- a/www-apps/agendav/files/postinstall-en.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Next to a CalDAV server, you need access to a mysql or postgresql
-database to use agendav.
-
-Read /usr/share/doc/www-apps/agendav-${PVR}/installation.rst.bz2 for
-installation instructions of the database.  This includes loading the
-SQL statements from /usr/share/webapps/agendav/${PVR}/sqlscripts/.
-
-Next you have to edit all config files in /etc/agendav/.
-
-Before you can use agendav, you need to upgrade the database (even
-though this is a new install) using:
-
-  $ agendavcli dbupdate


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

end of thread, other threads:[~2019-10-20 14:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-20 19:06 [gentoo-commits] repo/gentoo:master commit in: www-apps/agendav/files/, www-apps/agendav/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2019-10-20 14:13 Fabian Groffen

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