reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /www-apps
532 files changed, 20379 insertions, 0 deletions
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..99bffd1ecaf4
--- /dev/null
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit depend.apache perl-module webapp
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Apache gallery for mod_perl"
+SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
+HOMEPAGE="http://apachegallery.dk/"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="${DEPEND}
+	=dev-lang/perl-5*
+	=www-apache/libapreq2-2*[perl]
+	>=media-libs/imlib2-1.0.6-r1
+	dev-perl/URI
+	>=dev-perl/Image-Info-1.40.0
+	>=dev-perl/Image-Size-2.990.0
+	dev-perl/Text-Template
+	>=dev-perl/CGI-3.08
+	dev-perl/Image-Imlib2
+"
+
+need_apache2
+
+src_install() {
+	perl-module_src_install
+	webapp_src_preinst
+
+	dodoc Changes INSTALL README TODO UPGRADE || die
+
+	insinto "${MY_ICONSDIR}"/gallery
+	doins htdocs/*.png
+
+	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/default
+	dodir "${MY_HOSTROOTDIR}"/${PN}/templates/new
+
+	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/default
+	doins templates/default/*
+
+	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/new
+	doins templates/new/*
+
+	insinto "${APACHE_VHOSTS_CONFDIR}"
+	doins "${FILESDIR}"/76_apache2-gallery.conf
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
new file mode 100644
index 000000000000..a422b884d308
--- /dev/null
+++ b/www-apps/Apache-Gallery/Manifest
@@ -0,0 +1,7 @@
+AUX 76_apache2-gallery.conf 1442 SHA256 f6c0099476bdec5f495e7de4cbdff088ed0ce01ef8993ba657a463cdb365a7ab SHA512 fb9f2c7c8d3fc38501311cdc76141326fa96ff8f9a33e8b9e9efc8ee7208fcb6168981ded323cc7851ea30f1b9ff1db3541cdd1c71a4f2c99ce9cb280efc7900 WHIRLPOOL dd0d7d7c966a56040f6c61e5d2664788c171cf053ce0bf415655c91e56470036d434aa78a0574d5f4f4d12e3840a1ef81dbe5212d6513ed7d52f449ba53769af
+AUX postinstall-en.txt 90 SHA256 d46f8343e97402107390a651ee3e31adfcd9034d9f88d4ae5dcc83061851dfc1 SHA512 3cecb9f07c69b20805a64e3184e3aea8e934d7ac7e42d53884268f7614780f25be524dafb25ae0d4ce1f9b1aed1fe88dfa27d98827182888fc36eb8301be0968 WHIRLPOOL a6cf9c0169db55b59b1654c04002bffb26b8de6547975822513193f9793b13696ac5d75e1f4396837bd840aaa2a08bb6c02215643038980b812c66eee5d599b6
+DIST Apache-Gallery-1.0RC3.tar.gz 83891 SHA256 9a7ab7566d811bb21dd27bc9a27cdcfb2c7a96c01727ad9a04313fc80e68e1f7 SHA512 00b95d3aed844c32a5d2cf8dc736e43a017dacfad5b73c65db4e35c2bb5fa05b7ae29af8ce5bc307e7b3539d94672031e7f1abaf150f15071272b0c1fa442062 WHIRLPOOL a8ec4ab53adc6264dd86d250967702681af8302653b15e284bf64b1a1f4951fdeb46fd5242e6b9599726064543d9dbec5906edb8ed61333faa26cccd104b50e3
+EBUILD Apache-Gallery-1.0_rc3-r1.ebuild 1279 SHA256 0f4f461fb0628424193eb2b89b935f68691ae42f34ac840abf26fd594d4d6fe4 SHA512 f5ac4de17f5dcd36439159fb2b58216b25548ef27c1ede0895e517283441ee38e1bad1d6f1d42746efc6d4c9ea9a41afddd9102cfe66f506885047d6875cfe2b WHIRLPOOL 8bb42b960d11e794586461546db6d80d0fcc8933348e3f46e6d36804c152c64d4e5072f6aaa76f760d9d774c5aac1b2df369740dd73ebb1dfa53fe948b1112ef
+MISC ChangeLog 3377 SHA256 8037633a1011240c49b22df545913f26c4356d0b3797ec278a416feacb352f4b SHA512 a7aad3cbe1afcb96e4d2155d666e9c9c860fc379d6dc1c879b9c75fe97efb92b5ae649491e0fe2d6743a0fae1949b3033e32b2e00cb4068cd418e2d9e8267b98 WHIRLPOOL e0b6aaca8a758ef224df9db15716809db910f9ad0808b8939b7a7c937094a3d52eeed27d60c01d4920c3f8caae07576260584148a44e73532e0cbc671c98145b
+MISC ChangeLog-2015 6783 SHA256 21e1456169d2cafeb97f31eeeb530d6c2efdb678b902c0ca5e75c5f12d752fd3 SHA512 6688cc9c453c4d03123cbae8f97a35f18a2f916a1a0f43bff67851e266ac4a29d7d81b80a681c3477518f2b082e2acc15be1beb22e293d6f6cefda9969463d98 WHIRLPOOL 64b659db8af2ee6423f473cc848cc98beda6bcb1ee5e941c0b450cfa6e9f157cc541e9284cdaf0945acc9ff046bab3eedec1d9aad998efe092834bd3ad6a227e
+MISC metadata.xml 250 SHA256 d9fcac0092614f226b371c1819fe3a264758bfd9fedc2874c35a7b3dd6d77291 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 WHIRLPOOL 113cbaecb7ee19172633b0ee77ecfa10f6742848fd0f5f0797b95865f291e063ce3916719af48a81a72adfdaf40a4b18815e2434f0de91e2baa63822951470f0
diff --git a/www-apps/Apache-Gallery/files/76_apache2-gallery.conf b/www-apps/Apache-Gallery/files/76_apache2-gallery.conf
new file mode 100644
index 000000000000..34dd36dbdbbc
--- /dev/null
+++ b/www-apps/Apache-Gallery/files/76_apache2-gallery.conf
@@ -0,0 +1,40 @@
+##### Apache::Gallery configuration
+#
+# This is actually a virtual host definition with mod_perl directives
+# It might be a very good idea to disable mod_autoindex in apache[2].conf
+#
+
+#<VirtualHost localhost>
+#  ServerName   localhost
+#  DocumentRoot /var/www/localhost/htdocs/data/pictures/
+#  ErrorLog     /var/log/gallery-error_log
+#  TransferLog  /var/log/gallery-access_log
+#  <IfDefine MODPERL2>
+#  PerlSetVar   GalleryTemplateDir '/var/www/localhost/Apache-Gallery/templates/default'
+#  PerlSetVar   GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' 
+#  PerlSetVar   GallerySizes '640 1024 1600 2272'
+#  PerlSetVar   GalleryThumbnailSize '100x75'
+## If you have a copyright overlay image set the location of it
+#  PerlSetVar   GalleryCopyrightImage 'htdocs/c.png'
+## If you use Apache2 set the following "PerlOptions" too
+#  PerlOptions +GlobalRequest
+#  <Location />
+#   SetHandler        	modperl
+#   PerlResponseHandler Apache::Gallery
+#   Options -Indexes
+#   AllowOverride AuthConfig
+#   Order deny,allow
+#   Allow from all
+#  </Location>
+#  </IfDefine>
+## Allow access to cache
+#  <Directory /var/tmp/Apache-Gallery>
+#    Options -ALL
+#    AllowOverride None
+#    Order deny,allow
+#    Allow from all
+#  </Directory>
+## Give Apache an idea of where to find icons and css
+#  Alias /icons /var/www/localhost/icons
+#  Alias /gallery.css /var/www/localhost/Apache-Gallery/templates/default/gallery.css
+#</VirtualHost>
diff --git a/www-apps/Apache-Gallery/files/postinstall-en.txt b/www-apps/Apache-Gallery/files/postinstall-en.txt
new file mode 100644
index 000000000000..1db19de3c7d3
--- /dev/null
+++ b/www-apps/Apache-Gallery/files/postinstall-en.txt
@@ -0,0 +1,2 @@
+You should now edit the Apache configs that have been installed into your
+Apache confdir.
diff --git a/www-apps/Apache-Gallery/metadata.xml b/www-apps/Apache-Gallery/metadata.xml
new file mode 100644
index 000000000000..2b9b44f73497
--- /dev/null
+++ b/www-apps/Apache-Gallery/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/agendav/Manifest b/www-apps/agendav/Manifest
new file mode 100644
index 000000000000..f15d54f1ddac
--- /dev/null
+++ b/www-apps/agendav/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-en.txt 486 SHA256 386a02204dd9df62a07eaf3f60f1b9220e540910ee47ba6a4b80b3e9be6c0dba SHA512 e6cde6985e969a8b08f184a631f5f304b6467bfd470591785eef7e7e2568e9c1a37c5a076556f2755a5f562d3fcde341c6781d74ef7af1bee938e184c9774d33 WHIRLPOOL a1cbf1f0133bd6641f13543d6f2b4b141fbd003d52c32dcc23d961c2b0af4c51509e0fa2f5d9eae1c2979a4c101017aefe63940a9ca5ded7298cdaa546b97740
+DIST agendav-1.2.6.2.tar.gz 2586820 SHA256 af5a8a828a1204d3dc4f0457424e77d74505b98c23e1ce9a886af789541ba44c SHA512 bfae7c00ab7f8baf239310e2c04229ee76a56befc57d9ab449654bb0c28dd30aab628a2292670dc8c1ce479593bd1b6a57ba1e4f3bcffb4de27214c855ccabab WHIRLPOOL 952f1ebc2702ed3e13334951b89b7898059c0dd3b917b6c9eafde2bc4454fb6dcebcea575d20acf15cc3f1af53db88735e99aa68e20ecd1ca63390be9fa1b768
+EBUILD agendav-1.2.6.2.ebuild 2144 SHA256 bba84d650257e0ce37f9617eb39715e2b7d40568b17bdd24d43e4e8ac839c7c2 SHA512 d55c96ecf0a04d0552b7802ee46952c5317f6a362676ef7e4079aa103456e7ed4d76eb9850cf6157c5218628209fa4edb28e0b6ce6da66348371abd14f141aa4 WHIRLPOOL 31e156addd826ae35aa811559e2fa02177827c1dcadb6bee91c07261e4cbfe7da5c57489e2b3f4951a9a873bb86518b53ed40efd8e20054087d487bc3e3f0d71
+MISC ChangeLog 2207 SHA256 31de9655f24f38f9fe980ef7cc065403203250375e373e515fe96a5054a66440 SHA512 7a40f927b0555abd550af76df9189f66d8307fc50323cbc9375abbf01b443b0a78949384d69444b52820ab4e265446ec29d59d3511413bb5e5f9235385ac23d6 WHIRLPOOL 0305cbc4fffd67588f8030fcec0b9cd61fa904b43b42ac2853bce4135cbc510e2930ca0baf927541a5c456eb03064b1ac35f7c5226b33b8c1329438eac391d14
+MISC ChangeLog-2015 633 SHA256 1eeb6c7b88d67f2586bf896de850c2fce1e293eaba4ad271509f582f4368027c SHA512 f5006ea22f9144bf58df76fe230025cdec1f1efde5a86229ae5c4e212b184414abcd2131a3b54473a86ca378b2117cd1c38e979e17d87a419d78a946276c24aa WHIRLPOOL 9b34e193db93297bbe48154e5338fd8e7f9e7e5543ff8c8c7a30a93938bda734f5e756939efb7b921ab058a4072705f19d57c86cf9350e52eb78073984a39e7d
+MISC metadata.xml 326 SHA256 345b7feafc75d4323bc2474e2ae92a8589e8248885fbe07d658b8b1ea22c5e54 SHA512 353e3ba7bcb34dbcc4a7f3ee7c282914b5744f796da8ae8e19ccdd7bf1d65110b3e41938380fb460485f47468b9ebef8c3bb24b6f82911dac5a454784ba1fbcd WHIRLPOOL 562dad9f84123f2ed0797d3d2b435cc16db59c99e4b9fca6c50a308b7eb45316848d922fa574955a0e03c5f6422d1e243d79e28c9f2003bf30403def87544eea
diff --git a/www-apps/agendav/agendav-1.2.6.2.ebuild b/www-apps/agendav/agendav-1.2.6.2.ebuild
new file mode 100644
index 000000000000..81eb9196577b
--- /dev/null
+++ b/www-apps/agendav/agendav-1.2.6.2.ebuild
@@ -0,0 +1,78 @@
+# 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
new file mode 100644
index 000000000000..5301576c6498
--- /dev/null
+++ b/www-apps/agendav/files/postinstall-en.txt
@@ -0,0 +1,13 @@
+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
diff --git a/www-apps/agendav/metadata.xml b/www-apps/agendav/metadata.xml
new file mode 100644
index 000000000000..33a49a010167
--- /dev/null
+++ b/www-apps/agendav/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adobo/agendav</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
new file mode 100644
index 000000000000..7ae5a5048df4
--- /dev/null
+++ b/www-apps/airdcpp-webui/Manifest
@@ -0,0 +1,6 @@
+DIST airdcpp-webui-2.1.0.tgz 7472713 SHA256 b0efb4e9a0f41079ddd02ddd5b85013e517a62f14a02bbece75a42a00d67f429 SHA512 003af5b331707967a8b63d4d93bdd2b259a6ebedfd47a08ebec04664390f53332001ab3d208e28781d840e25a38d48e2608fa7f969ddb85b10891b76fd2f4166 WHIRLPOOL 9c5771df300212dcf06ed5f2f4210830396c3a62656f09945da7ad64d6a4a06147d7bc21bb3821de2d5230d1ff1a27aab33295fcd935ba00e2249cd5a84415fd
+DIST airdcpp-webui-2.2.0.tgz 7901987 SHA256 77f591afb2d5fd66d56514fa6ed206e5ea73b160240f3f3ff8a68c1a40d91171 SHA512 080b3e6a3e0758f45830408ddbdb694edd4e223e22a97a32f6facef02bff0cafaa46cca2394b73f27f8757a85fe90b95c41d6cf63e4a0c2b207c804281791108 WHIRLPOOL 074b16091a79b66f61d88c571a19aeb11759b7052b4cafc9af0994e64d220e805996453f9c2e3788d0fc998ab6b842e0de2a9b863226906da755ca79b839860a
+EBUILD airdcpp-webui-2.1.0.ebuild 469 SHA256 7e666b256cb014c773b49a342edee981a8f00e82cc8589fdb4715cb4114886a5 SHA512 a8b87f4cc1ef05808502af531d8649812dfbb6a550cd1237dedf287f229004bc93d936175b0bca270eb6da4859aeebfe79dd85f12706cbf301693d561a7839e9 WHIRLPOOL c17e2e6175f1cd69fc122ccea27be43e9a1bc5e9d52c12110507ef76abe5aad93f1a0e854e57d9f7860d132b139550853cedd814e43d835bde382a0f8b32b74b
+EBUILD airdcpp-webui-2.2.0.ebuild 469 SHA256 7e666b256cb014c773b49a342edee981a8f00e82cc8589fdb4715cb4114886a5 SHA512 a8b87f4cc1ef05808502af531d8649812dfbb6a550cd1237dedf287f229004bc93d936175b0bca270eb6da4859aeebfe79dd85f12706cbf301693d561a7839e9 WHIRLPOOL c17e2e6175f1cd69fc122ccea27be43e9a1bc5e9d52c12110507ef76abe5aad93f1a0e854e57d9f7860d132b139550853cedd814e43d835bde382a0f8b32b74b
+MISC ChangeLog 7964 SHA256 da2dc1f7a3ddcdfdca8f6b59a62273e34ec0ced14fc505911fc7a007824abbdf SHA512 8464230ffe2ff4cf43bbfcb5e16244ae667ebe1443d66d1d20b7fe326627c694793b124ba8da90e617dbf1b4e5d43ca15bed34f954c2c8d1302dd8ecf3facb40 WHIRLPOOL 35283bf6b6d943a8588e9bf5f9616fc61e93c14f165d97089db5aaa1b0982a0eeff57e9a3595895f8576bec6662b7911c4d47b899e5015c8d7d922ff9d3931d0
+MISC metadata.xml 677 SHA256 834042ccaabfaa51b8c9ad28a55ef16917f0d12afd2964ca4cf9c6254cecfd21 SHA512 ec611e2d73e0da98d4dd8d656826cf9b5caf9f79772ddc8e37ab43d32dde78b959bc27bbd9b6d592059390cac61773ba1e846e97ebdcd02e9373e4376128ce97 WHIRLPOOL 09815dd0d8ac1cb0de949966d2e3cc4133995e1981a7b4a5dd953d32ffeca2db15b2fc74ecf994eb778d97fc8b76ff6ea9b47eaf69e70fed259152f23bdaa364
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.1.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.1.0.ebuild
new file mode 100644
index 000000000000..213a54088678
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Web interface for airdcpp-webclient"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
+
+S="${WORKDIR}/package"
+
+src_install() {
+	insinto "/usr/share/airdcpp/web-resources"
+	doins -r dist/.
+}
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.2.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.2.0.ebuild
new file mode 100644
index 000000000000..213a54088678
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Web interface for airdcpp-webclient"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
+
+S="${WORKDIR}/package"
+
+src_install() {
+	insinto "/usr/share/airdcpp/web-resources"
+	doins -r dist/.
+}
diff --git a/www-apps/airdcpp-webui/metadata.xml b/www-apps/airdcpp-webui/metadata.xml
new file mode 100644
index 000000000000..eb56049e1d2b
--- /dev/null
+++ b/www-apps/airdcpp-webui/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">airdcpp-web/airdcpp-webui</remote-id>
+		<bugs-to>https://github.com/airdcpp-web/airdcpp-webclient/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		AirDC++ Web UI written in Javascript. Communicates with AirDC++ Core via AirDC++ Web API.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
new file mode 100644
index 000000000000..3c32ed0d94ce
--- /dev/null
+++ b/www-apps/ampache/Manifest
@@ -0,0 +1,6 @@
+AUX installdoc.txt 223 SHA256 ad163088081a596b3fb1b08ae1c606dbea558f839377d6a19268f4e958acf53e SHA512 07636e6b53e9f259e1195795d15e6dc88e3e5401a700553df55cf7c0a39997c8bdfc3f5a83b0bac2a2ef474bea11d71e442ce6e45ef88b0fac0cf9c3307732d2 WHIRLPOOL 09cbaffcf4a5b41c49aa30703a8d969628da54a38d51eec794b8ef742586e9d8db1266a75ce2a88bd4908320a8e76d3b81a0cc4eb2f3918bd6c6b1c9096d9da6
+DIST ampache-3.8.3.tar.gz 8444610 SHA256 3d48c497dd75149d216123d1ff1f3344b7989bb2c5f1e0cc3a087d9fee398719 SHA512 35deb6bde949641bf39f58e033953bc0d79f1f56033d496e5a3d302d16c998da3468d1d82ac49e0702fada34a6dafb22ffa5bc931fe886e35c81ba2a5cf1233e WHIRLPOOL 94b419b41f3b13097195e9ad544303f0e73d0f002aa6ba59f638c1f709a546df636952deafe66e53aba555da63c11fcf3975f7d29a0b4bb632b497a16a836178
+EBUILD ampache-3.8.3.ebuild 1235 SHA256 b0e059d25cf41af722f4a0a4195fe56fb792ed4905c5e4cedbd7ff377b8ef8f5 SHA512 3a8bbfe71415fe4f466ef9fc7c4b2769e61a4e9df7d260e98784cf0c8427ab4227c032d0dff62a54bd5af31bedae92355044370d8064e4eefa75c019bfc3aa4b WHIRLPOOL 1e4413f819a99001f626a49d898df97b730473164b12ecf46e7a7866d0112ca2072fbd4a439d2555823ef25d333e9dc06d60a81fa81e7b7135c52d0363f5348f
+MISC ChangeLog 4036 SHA256 717dfd4d1b823bc3545cff107a09157a17efce3bf14d5afc3af5cbafb652b525 SHA512 7ad75f599e31ea456ce14f43cb893b1513911f5f1104cb4bf592547ae0e1aca246ece8365d718b18769248645ad054623771c423681ff80e27dcdcbfcf5475a5 WHIRLPOOL 1e38147843f52d024ad89733dcaf9bd90131777296c1acb894a32c8403e588834e837e263f78831c167f8a9f1123cf36ce449babefcb89f92a3c7de1e5fb8c00
+MISC ChangeLog-2015 8619 SHA256 f3fe86a0f378ac72519004253efe8642256be9f61462200c8bbce30b80032175 SHA512 d0983e91673757efdd3a01390a46c9f1837d6349320a7d9d302a664b6accaa3c0f82600d639938fb9f63852c45d1cc4bf5c659feb4146abb65de74c4da2e518e WHIRLPOOL edf7bf083828df6bdcea75432634255d4d1516574e5dfef780260688059acaa88c39ac678475215ec7c146d4d15ea2556cb4fec5dffa8e9ec5447d37d9307a9c
+MISC metadata.xml 432 SHA256 4c37bb5baff559db8ec1f9ece0a7bf0c55c4b1e1abd754799ca992c8fc153f5b SHA512 a10625a3ee73dbea032a0e6389a140a32441ac32bb11adbb9c01dc122da44a625604854bce9d34bbeed4969b3fdbe2bd5cf10678e1d2c362a3db55351eccf2de WHIRLPOOL 21ad5547fd54ef7d4fa17a93a26810139903f01a8ea5b3d9d5531ee88fcc12c12089f0f365c02bd88cf88a8a4c2f7e406d34ac922085ba1a2508bb5d7da00560
diff --git a/www-apps/ampache/ampache-3.8.3.ebuild b/www-apps/ampache/ampache-3.8.3.ebuild
new file mode 100644
index 000000000000..346eeb744af8
--- /dev/null
+++ b/www-apps/ampache/ampache-3.8.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a web interface"
+HOMEPAGE="http://www.ampache.org/"
+SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="aac flac mp3 ogg transcode"
+
+RDEPEND="dev-lang/php[gd,hash,iconv,mysql,pdo,session,unicode,xml,zlib]
+	transcode? ( media-sound/lame
+		aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
+		flac? ( media-libs/flac )
+		mp3? ( media-sound/mp3splt )
+		ogg? ( media-sound/mp3splt media-sound/vorbis-tools )
+	)"
+DEPEND=""
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	doman docs/man/man1/ampache.1
+	rm -rf docs/man || die "Unable to remove local man dir"
+
+	dodoc docs/*
+	rm -rf docs/ || die "Unable to remove local docs dir"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Install and upgrade instructions can be found here:"
+	elog "  /usr/share/doc/${P}/INSTALL.bz2"
+	elog "  /usr/share/doc/${P}/MIGRATION.bz2"
+	webapp_pkg_postinst
+}
diff --git a/www-apps/ampache/files/installdoc.txt b/www-apps/ampache/files/installdoc.txt
new file mode 100644
index 000000000000..cdd6e118238e
--- /dev/null
+++ b/www-apps/ampache/files/installdoc.txt
@@ -0,0 +1,6 @@
+Install and upgrade instructions can be found here:
+/usr/share/doc/ampache-<version>/INSTALL.gz
+/usr/share/doc/ampache-<version>/MIGRATION.gz
+
+For general information please read:
+/usr/share/doc/ampache-<version>/README.gz
diff --git a/www-apps/ampache/metadata.xml b/www-apps/ampache/metadata.xml
new file mode 100644
index 000000000000..a1f5854ec25e
--- /dev/null
+++ b/www-apps/ampache/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
+	<use>
+		<flag name="transcode">Install optional dependencies for transcoding support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ampache/ampache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
new file mode 100644
index 000000000000..8eaa968d7cf2
--- /dev/null
+++ b/www-apps/b2evolution/Manifest
@@ -0,0 +1,7 @@
+AUX postinstall-en.txt 611 SHA256 2333fda76f492a6700bccd4b1121cec4a02f2e419141fa11b9555ff4ef25aa99 SHA512 5ec5ceeeed44446084e18fa739cff5c16eca315bc11f8c0178a6217a5e0f0695a051187bc1d77d685f14e126df4b134e7ab3fbef100ea60ab7741aa2650a9ff8 WHIRLPOOL fe9e2e05c3cb1de76af12f656a33b22819c5a1274936261bd604ec793a37084beb5d9b9f8aac9e1820ca58d63c15cbd1e93e8fc35d829145fc06e5440be60cd0
+AUX postupgrade-en.txt 214 SHA256 312ce51eb9413b0a127a63dad962a7de17a0a3c99d64abeeb282e9f6edbcb837 SHA512 18d0dbe48a1e0b290f72b0a7a7dee4c28c9c24366f9073f2938d5227c80d3b62b6ed76a8a11c59f4e641bde731a746178c4e2eaaa736660ee875917c24fb8243 WHIRLPOOL 6958b6a229d3f36ff009e7c6269bfe3deedf0937f28a60d060ffc7c475b478458749b078dca50a6a0099b5275bc4ab28580d3ba211f524777395eb3147f6c844
+DIST b2evolution-4.1.7-stable-2013-04-27.zip 6112599 SHA256 46432f779b4525bbf24e5b6738d2af504c5c4330e60878d1bed9afe1f6a3f634 SHA512 cf5f20c6dd8ddd714bc6cc3365fc815b4f9444feddea278da08ab247bf8dbaf97c70fe923d4438888e8a94e31567c6f5085850ba4566bae3ec54f45c7dde8c20 WHIRLPOOL 62e58afda602865ba199e0f4bc26cdd270816cc82ab6608ee7b9eced1f5e85a5974fda8f54b3c5928ed97ef22e5dddc984ee7e772e16705b482cd94f5fa0077b
+EBUILD b2evolution-4.1.7.ebuild 1089 SHA256 81e516d4288a0108571b39c5183b92ff27dd1e4a033c8d4e53c237481a1d6b96 SHA512 bc4f8d57a51033b9156a5de73f93a267d752de714bf1a5277f08b025f1c13f5a5082b57d6da5e7d7b0dcf092f9c1555f0cfd11d78cb37ca5d6dad6c12535adc6 WHIRLPOOL 6cd8c9ff4d811c1411afbccd88fe35a0ec47001e899d6e16b42495d91a8ebfc8a09c66144cc4c69f6adeaf05d8c9645afa5aa349ef88724c8e08408a5af1d214
+MISC ChangeLog 2495 SHA256 2c1c3f77e6c46dc5f749c9d04a6b4f3563461aede0b0bca0e66960a825e2270c SHA512 9fbf8631718b49f80db3f4b20ae2a1ae5966244ac87ed1ec335352306f04a8e8e745a283c3de002a1dc9760793ff3637abfbaf02e7d7a4aa07e57f34cfa87a10 WHIRLPOOL 8b2365cc255a680d21922e347d50838ca7ac828b2980febd0212adc487e7b6afc1087460042bc631d3fc4e80009251627dce0d929150c6b582a755ea96b43100
+MISC ChangeLog-2015 6656 SHA256 fae5e537e8ab4310bd652dfe24b8e681ea6ef0ceeba2d474c338ecddb268d3f3 SHA512 b9b79140285f0e6885aad9d7e556ea7a68af37c664750ad8a1cd3c68b022c44aa38bf7b1b4fb422f1122310effdfc166fe278b3bc498369dbddf646ccdd83ff6 WHIRLPOOL a5dce04e6be3fd0a1c5858bda04e05b55ce40c05c021d51dec88001c05a93045d218180906913be39a65da2a03678edb029958d24dcb2e11d43d775aae202dec
+MISC metadata.xml 326 SHA256 929e5b8a18f28115b7bc94789e2dfbbdd3f1b87d9a35191c05d5cee1f98d6dd6 SHA512 44c73e9870c77210c198278359cb06c879499efb72fa3cf92d63989d9e704ec907fc76f92f93ea0c7948b56ade367e54580c4d2ab4cc75bbdeb353f7496eaa40 WHIRLPOOL 88ef0d968db3b1ae861dfe50aa0ce938065e27fbcb5981a851aaf00dfe486b9902c4e961fdebf808f70dfbf4a93ee338568d9b11e842a2dfc115914fa6a81b87
diff --git a/www-apps/b2evolution/b2evolution-4.1.7.ebuild b/www-apps/b2evolution/b2evolution-4.1.7.ebuild
new file mode 100644
index 000000000000..b164f4a4ceeb
--- /dev/null
+++ b/www-apps/b2evolution/b2evolution-4.1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+
+MY_EXT="stable-2013-04-27"
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multilingual multiuser multi-blog engine"
+HOMEPAGE="http://www.b2evolution.net"
+SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[ctype,curl,mysql,tokenizer,xml]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r blogs/*
+
+	rm doc/*.*-*.html doc/*.src.html
+	dohtml doc/*.html
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/conf/_basic_config.template.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/{cache,media}/
+	webapp_configfile
+	"${MY_HTDOCSDIR}"/conf/_{basic_config.template,advanced,locales,formatting,admin,stats,application,config,icons,upgrade}.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/b2evolution/files/postinstall-en.txt b/www-apps/b2evolution/files/postinstall-en.txt
new file mode 100644
index 000000000000..9361877c2608
--- /dev/null
+++ b/www-apps/b2evolution/files/postinstall-en.txt
@@ -0,0 +1,17 @@
+You will need to provide a database for your b2evolution installation.
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+http://www.gentoo.org/doc/en/mysql-howto.xml
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install
+
+and provide the credentials required for the database access.
+
+Note the administrator password b2evolution will provide and after
+logging in with these credentials you can start to use the application.
diff --git a/www-apps/b2evolution/files/postupgrade-en.txt b/www-apps/b2evolution/files/postupgrade-en.txt
new file mode 100644
index 000000000000..9e01eaba38c7
--- /dev/null
+++ b/www-apps/b2evolution/files/postupgrade-en.txt
@@ -0,0 +1,6 @@
+Please go to this location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install/index.php
+
+and select "Upgrade from a previous version of b2evolution" after 
+providing the credentials required for the database acces.
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
new file mode 100644
index 000000000000..2bd751aefd82
--- /dev/null
+++ b/www-apps/b2evolution/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">evocms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
new file mode 100644
index 000000000000..7d9520126a20
--- /dev/null
+++ b/www-apps/baikal/Manifest
@@ -0,0 +1,12 @@
+AUX postinstall-en.txt 272 SHA256 18e7c1fe4d97ad7c082a795c88073663f4a65777b2df907d6277bbe19e7787b2 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740 WHIRLPOOL 04fc2f53cd98083f32cd26920c3b6b4d1a143e861bdd8ba801647f92f806897189b355aa3394446d3322680d5028d6aab0e591fd4da1fdc12e18cd398580a13a
+DIST baikal-0.3.5.zip 3282401 SHA256 a3da3ed6d668b5ea9c2c83a231b5cfe827d25d4f45991554e27c3b277446d728 SHA512 b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d WHIRLPOOL f1a9e1cd9512b6e6aa89449a341c8da09b36f24b67462e44fe2a9ec5b7843a9b8aaf6cf89b645c668e8e14fa2432c84737e6eb40f136ca11929d7617e2d2cf3a
+DIST baikal-0.4.4.zip 3285109 SHA256 cced612353862bce532ed458eda0675b5e1e5790f92969bf13992c6567943efc SHA512 3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11 WHIRLPOOL c266d47d043f5bc61a9c75b77b5287ec4cfb13163f1eecd124c1e5bfb3f2b91e18523a3e8e344044c2bd8053f3e4044505dc21b4f875942e4136325be0bcd1af
+DIST baikal-0.4.6.zip 3288478 SHA256 946e8e4161f7ef84be42430b6e9d3bb7dd4bbbe241b409be208c14447d7aa7a6 SHA512 8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1 WHIRLPOOL dd62913f6366bf09a858891b9d720123266cd816744312fe1c895cabae4851794d55df2720c79298c7a7071700b4f51e1f0b0b18db6fa7a21b833e9782e52c63
+DIST baikal-regular-0.2.7.tgz 2273699 SHA256 268daeec96b9f1bbfee0c16398ae213abfe827c97ec487179985828b6267359f SHA512 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f WHIRLPOOL bf3e750c9cb5e9e372794e24516e8acb6d43abe1e76d30e3033994e617082f62bef87f5b33363937818ccb1ac35cd37d59dc7caab42356206be37967d284b8f0
+EBUILD baikal-0.2.7.ebuild 1398 SHA256 3cf8b2cc03b3b5be8b857a93450bd85fadaf3a24e168db832067e0f5e2f79404 SHA512 f2ba442d6b1754fce7e7b95defd5534d13ea486c594eb9ae1a9b406f6a86b7bb447bc7be0f9245b416aa1622bca6e7497c286da8f7b41b313f0ea8a103825e82 WHIRLPOOL 8267be6c28a8251952c78ad5735a64f0c8684409d21f5d53e3bf4e12e0a1000d221ec789c94d00793695f739597c83755475b807ead7043bb24f71398ec0738d
+EBUILD baikal-0.3.5.ebuild 1446 SHA256 a74829c34f7884c113466608d4634fa9f4db93d73a8d7b711f40a2918b07bd47 SHA512 a2fc47fbe930b90999192ab30859e4c27ab0bfa8b53f1aae06a30c8ecdc1e13d1e51a9db66835f4f4bf7f0eb8183226c7f65c754b9b0808b499ba4984d6a7bea WHIRLPOOL 5d2aa25d124a078826be175051e0826b40b22e37f4708b4d1de3eada081f3ffa7e07c40a9a27ffaf0d11fa5b32d5e6afc636317f80ad3f539c9f37bdb03549ab
+EBUILD baikal-0.4.4.ebuild 1461 SHA256 ca49de80f908564921da546abda1543ff3d2fe3d1d61339063d64857c4866200 SHA512 3eba92629db154561a58e6122dfe38fc5345598f70825b98f201bbb6bc4bff85900fc37202bffe045993bde01dd9c41c6c13ccad7dcc03cf66edfd68699f7403 WHIRLPOOL b40c2dcdf65916fb9f249ccdcac68ac94879b089bad5ba765b103b0f77fda8b8cc9b0934c0d5e98fd969e219119899ad327aa07fe82261cc01cbe9ada71f795c
+EBUILD baikal-0.4.6.ebuild 1461 SHA256 ca49de80f908564921da546abda1543ff3d2fe3d1d61339063d64857c4866200 SHA512 3eba92629db154561a58e6122dfe38fc5345598f70825b98f201bbb6bc4bff85900fc37202bffe045993bde01dd9c41c6c13ccad7dcc03cf66edfd68699f7403 WHIRLPOOL b40c2dcdf65916fb9f249ccdcac68ac94879b089bad5ba765b103b0f77fda8b8cc9b0934c0d5e98fd969e219119899ad327aa07fe82261cc01cbe9ada71f795c
+MISC ChangeLog 3377 SHA256 b2fba0e69b4d6040d090f79314a743ee87989cdb5e97ac571f3130f24861f535 SHA512 17441f821d0138c2faa7b769b17df3f59c2e854c9785155800f8bd4bfd5fb99bd66374968b5b4b5c51ac4d1715ec10f6068d643e77a2d95ae95bfc4ba0a03caf WHIRLPOOL a03197a386e1d12fc55dcc71dd6cf95853e35dba84fcdd67ae873780df4de72b1985316dda901612247fa59bfc43f13ea0ad4576a02ed3a02d111c88658213cb
+MISC ChangeLog-2015 1057 SHA256 853f7651b6a4d3c68df587f9be22871947d8d53d3074309fc5bac900d49ea8b0 SHA512 40fc775796f69b6f396058172eefdef140e7d07ce2f24b8685205c942500c44b6e6fbd4c953cf9f7113dc98b1ca397812981d5e78e845aa1620919b353893ca5 WHIRLPOOL fd46ce95a9415141aaea6dac9b648d9fd97bcf523be92f2d78ed1e1e96e1576280cea2ca603827e39480f24583d5dd48b0f4964c39dc83a290cb5b773813a275
+MISC metadata.xml 325 SHA256 d8f8512210bd596ff696062646f5955807ced894e0a902600c57163cf8785b6b SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9 WHIRLPOOL 9b79bfd106e5e7459e55c75a133382b94ca283eb21c61c4c3da2895481a926f2bc45d17246005f8064f20c6dee86226b763cb24f8a925a730cf372ce0601e304
diff --git a/www-apps/baikal/baikal-0.2.7.ebuild b/www-apps/baikal/baikal-0.2.7.ebuild
new file mode 100644
index 000000000000..6d36fb9754d4
--- /dev/null
+++ b/www-apps/baikal/baikal-0.2.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://baikal-server.com/"
+SRC_URI="http://baikal-server.com/get/${PN}-regular-${PV}.tgz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.3[ctype,filter,pdo,session,xml,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}-regular
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md  || die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+	einfo "Setting up container for configuration"
+	insinto /etc/${PN}
+	doins Specific/.htaccess || die "doins failed"
+
+	einfo "Fixing symlinks"
+	local link target
+	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
+		target=$(readlink "${link}")
+		target=${target/..\/Core/Core}
+		rm "${link}" && ln -s "${target}" "${link}"
+	done
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	if has_version www-servers/apache ; then
+		fowners -R apache:apache /etc/${PN}
+	else
+		einfo "/etc/${PN} must be owned by the webserver user for baikal"
+	fi
+}
diff --git a/www-apps/baikal/baikal-0.3.5.ebuild b/www-apps/baikal/baikal-0.3.5.ebuild
new file mode 100644
index 000000000000..8e83aa8754e1
--- /dev/null
+++ b/www-apps/baikal/baikal-0.3.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/"
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md  || die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+	einfo "Setting up container for configuration"
+	insinto /etc/${PN}
+
+	einfo "Fixing symlinks"
+	local link target
+	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
+		target=$(readlink "${link}")
+		target=${target/..\/Core/Core}
+		rm "${link}" && ln -s "${target}" "${link}"
+	done
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	if has_version www-servers/apache ; then
+		fowners -R apache:apache /etc/${PN}
+	elif has_version www-servers/nginx ; then
+		fowners -R nginx:nginx /etc/${PN}
+	else
+		einfo "/etc/${PN} must be owned by the webserver user for baikal"
+	fi
+}
diff --git a/www-apps/baikal/baikal-0.4.4.ebuild b/www-apps/baikal/baikal-0.4.4.ebuild
new file mode 100644
index 000000000000..bf20db84b6cf
--- /dev/null
+++ b/www-apps/baikal/baikal-0.4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/"
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md  || die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+	einfo "Setting up container for configuration"
+	insinto /etc/${PN}
+
+	einfo "Fixing symlinks"
+	local link target
+	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
+		target=$(readlink "${link}")
+		target=${target/..\/Core/Core}
+		rm "${link}" && ln -s "${target}" "${link}"
+	done
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	if has_version www-servers/apache ; then
+		fowners -R apache:apache /etc/${PN}
+	elif has_version www-servers/nginx ; then
+		fowners -R nginx:nginx /etc/${PN}
+	else
+		einfo "/etc/${PN} must be owned by the webserver user for baikal"
+	fi
+}
diff --git a/www-apps/baikal/baikal-0.4.6.ebuild b/www-apps/baikal/baikal-0.4.6.ebuild
new file mode 100644
index 000000000000..bf20db84b6cf
--- /dev/null
+++ b/www-apps/baikal/baikal-0.4.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="http://sabre.io/baikal/"
+SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md  || die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor || die "doins failed"
+
+	einfo "Setting up container for configuration"
+	insinto /etc/${PN}
+
+	einfo "Fixing symlinks"
+	local link target
+	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
+		target=$(readlink "${link}")
+		target=${target/..\/Core/Core}
+		rm "${link}" && ln -s "${target}" "${link}"
+	done
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	if has_version www-servers/apache ; then
+		fowners -R apache:apache /etc/${PN}
+	elif has_version www-servers/nginx ; then
+		fowners -R nginx:nginx /etc/${PN}
+	else
+		einfo "/etc/${PN} must be owned by the webserver user for baikal"
+	fi
+}
diff --git a/www-apps/baikal/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
new file mode 100644
index 000000000000..e6a11275dc85
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-en.txt
@@ -0,0 +1,5 @@
+In order to setup baikal:
+- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
+- point your browser at the instal's URL and follow the setup
+To upgrade baikal, you have to follow the setup instructions
+If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/
diff --git a/www-apps/baikal/metadata.xml b/www-apps/baikal/metadata.xml
new file mode 100644
index 000000000000..4c3fd25c6ce8
--- /dev/null
+++ b/www-apps/baikal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fruux/Baikal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
new file mode 100644
index 000000000000..afe382cb0cf1
--- /dev/null
+++ b/www-apps/blazeblogger/Manifest
@@ -0,0 +1,8 @@
+AUX blazeblogger-1.2.0-bash-completion.patch 2058 SHA256 0856b6d6d3ebf8fde15e791421be4ffb3613c550b3315cf81ab8dedbbeb2ecc6 SHA512 f69b75f16f87c3cf7e16765eb6f237a6c32a046244770b457a94a189a9d2e612933907dc43143a86167252b0a51280eab045fd3e9bf92a00cfe3519393ed9db2 WHIRLPOOL 192ab2cd9be9c16df5249f5b7e839156a0d01c804eb701622c16ac835786e6db30ad2a17248fe9f640a880bffca9e4370558dd75f307c0f1c0e478550cdd14e8
+DIST blazeblogger-1.2.0.tar.gz 81340 SHA256 39024b70708be6073e8aeb3943eb3b73d441fbb7b8113e145c0cf7540c4921aa SHA512 c0fb7d3493933e405c78e871baa0eba7bbf6245d98174ae1f80d215bc413a836a0872fef067ca0622bbb155b54d90e7e81d99e6d10e93aec3bce098677a827bd WHIRLPOOL f2372fee786c84835e33dea5815b27a34d661be53f5b1b9499c1dc098c03cace057522095d580e53d7916779bf208ff56f6e8827b9ae15ee04ff9c3332c9289b
+DIST blazeblogger-doc-1.2.0.tar.gz 191467 SHA256 a1591f88b245114dea421268f0c4938f1c1a7fa0ba94316f886e0014e20736bc SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989 WHIRLPOOL b64278305a68f74b4185df07fada6ee6dc2ae2fbaf9985f810803893ec0f2ae2b788b2e1fc7a9baf6e4944b740494bb45951c5c3ccc92c144dbaad524ef03f25
+EBUILD blazeblogger-1.2.0-r1.ebuild 841 SHA256 a7e1b715c5bfa1a436ab54df49c2f5a3b4cb40625800dd0a917e6344d7d874d7 SHA512 aa86c2bf7f9ec3f90c09d5298412db64878447ea971792336c6ff94fc57eb50ea5a8cf9b0c9213d78c45dd621922fd9ef97267d1f2c86b19b97c0f1675fb339b WHIRLPOOL 85af1a879104fac5cbf2dc6ed4d3775b2546046398eabe586d6fec3a1105d8e6932a2a5674bf5fd61e6fe6de43d5adc230de3162ee5147a635885c570f2890d6
+EBUILD blazeblogger-1.2.0.ebuild 718 SHA256 9c5a56ae94a3080dc90fe027a85ba2bbb2c51f74e879b8fa844523695b401ab1 SHA512 cd4bfbd80b256dcbe69e9d0c704ecb5bf15a603f4416c34efdca8d2fe661230d9b65967bb9a0cadcf32047ac69e9be528e2ec7a7b853aea1eee10e0d28764a1e WHIRLPOOL 0cc67aa8205ab1d4dfbc62edb0c45ab97cdd0d222a168470600ba9d11136b4a26f2fea9d180bd0bbe879ebab1c7e1ea2186c74aab994fbc69e1f7611902fae11
+MISC ChangeLog 2510 SHA256 4949157b02558b43d61642a845f3d17dadf0521c86b2672d5b5626043c7fb37e SHA512 727e6bcabf46663a8cdf487307d0b88657e18d1b276573e51bfb18c5e427a5e782bb343f3b858d80a92bc779ebebba767df0f83e679f045005e78ec681d8da9e WHIRLPOOL 3df1e01efec869ee540a2513f18cabbb05afbd3628b7d9e68ca65caa14f6db7448544a5da03fcb3437fa50dba9c22b94e3e3c7f2bf0cbc084ffe619042d51975
+MISC ChangeLog-2015 1053 SHA256 3a579d2c16f98dafb9a722cc7c66e989d335b9ba23691d47850ae6a6c163119e SHA512 b864459d4773b59534a38469a828703404eacf888c5c9f910fc6fe0bd65f2f67d1ffdc27ddc4a2640382e7fcd70b2b47dfc570e5ac0795ae894c2c0e4dd9fab6 WHIRLPOOL f340632197e58233c78b64d00c39cecea0479ef89d15dfb200a51152b2c2a245b4bf9684b1b880a0ad0a059f626676e2a3307aeaf43b582b721ef4d3cc421dd3
+MISC metadata.xml 325 SHA256 6520550eb82f312c263c450f6c0b0ffc7846582a92389993e5672b9891ab7e2a SHA512 d30a3e0a39a7fb4f542acfd36a545934962449c33dfb659360212a68df41f0e148cf835b3da19123f93ae66f47a11422ede84bb25b2421b2edf57cf0464f1a03 WHIRLPOOL be26b1e3adcc0e4234d390f799f2720c7612914ceded2ab9e14b9ce2d9693cd39ab82b7981853d28a29da879c43a4a462c0e58772aef3d4897f947d7e43ac1d6
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..367dbb4061cf
--- /dev/null
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="simple-to-use, capable content management system for the cmdline producing static content"
+HOMEPAGE="http://blaze.blackened.cz/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
+	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e '/-m 644 COPYING/d' \
+		-e '/-m 644 INSTALL/d' \
+		-i Makefile || die
+
+	epatch "${FILESDIR}"/${P}-bash-completion.patch #bug 417953
+}
+
+src_install() {
+	emake prefix="${D}/usr" config="${D}/etc" \
+		compdir="${D}/usr/share/bash-completion" install
+
+	use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/*
+}
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
new file mode 100644
index 000000000000..754b71c2148a
--- /dev/null
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="simple-to-use, capable content management system for the cmdline producing static content"
+HOMEPAGE="http://blaze.blackened.cz/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
+	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e '/-m 644 COPYING/d' \
+		-e '/-m 644 INSTALL/d' \
+		-i Makefile || die
+}
+
+src_install() {
+	emake prefix="${D}/usr" config="${D}/etc" install
+
+	use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/*
+}
diff --git a/www-apps/blazeblogger/files/blazeblogger-1.2.0-bash-completion.patch b/www-apps/blazeblogger/files/blazeblogger-1.2.0-bash-completion.patch
new file mode 100644
index 000000000000..8c13ed8086fb
--- /dev/null
+++ b/www-apps/blazeblogger/files/blazeblogger-1.2.0-bash-completion.patch
@@ -0,0 +1,83 @@
+--- blazeblogger-1.2.0/unix/bash_completion
++++ blazeblogger-1.2.0/unix/bash_completion
+@@ -103,7 +103,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++	  _filedir -d
+           return 0
+           ;;
+         *)
+@@ -131,7 +131,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++	  _filedir -d
+           return 0
+           ;;
+         -E|--editor)
+@@ -166,7 +166,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         -d|--date)
+@@ -187,7 +187,7 @@
+         COMPREPLY=( $(compgen -W "${specopts}" -- ${cur}) )
+         return 0
+       else
+-        COMPREPLY=( $(compgen -f -- ${cur}) )
++        _filedir
+         return 0
+       fi
+       ;;
+@@ -200,7 +200,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         -E|--editor)
+@@ -227,7 +227,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         *)
+@@ -252,7 +252,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         -d|--day)
+@@ -292,7 +292,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir|-d|--destdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         *)
+@@ -315,7 +315,7 @@
+       # argument completions
+       case "$prev" in
+         -b|--blogdir)
+-          COMPREPLY=( $(compgen -d -- ${cur}) )
++          _filedir -d
+           return 0
+           ;;
+         -n|--number)
diff --git a/www-apps/blazeblogger/metadata.xml b/www-apps/blazeblogger/metadata.xml
new file mode 100644
index 000000000000..c2f03805ce86
--- /dev/null
+++ b/www-apps/blazeblogger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">blazeblogger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/blohg-tumblelog/Manifest b/www-apps/blohg-tumblelog/Manifest
new file mode 100644
index 000000000000..b35f10cd5310
--- /dev/null
+++ b/www-apps/blohg-tumblelog/Manifest
@@ -0,0 +1,6 @@
+DIST blohg-tumblelog-0.2.tar.gz 11046 SHA256 89d8cdc4fe7c2e058f657a8986123219a65a2b8caa404bec7423e93988976b04 SHA512 c9819c503751f4b6dc5f53b2f16206912424fe51eee4c76da5331e1ee1847066f4c758e98ec6fae98b0e0dfe33d5a37ce5f4ea2ea3abba0fd276cde242489792 WHIRLPOOL 744ab5d1d81faa44d79d9785caf1fef522fbc74f8a1c697cfccb64f5d72e25931d0be55337715111a11cedf3512be940973cca7363ff127d10d6a8789bc78a6d
+EBUILD blohg-tumblelog-0.2.ebuild 729 SHA256 2d2a3abfbd1c4c6972d9391b74adc3052616b00d52fa168b3eb8e742397cbea3 SHA512 00c5aeaeb7de931e51ffc6992c6a820a20a0ec603551c1d6b9a525bf505569cfb53b0ab1a8454a59aee1f0f8b6a5793dfa2507f487d4f762cd7d9c80cf615242 WHIRLPOOL 8198cfd505d67c2e407c889e709f10f2ee07cead310bf2b02ed14bc16bbc68779d7a110d0565b453ff9205c576b76b774f286742133fd30e3cbf9618e76e1e65
+EBUILD blohg-tumblelog-9999.ebuild 729 SHA256 2d2a3abfbd1c4c6972d9391b74adc3052616b00d52fa168b3eb8e742397cbea3 SHA512 00c5aeaeb7de931e51ffc6992c6a820a20a0ec603551c1d6b9a525bf505569cfb53b0ab1a8454a59aee1f0f8b6a5793dfa2507f487d4f762cd7d9c80cf615242 WHIRLPOOL 8198cfd505d67c2e407c889e709f10f2ee07cead310bf2b02ed14bc16bbc68779d7a110d0565b453ff9205c576b76b774f286742133fd30e3cbf9618e76e1e65
+MISC ChangeLog 2262 SHA256 59cabc5974fdf27890f99450a4ff89ebb8210fd7020147b4f652836b87082524 SHA512 604921ed87580f2f4cb01a3f0dafc7bfbf579047a74eb9e9d9ae10003dda9b8503910c8bfd386bf19707816008d907ca1b13155ea6e492a8f2f2785b900df720 WHIRLPOOL 78b43ef20fcbe3bf0e8e4debd87b382beeaebbd1aa226ae1ceb29904073f5825ee0b88e6e343a4bfb92fd6e5b4a408c41a16afc6baac8fbf2cda5f60d22920e1
+MISC ChangeLog-2015 453 SHA256 daceb53e7a05f9d165558eef187b4e05443b97471127ac616bd10d0bc5d27850 SHA512 0bf1142583620e9da33982414f3b5f833cf9efb9401c382dbe5ec00c570f8a63c6c960a48611722c5b0ba96bc6bc9d7c5c16d47c51fea317c631823cd2520e1d WHIRLPOOL 5f068697608cb684e136e5ce7c8381d28f8dc9aa351690d1601de06390afd6288a979b65735b28a14d473b1d02c4fa2c4286f3f65b0955d47672b00e46a9f4f1
+MISC metadata.xml 698 SHA256 d45a25f0963000bb8b00962bb03d55eaa09992bf6b9f86a49f6be029d41cf058 SHA512 e5ad3685e16d39735bd93af2c071eb3a924ca78c873f9cdae9803a8038b1291b54d0f01e4dce3b6fa55107a05afbd92e4ed9309a3d21e845e54a24ea23761938 WHIRLPOOL ccbc3b117f97cdd68548b1b1abe9f0d761183084a8afe86a4c82019fdf51db1332d12621ac1dee8f7ad509d2eba78c74c40755ed79b9b17fbf12de7247d2e1e1
diff --git a/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild b/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild
new file mode 100644
index 000000000000..068364304c3b
--- /dev/null
+++ b/www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A blohg extension with reStructuredText directives to run a tumblelog"
+HOMEPAGE="https://github.com/rafaelmartins/blohg-tumblelog"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+	inherit git-r3
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=www-apps/blohg-0.12
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyoembed[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild b/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild
new file mode 100644
index 000000000000..068364304c3b
--- /dev/null
+++ b/www-apps/blohg-tumblelog/blohg-tumblelog-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A blohg extension with reStructuredText directives to run a tumblelog"
+HOMEPAGE="https://github.com/rafaelmartins/blohg-tumblelog"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+	inherit git-r3
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=www-apps/blohg-0.12
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyoembed[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/www-apps/blohg-tumblelog/metadata.xml b/www-apps/blohg-tumblelog/metadata.xml
new file mode 100644
index 000000000000..f8048e3efc32
--- /dev/null
+++ b/www-apps/blohg-tumblelog/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		A blohg extension with reStructuredText directives to run a tumblelog.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<bugs-to>mailto:blohg@librelist.com</bugs-to>
+		<remote-id type="pypi">blohg-tumblelog</remote-id>
+		<remote-id type="github">rafaelmartins/blohg-tumblelog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
new file mode 100644
index 000000000000..639cd07e9eae
--- /dev/null
+++ b/www-apps/blohg/Manifest
@@ -0,0 +1,7 @@
+AUX use-recent-libgit2.patch 724 SHA256 504091526249be032bc126a9d9b8a75ff8df11861eff9cdd9b440a1d185e6c33 SHA512 fab12807128e60d6c9105947ca313233ea00e8b81329d9eb92e5307d24f0ec7b1173de6d1b6b6571bf2e8ce4820dc8d7c1e5dac0a3dfed14157357532b99d1e9 WHIRLPOOL 7a6be57653e2bfa1f00a65e3975c856848a6ade715e46e1006b04a7467d9d18a22ea67fa95bee72d699a0221eb2bedf125e1345422baddef0b1cd670acd48c09
+DIST blohg-0.13.tar.gz 75003 SHA256 34d10db8bdadee16931cadbdec904508e61d8f862b143f3a9e224171d92d0579 SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865 WHIRLPOOL b3396dfca37ff4279ece72d62c413cd590f7106c2d8aaeeaf0c46eba16c8a5f803955385052d557c39478ef71c37936a6204dccfb8db6384e9071ba346ee35f1
+EBUILD blohg-0.13-r2.ebuild 1713 SHA256 18460f49d3013f58c7d7bd43f0ac98176e58f2dcb0d1505bc3d5b29a41e751bf SHA512 040054a42203df846da96b8c3c3fc86d9704e704a92c330361cb2e0f221db5457fdd4b66ea512abeb2a8239a3601868ba5132f6cffa745794ab5358d6e0a06d4 WHIRLPOOL 3c5a5cd0a27fb1e433778755a39ce26d17454b26f1e8b5b52d698cd221bb875ab2bf05c46fe2608b0da29a5f3ab2c19926684c477516969b55a11f1a07e942ea
+EBUILD blohg-9999.ebuild 1648 SHA256 5e10417baf764b60f0af9bfeef1aec01959a2a64bbfbb7fb0130d5177afa30a0 SHA512 a2a1d8a11ff880bf5b0531a43e3d9bd11918fbed9262b77bfd3759aa0708036831fe0c1199612c6514eae3f7fb48b4a371f0b7ece8ac97afd3ec4591743a84f3 WHIRLPOOL f7e83cd32d2170b0010ca666ff0e17b9e9d2464381c314400427832c86a745edaf4835b3a5c395dc53cc4887c77ba198e56162e96c579eec5a54b9dd8f8e9189
+MISC ChangeLog 3124 SHA256 ae5270a2461030998eb4f38e10481bd469cbb4db88a1f6fcacf483ce79c5a77e SHA512 a5c1ebd8a8d0fc7421342a6fb367c500dba2f1e5e12f8b7ad24827495d52ce331f6803f9c112cd9ca74367a48759b28bc405af58824cf52bdaca60429cde3684 WHIRLPOOL cbf3f0053392458c5d9a67a9cf4447346212aa0d726cb96d033c665dbfc12408621fa7d4ba1f073be519588e1f1deb9746e67dd722343c456c6752700e438c2d
+MISC ChangeLog-2015 5519 SHA256 9fe96546c4df392704fa561bf5677a19435a336289d136c118c14d91ccc8a3e0 SHA512 f53210df613d1baa6491a9a76b301d9c449a9d8b11f177264c492c7e24e73cb6a41bde132fe984a20ab8466865c17dcd29589b8d551d1bdd40c791ac889fcef0 WHIRLPOOL 34e9dec85222742de7e13f024213aeeca5347dfc401e05ff7461a2132b2f0160c5102edc6c481d6709bcef750d92c2c0ceeea32866f82ee0d889fe8627f6d276
+MISC metadata.xml 983 SHA256 47376fea0ad9395bfad4b152b6b16abe4c1d2721cc9e8237cf2d6a35eb77af16 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8 WHIRLPOOL f2cbde055f56c97cc810a7d77aae8f5d2c1d4c4da2e334f2115e10f411ec1ecb335fa70967c090cbda234f49cf7d6166807a15cd0d1728a9494916b9eb8fa113
diff --git a/www-apps/blohg/blohg-0.13-r2.ebuild b/www-apps/blohg/blohg-0.13-r2.ebuild
new file mode 100644
index 000000000000..f28eb4067fe4
--- /dev/null
+++ b/www-apps/blohg/blohg-0.13-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/rafaelmartins/blohg"
+fi
+
+inherit distutils-r1 ${GIT_ECLASS}
+
+DESCRIPTION="A Mercurial (or Git) based blogging engine"
+HOMEPAGE="https://github.com/rafaelmartins/blohg"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc git +mercurial test"
+
+REQUIRED_USE="|| ( git mercurial )
+	test? ( git mercurial )"
+
+RDEPEND="
+	>=dev-python/click-2.0
+	=dev-python/docutils-0.11*
+	>=dev-python/flask-0.10.1
+	>=dev-python/flask-babel-0.7
+	>=dev-python/frozen-flask-0.7
+	>=dev-python/jinja-2.5.2
+	dev-python/pyyaml
+	dev-python/setuptools
+	dev-python/pygments
+	git? ( >=dev-python/pygit2-0.21.3 )
+	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/mock )"
+
+python_prepare_all() {
+	if ! use git; then
+		rm -rf blohg/vcs_backends/git || die 'rm failed'
+	else
+		local PATCHES=( "${FILESDIR}/use-recent-libgit2.patch" )
+	fi
+
+	if ! use mercurial; then
+		rm -rf blohg/vcs_backends/hg || die 'rm failed'
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	local ver="${PV}"
+	[[ ${PV} = *9999* ]] && ver="latest"
+
+	elog "You may want to check the upgrade notes:"
+	elog "http://docs.blohg.org/en/${ver}/upgrade/"
+}
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
new file mode 100644
index 000000000000..f27bdfa76f24
--- /dev/null
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/rafaelmartins/blohg"
+fi
+
+inherit distutils-r1 ${GIT_ECLASS}
+
+DESCRIPTION="A Mercurial (or Git) based blogging engine"
+HOMEPAGE="https://github.com/rafaelmartins/blohg"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc git +mercurial test"
+
+REQUIRED_USE="|| ( git mercurial )
+	test? ( git mercurial )"
+
+RDEPEND="
+	>=dev-python/click-2.0
+	>=dev-python/docutils-0.11
+	>=dev-python/flask-0.10.1
+	>=dev-python/flask-babel-0.7
+	>=dev-python/frozen-flask-0.7
+	>=dev-python/jinja-2.5.2
+	dev-python/pyyaml
+	dev-python/setuptools
+	dev-python/pygments
+	git? ( >=dev-python/pygit2-0.21.3 )
+	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/mock )"
+
+python_prepare_all() {
+	if ! use git; then
+		rm -rf blohg/vcs_backends/git || die 'rm failed'
+	fi
+
+	if ! use mercurial; then
+		rm -rf blohg/vcs_backends/hg || die 'rm failed'
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	local ver="${PV}"
+	[[ ${PV} = *9999* ]] && ver="latest"
+
+	elog "You may want to check the upgrade notes:"
+	elog "http://docs.blohg.org/en/${ver}/upgrade/"
+}
diff --git a/www-apps/blohg/files/use-recent-libgit2.patch b/www-apps/blohg/files/use-recent-libgit2.patch
new file mode 100644
index 000000000000..decd01b78fb5
--- /dev/null
+++ b/www-apps/blohg/files/use-recent-libgit2.patch
@@ -0,0 +1,17 @@
+diff --git a/blohg/vcs_backends/git/filectx.py b/blohg/vcs_backends/git/filectx.py
+index 84f7aa3..5e20762 100644
+--- a/blohg/vcs_backends/git/filectx.py
++++ b/blohg/vcs_backends/git/filectx.py
+@@ -73,7 +73,11 @@ def _last_changeset(self):
+                                       GIT_SORT_TIME):
+             diff = self._repo.diff(head, commit)
+             for patch in diff:
+-                if patch.new_file_path == self._path:
++                try:
++                    new_file_path = patch.delta.new_file.path
++                except AttributeError:
++                    new_file_path = patch.new_file_path
++                if new_file_path == self._path:
+                     return head
+             head = commit
+ 
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
new file mode 100644
index 000000000000..bd59b4b58880
--- /dev/null
+++ b/www-apps/blohg/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		blohg is a Mercurial (or Git) based blogging engine written in Python,
+		built with the Flask micro-framework and some of his available extensions.
+		All the content of the blogs are stored inside repositories and the
+		repository history is used for build the posts and pages. blohg uses
+		Jinja2 as template engine.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<bugs-to>mailto:blohg@librelist.com</bugs-to>
+		<remote-id type="pypi">blohg</remote-id>
+	</upstream>
+	<use>
+		<flag name="git">Enable Git support</flag>
+		<flag name="mercurial">Enable Mercurial support</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/browser-config/Manifest b/www-apps/browser-config/Manifest
new file mode 100644
index 000000000000..c653469021f6
--- /dev/null
+++ b/www-apps/browser-config/Manifest
@@ -0,0 +1,5 @@
+DIST browser-config-1.1.tar.bz2 2013 SHA256 b1ea190482ebb2187d5ef3b274c714085caa97aea41529e9d12c097e21d2b425 SHA512 39205bc6c018fe61838c181d69f613eb893a358301f27c345de609e3a9c83be0797f06859f6adc1fe49873ce0876aa3e23e09745dea719c13e451fa15225614a WHIRLPOOL 9933c2683032bff08e600187c4d01b18cf2b03cf53fe5cd5ba2354949a8b9a8c384b4f85b62dfe0792733005a49678a88f471655187f8e51e2c8611382594fd1
+EBUILD browser-config-1.1.ebuild 884 SHA256 62000a84919dfd4e6300476e3e25501794e992135d5ad6e23d3a6d2024aab000 SHA512 050425131d0044b4c67c1a56e843cb6a7e78f38c88833a9b7927f99d54b0598eeed1a58b0159d1f029580e22eb7630e1487a015f609cd2b7f43ca69f02a37583 WHIRLPOOL 3b6dc31544deb85411a6e7f8c8069fb53e5d542c037a622eaaca831eae83d8d4f57195572765215f4b9264edb7c46ce53e75064910924fb5cfba5b7bd7467121
+MISC ChangeLog 2568 SHA256 4b318d9b5ecace1c9ec25a6a717b8e3c2b4f1b6ec764ba8396d493a09bd98e16 SHA512 1aa44dcc26f97cab585799edb533dfedf737afed228a3b6d6177181284cf4f7883fd7e1bcc872fd5acb4cf290da9f722077eb0a73b54255e252cc7c1d526402d WHIRLPOOL 8fa3983fabf6fd696fdb1f95c4a1db494a6dac503cadaae7a801233037e0704275b1373e7d34b025c5e8c9cc27bb2f4c0f4230c0fcad3bf57d720f9dee5b7ef8
+MISC ChangeLog-2015 1809 SHA256 49e91e6489f4c0091d209300a7d168de05a322790f19ccec57f8522a2ed6e806 SHA512 7026d3464896cd8075aae3413a463c2233522ccd194af200fe8c76ea475259ddf5de014aac62ee7246c69da4035f3de6a4ca815938b3f90178051fb5cf9a8cee WHIRLPOOL 223c6c5fc37cdb40f0b283450e1470209bf4155da742ca2917675fd4ddc5828f93987ff31d66f4f630a6454bdb4b4420633ed5f6962541a03f92cd63807dbe15
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apps/browser-config/browser-config-1.1.ebuild b/www-apps/browser-config/browser-config-1.1.ebuild
new file mode 100644
index 000000000000..4560d62ee0ea
--- /dev/null
+++ b/www-apps/browser-config/browser-config-1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	into /usr
+	dobin browser-config
+	dosym /usr/bin/browser-config /usr/bin/runbrowser
+	insinto /usr/share/browser-config
+	doins definitions/*
+}
+
+pkg_postinst() {
+	elog "Please run browser-config -b <browser> -m <method>"
+	elog "If run as root, it will be global, if run as a user it will be for"
+	elog "that user only."
+	elog
+	elog "Please see browser-config -h for info on available browsers/methods"
+	elog
+	elog "You may then tell your applications to use either 'runbrowser' or"
+	elog "'browser-config' as a browser."
+	elog
+}
diff --git a/www-apps/browser-config/metadata.xml b/www-apps/browser-config/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apps/browser-config/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
new file mode 100644
index 000000000000..e5a08e4b2515
--- /dev/null
+++ b/www-apps/bugzilla/Manifest
@@ -0,0 +1,13 @@
+AUX bugzilla-queue.confd 94 SHA256 59e1835f1039035c7eadcbf61224d38eae5c25a98c463c9dfb617fa2a148b603 SHA512 ea43eb5a3ace6bede21f9fc96c9560fbb6e24180303feeb717202715f23e785c923838e32730988c4a166a78af529c9535ca47356b31da8cd2e434ea4802b42d WHIRLPOOL 24c0a294e72636ab44c39eebe149eaf2e3529c2d27f1a327ca9257e2aae83413d1ae93b6c136583a345acb81a85ed62b250642dda4a7bd7a9d19125ce7769c6b
+AUX bugzilla-queue.initd 1253 SHA256 881e378c0d3b9b5d89645de94a157dbcf427bc57201898871d8c44138dcc716f SHA512 9e7277c06a07a15f2470b7ea42529c309c32783f192b0703d6b7ea6e1078a116cd2b220413a059bad2c7f5d362876a1207a2f9345c5dee9e28c8175055297e64 WHIRLPOOL ce1a0685641d06be23795e3ffc6fb9a44dbadbfa8bb8d66fa9982e86289aefdb306aa27c1f098c795960f501e1a2df588469f9ac1c12310110a23f5669d3af76
+AUX bugzilla.cron.daily 115 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241 SHA512 12703cd0f18172ebae4ce57b9ad45c70388a2355ab65751aded718535711be3a2ae45099e5c6f8f488397b5a9ba54ae75c680413cd845d64a5747015713cd2c1 WHIRLPOOL 3b8de5c89991f1573ce217b94eb5e874301bd78daf238169fe0c6183a6b131bf627a4e7e5f437408ffcc13448aacd076199fc237623a380f446bc50b43463bb5
+AUX bugzilla.cron.tab 49 SHA256 bb66591cd659ae93b10b2b01bcf698a8b06b0d1c45fc4b996cce3759ae483c50 SHA512 e864e543ca9c3526fea765aadfba7d2194035f27b0855b584a7253d82d0ec85266320941d3d1ce12d11d16fb0bd258ddf4678ad8e97d86790c6ab31ad367cc67 WHIRLPOOL 72235540031faa770303957174003e4f97a0b5a2dad7cc5bde9621ac4218dfa291b0abb8392a09cc85823f2281ed5a650b2df934458a5e5d4841a66db61df4c8
+AUX postinstall-en.txt 670 SHA256 badb81c194b55cf5d34511f9b94fcdd09dc0830572bb3952d01a5d2842b43fb4 SHA512 2e30fb234d6d86372e7f8b6dd48050a5061fbccfe8420212ae6cd8c4dfc07442de47e2f3e90f8690f4b12ca7702524bd90b4b8fbfe18e8659a04ca11e876a3fc WHIRLPOOL ef3a3a9301d4f38ce42cd723ea41c896aeaaffc551e8267fc2d2d2605a404c0db32fcb6d5348c76d2ac93c366f2963ece8fb0cbd1db3aade0d0834e0527e5c4c
+AUX reconfig 349 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50 SHA512 bde5c8b728d9f40a8c7b6ff4df683b415c82729ccb95f3652500f6b0274bf7e2471ced0480813765d9c682f43d7de3baac7ab5b27a9a25525393c5c13270b6b0 WHIRLPOOL 0c4d6201aacef9676051393a8380d729001c9b390dfb3609ae588de6b0dabe15258b8994a16036258395953202dbc10a6b5e1e6e2ebd0da4a7775c5409d067ca
+DIST bugzilla-4.4.12.tar.gz 4931062 SHA256 c90049f05df653c694603642a52bc41b4fb439c592547159db0a209064d9f2f2 SHA512 51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548 WHIRLPOOL bbf0c4ccf0ae22918d69a67b67d5b2d60004b26e73e2bd83d8cbaf07d16fbc092d6630beabadcb1e559b18e2ecbb8e2df30808b6908271856e5f3ad13c3c6945
+DIST bugzilla-5.0.3.tar.gz 4069689 SHA256 594d1d6813f4731b71fbbf3809d4d7e3511f1cd73e12fcad9f498319ff2fcadc SHA512 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46 WHIRLPOOL 6e7f57cad6bc3ff76f19624f0b288577054f7c4b9bcbee38aa1d3b802650d07fa9d8de95d63244b34076796b9970ee989b6cdcd191aab9deb38927bf757d864d
+EBUILD bugzilla-4.4.12-r1.ebuild 2833 SHA256 33589954f4e0faa9c74f1df8cf6e95cc903627acbcf1ef841078414d2075c289 SHA512 a0a259e4071f066f0dd22bb64e7b2168835f558be7ae4d6c81c5a9bf4c68eb854087acc2acb5b229d1402b2c133469d37e35ae6d1cfc4518120e78259119bf3b WHIRLPOOL 20f6e5f185eadefc275d1d797a241e4309da87e39d119dc87a03d67eb46ab1e6287d004bfc1747527024416532925e3d3a643469dfb6e0858d68c8c9b53f7dd3
+EBUILD bugzilla-5.0.3-r1.ebuild 3011 SHA256 8dcfd663957cb3318d013a63e1694283d48de48ff1666eca1e01229bf2881e94 SHA512 fbe347b26726713b330ea313d2ae32b695f20f053ae5757d1704b2d80a72633b9c5683e8d01e45c3f5b77815ab97cc6ccd59030b2755b17729abd26a7012c0d3 WHIRLPOOL 38dae0c317d1d3a2633368246f59265ebfa4a5de76aa7eb80642300f5dbdd2e64e1d973f460dca55754232afff4f32576c540fe837e37b7828b4283d51b25003
+MISC ChangeLog 6977 SHA256 b76bb98acc5c6b70a30f0b53f7a459c902908e3ab1d9528a824c8c902c348f6b SHA512 cd2c9cd61d93b44b1f65a4d1f6580e4214f9be26f6c31063340de34f34aa90ca63cd0af1883b2c5b79d5b618ccbb59488ad93404124d4c8aa4c00708ff1832d4 WHIRLPOOL 18d0c701a36d8c87f4801e6190e949ba8c68f90b40eb76cacf6f79a5a04a56c18f334693f82909f07a9e954cd40dd3179f7134f0ba01688a1a033057faef8974
+MISC ChangeLog-2015 39896 SHA256 0fec75594ca3c49167db9a216101e4f179d8e0a8552c7a33a74d373969980f05 SHA512 365bcd5b6c2d948db5cf0cee5157dda17b1d3ba4de87d9309cd9c454e72ecd29f0953b02314ee179c98a6e92720b42b137351304e50b737a6953685c6c809d70 WHIRLPOOL c182ae7f3c4529abebdf35bf12b58c5ea82cce587e3e48cce3c46ba4d63e04c8d1c5fccda1d314c1101a5a81e9d286f2cdc2abe91d7398e60e8870aad029710b
+MISC metadata.xml 392 SHA256 a72a43716a4f6d83ef93dcddc2169a68caccb8335f99ece6cf9073650bfdcbef SHA512 e0893f3ce807576e90bdddfbf8b19bd32665fa40b288d01126ecbc402d2867b512f26afb5a62e8ed3bd0fa9c749a7f0e2e90547db5f1078274b4e0653f1d0fc1 WHIRLPOOL c97948a36966b023eba93009c0ff213ab4e7c1f5601047e90b5a52d15c334c670549ca031d1df94f1a95ea2caed8ac7d7f51058bc2bf07f5a3a839361ef07649
diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild b/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
new file mode 100644
index 000000000000..1e10e2a37f67
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp depend.apache eutils
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
+HOMEPAGE="https://www.bugzilla.org"
+
+LICENSE="MPL-2.0"
+KEYWORDS="amd64 x86"
+
+IUSE="modperl extras graphviz mysql postgres sqlite test"
+REQUIRED_USE=" || ( mysql postgres sqlite )"
+
+COMMON_DEPS="
+	>=dev-lang/perl-5.10.1
+	>=dev-perl/CGI-3.510.0
+	virtual/perl-Digest-SHA
+	>=dev-perl/DateTime-0.500.0
+	>=dev-perl/DateTime-TimeZone-0.710.0
+	>=dev-perl/DBI-1.601.0
+	>=dev-perl/Template-Toolkit-2.22
+	>=dev-perl/Email-Send-2.40.0
+	>=dev-perl/Email-MIME-1.904.0
+	dev-perl/URI
+	>=dev-perl/List-MoreUtils-0.329.0
+	dev-perl/Math-Random-ISAAC
+"
+
+DEPEND="test? ( dev-perl/Pod-Coverage${COMMON_DEPS} )"
+RDEPEND="
+	virtual/httpd-cgi
+	${COMMON_DEPS}
+	postgres? ( >=dev-perl/DBD-Pg-1.49.0 )
+	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
+	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
+	extras? (
+		>=dev-perl/GD-2.35[png,truetype]
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427.0
+		dev-perl/libwww-perl
+		>=dev-perl/PatchReader-0.9.6
+		dev-perl/perl-ldap
+		dev-perl/RadiusPerl
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712.0
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0.0
+		dev-perl/Test-Taint
+		>=dev-perl/HTML-Parser-3.67.0
+		dev-perl/HTML-Scrubber
+		>=virtual/perl-Encode-2.21.0
+		dev-perl/Encode-Detect
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
+		dev-perl/TheSchwartz
+		dev-perl/Daemon-Generic
+		dev-perl/File-MimeInfo
+		virtual/imagemagick-tools[perl]
+		dev-perl/MIME-tools
+	)
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.96.0
+	)
+	graphviz? ( media-gfx/graphviz )
+"
+want_apache modperl
+need_httpd_cgi
+
+pkg_setup() {
+	depend.apache_pkg_setup modperl
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# Get a rid of the bzr files
+	rm -r .bzr* || die
+
+	# Remove bundled perl modules
+	rm -r lib/ || die
+	eapply_user
+}
+
+src_test() {
+	perl runtests.pl || die
+}
+
+src_install () {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	doins "${FILESDIR}"/bugzilla.cron.{daily,tab}
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	if use extras; then
+		newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue
+		newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
+	fi
+
+	# bug #124282
+	for f in "${D}${MY_HTDOCSDIR}"/*.cgi ; do
+	        fperms +x "${f#${D}}"
+	done
+
+	fperms u+x "${MY_HTDOCSDIR}"/jobqueue.pl
+
+	# configuration must be executable
+	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
+
+	# bug 487476
+	mkdir "${D}${MY_HTDOCSDIR}"/lib || die
+}
diff --git a/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild b/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
new file mode 100644
index 000000000000..7aa733d0f136
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp depend.apache eutils
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
+HOMEPAGE="https://www.bugzilla.org"
+
+LICENSE="MPL-2.0"
+KEYWORDS="amd64 x86"
+
+IUSE="modperl extras graphviz mysql postgres sqlite test"
+REQUIRED_USE=" || ( mysql postgres sqlite )"
+
+# sorting is identical to upstream MYMETA.json, please dont change
+COMMON_DEPS="
+	dev-lang/perl
+	>=dev-perl/CGI-3.510.0
+	>=dev-perl/DBI-1.614.0
+	>=dev-perl/TimeDate-2.230.0
+	>=dev-perl/DateTime-0.750.0
+	>=dev-perl/DateTime-TimeZone-1.640.0
+	virtual/perl-Digest-SHA
+	>=dev-perl/Email-MIME-1.904.0
+	>=dev-perl/Email-Sender-1.300.11
+	>=dev-perl/File-Slurp-9999.130.0
+	>=dev-perl/JSON-XS-2.10.0
+	>=dev-perl/List-MoreUtils-0.320.0
+	>=dev-perl/Math-Random-ISAAC-1.0.1
+	>=dev-perl/Template-Toolkit-2.240.0
+	>=dev-perl/URI-1.550.0
+"
+
+DEPEND="test? ( dev-perl/Pod-Coverage ${COMMON_DEPS} )"
+RDEPEND="
+	virtual/httpd-cgi
+	${COMMON_DEPS}
+	postgres? ( >=dev-perl/DBD-Pg-1.49 )
+	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
+	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
+	extras? (
+		>=dev-perl/GD-2.350.0[png,truetype]
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427.0
+		dev-perl/libwww-perl
+		>=dev-perl/PatchReader-0.9.6
+		dev-perl/perl-ldap
+		dev-perl/RadiusPerl
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712.0
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0.0
+		dev-perl/Test-Taint
+		>=dev-perl/HTML-Parser-3.670.0
+		dev-perl/HTML-Scrubber
+		>=virtual/perl-Encode-2.210.0
+		dev-perl/Encode-Detect
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
+		dev-perl/TheSchwartz
+		dev-perl/Daemon-Generic
+		dev-perl/File-MimeInfo
+		virtual/imagemagick-tools[perl]
+		dev-perl/MIME-tools
+	)
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.960.0
+	)
+	graphviz? ( media-gfx/graphviz )
+"
+want_apache modperl
+need_httpd_cgi
+
+pkg_setup() {
+	depend.apache_pkg_setup modperl
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# Get a rid of the bzr files
+	rm -r .bzr* || die
+
+	# Remove bundled perl modules
+	rm -r lib/ || die
+	eapply_user
+}
+
+src_test() {
+	perl runtests.pl || die
+}
+
+src_install () {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	doins "${FILESDIR}"/bugzilla.cron.{daily,tab}
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	if use extras; then
+		newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue
+		newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
+	fi
+
+	# bug #124282
+	for f in "${D}${MY_HTDOCSDIR}"/*.cgi ; do
+	        fperms +x "${f#${D}}"
+	done
+
+	fperms u+x "${MY_HTDOCSDIR}"/jobqueue.pl
+
+	# configuration must be executable
+	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
+
+	# bug 487476
+	mkdir "${D}${MY_HTDOCSDIR}"/lib || die
+}
diff --git a/www-apps/bugzilla/files/bugzilla-queue.confd b/www-apps/bugzilla/files/bugzilla-queue.confd
new file mode 100644
index 000000000000..2eec355a0986
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-queue.confd
@@ -0,0 +1,4 @@
+#JOBQUEUE_USER=bugzilla
+#JOBQUEUE_GROUP=bugzilla
+
+JOBQUEUE_PATH=/var/www/bugzilla/jobqueue.pl
diff --git a/www-apps/bugzilla/files/bugzilla-queue.initd b/www-apps/bugzilla/files/bugzilla-queue.initd
new file mode 100644
index 000000000000..800793862f13
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-queue.initd
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/var/run/bugzilla/${SVCNAME}.pid"
+JOBQUEUE_USER=${JOBQUEUE_USER:-root}
+JOBQUEUE_GROUP=${JOBQUEUE_GROUP:-root}
+
+checkconfig() {
+	[[ -z "${JOBQUEUE_USER}" || -z "$(getent passwd ${JOBQUEUE_USER})" ]] && { eerror "JOBQUEUE_USER not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_GROUP}" || -z "$(getent group ${JOBQUEUE_GROUP})" ]] && { eerror "JOBQUEUE_GROUP not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_PATH}" && ! -x "${JOBQUEUE_PATH}" ]] && { eerror "JOBQUEUE_PATH not set or not executable"; return 1; }
+	return 0
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	checkconfig || return 1
+
+	piddir="${PIDFILE%/*}"
+	if [ ! -d "${piddir}" ]; then
+		checkpath -q -d -o $JOBQUEUE_USER:$JOBQUEUE_GROUP -m 0770 "${piddir}" || {
+			eend 1
+			return 1
+		}
+	fi
+
+	start-stop-daemon --start --pidfile $PIDFILE --user $JOBQUEUE_USER --group $JOBQUEUE_GROUP \
+		--exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME start 1>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	checkconfig || return 1
+	start-stop-daemon --pidfile $PIDFILE --stop --exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME stop
+	eend $?
+}
diff --git a/www-apps/bugzilla/files/bugzilla.cron.daily b/www-apps/bugzilla/files/bugzilla.cron.daily
new file mode 100644
index 000000000000..e3e86589891d
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla.cron.daily
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd /var/www/bugzilla/
+./collectstats.pl
+./whineatnews.pl
+echo "*** Bugzilla nighlty flush has done! ***"
diff --git a/www-apps/bugzilla/files/bugzilla.cron.tab b/www-apps/bugzilla/files/bugzilla.cron.tab
new file mode 100644
index 000000000000..3cf2d4a66240
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla.cron.tab
@@ -0,0 +1 @@
+0 0  * * * /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/postinstall-en.txt b/www-apps/bugzilla/files/postinstall-en.txt
new file mode 100644
index 000000000000..9b6a8798a640
--- /dev/null
+++ b/www-apps/bugzilla/files/postinstall-en.txt
@@ -0,0 +1,13 @@
+0. Bugzilla has been installed into ${MY_INSTALLDIR}
+
+1. To finish the installation, please read
+   http://www.bugzilla.org/docs/${MY_PB}/en/html/installing-bugzilla.html
+   You will need to run ${MY_INSTALLDIR}/checksetup.pl
+
+2. Please read the Release Notes, especially if you are upgrading:
+   http://www.bugzilla.org/releases/${MY_PB}/release-notes.html
+
+3. Please note that Apache2 sets AllowOverride None by default. You may have
+   to edit it to process the .htaccess file provided by Bugzilla. Please see
+   https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
+   http://www.bugzilla.org/docs/${MY_PB}/en/html/configuration.html#http for more info.
diff --git a/www-apps/bugzilla/files/reconfig b/www-apps/bugzilla/files/reconfig
new file mode 100644
index 000000000000..71b0acea2585
--- /dev/null
+++ b/www-apps/bugzilla/files/reconfig
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+FILE="bugzilla.cron.daily bugzilla.cron.tab"
+
+function die ()
+{
+	echo
+	echo "***"
+	echo "*** Fatal error: $*"
+	echo "***"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
+	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
+else
+	echo "done."
+fi
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
new file mode 100644
index 000000000000..2901e955608a
--- /dev/null
+++ b/www-apps/bugzilla/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Optional Perl modules</flag>
+		<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/cgisysinfo/Manifest b/www-apps/cgisysinfo/Manifest
new file mode 100644
index 000000000000..164c56d65d3b
--- /dev/null
+++ b/www-apps/cgisysinfo/Manifest
@@ -0,0 +1,5 @@
+DIST cgisysinfo-0.4.1.tar.bz2 262016 SHA256 6284ad1b64a34827dc0ee4e7c2125ec843723b93cdf139e0d95215335e7533b8 SHA512 fd14339ea346f70c9b5632ae861ba006b70c5ff5849ebbd3b32bcedaf0a5865d411d6d0f251362baea515f0d64639d544779c3569574a710ed4967c9fa770909 WHIRLPOOL c651522b98b2bdef6c597b0842f39256450cb8b1d69e68e9896b56ab5dc5fd0d51c2057eb3b2f4d0a42e63fb5411ff86095d8362dd9a1711219ffbdccd1c8c7a
+EBUILD cgisysinfo-0.4.1.ebuild 751 SHA256 c005f493e9215cb70c8c937efa80b24f96add428f023aa1f1dd154e5a7985578 SHA512 5ffa459ff69d3325de5c3ab1b8575b0c6904f4f6825b30a1596e45bfdc24d58ff2cd38c705427fadc8d53614a5336461131b190ce41bc3b6474322039f124055 WHIRLPOOL 9e5bb8f2da310935a8b0e8317429c460d61ddf05f62e5d32ae4000c9fc08125ca884f3963dab0119a6772334708178a6eb3656edae84f21aeaa69cb50feee0b5
+MISC ChangeLog 2578 SHA256 da1bb87af0e72549126b912bd060a45cd6aed8e70312505b94769b66c0029b45 SHA512 f2a003a6a8e4b8672ae0f90031e29cb85fe37ae68157c573c759d4d0464452447bd310ab75f85872cf22d0e8c60e4998edce99c649d23790adf527cff6c93210 WHIRLPOOL d4e524810ff241d0eb97ae94c856c854cd0a96a6921ca34522732cb3f8240e05b22d6cbda232675d11092de366d2de4d8274d57446d19648fa181106575c3381
+MISC ChangeLog-2015 972 SHA256 600f528cdde6f22882f3c1a732634b1bdb4c3ed6902cba8a7b0d63e6a08d7c0b SHA512 3191d8f9bd46175294e55a4b3f1702f24b5244e0994890d552f6e3ea1244fbefd71c4c9cf99a2e8e5ca364e8850838f8c34ab46a02d120e77997526cf7c247b1 WHIRLPOOL 5b45feb5d9fc2e78782e56a6b9ead6ef094f097959ca95bb3a5604fe4ea9483a3a37434a97fc91f9a6a6d32d9930f9fc8578a64b87615fd6e9b93c10439a40e6
+MISC metadata.xml 564 SHA256 8ea52adbb6befa84850571fcc301dd5c04275181630095a97f38d56745658688 SHA512 de9b1595b80be8603d6496c2159c787319148aeef5b6b1d0216bc562bf42d244bf4fe952a4e9c992fcec2159d33e86e2c4719de3bcaaa790ee284b0b0f90cacb WHIRLPOOL 42abeacaa4b9a838e7f6b2ca97d32990d57498e86dc88165a0a7cb00c7f91bf1c254bdf977472ad9593cb6c23984b69426328176fe868fa55400661b68f6924b
diff --git a/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild b/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
new file mode 100644
index 000000000000..f14902a87ecc
--- /dev/null
+++ b/www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	WANT_AUTOCONF="2.5"
+	WANT_AUTOMAKE="1.10"
+	inherit autotools mercurial
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/cgisysinfo/"
+	KEYWORDS=""
+else
+	SRC_URI="http://distfiles.rafaelmartins.eng.br/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small cgi utility to show basic system information"
+HOMEPAGE="http://projects.rafaelmartins.eng.br/cgisysinfo"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="fastcgi"
+
+DEPEND="fastcgi? ( dev-libs/fcgi )"
+RDEPEND="${DEPEND}"
+
+DOCS="README AUTHORS NEWS"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable fastcgi)
+}
diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
new file mode 100644
index 000000000000..a20bd0a500ad
--- /dev/null
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+  <longdescription lang="en">
+    cgisysinfo is a small CGI utility to show basic system information on Linux
+	machines.
+
+	cgisysinfo is useful for machines that run a webserver but not PHP, and was
+	tested with nginx + fcgiwrap. It should works with any CGI-capable web
+	server.
+  </longdescription>
+</pkgmetadata>
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
new file mode 100644
index 000000000000..02b684b99779
--- /dev/null
+++ b/www-apps/cgit/Manifest
@@ -0,0 +1,12 @@
+AUX cgitrc 2632 SHA256 b2870479f67b1e357283cec08e848aec5ab410514fc14883f325c0d833efe626 SHA512 e54745599d14b595d83aa179dfcaa704d883c3513c77ff2c4eeb8d98a4c7955d9dd94b595b6a60382e8f9a3eb5460886395f858a49e888a8004a535efb759281 WHIRLPOOL 01c803a9798c6435767affbce855832aecc54a8503b6a8af270d58aab1ed7ac4c3df293f9989854a9f4cfaa4d54ea33ddb918c07cb17edcbcf28a90c9f83c763
+AUX postinstall-en.txt 1844 SHA256 2bfadbe531386c9f2b9fd6b346c9542dd367f86f1ffc1be1a43d9aa182a0118b SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc WHIRLPOOL d008d1fd56bd5410fe705cd38697dc66bf9e273052aea16a1ba2eaf91b0c2a400ac1d12abc9884cbce7481c5b2e0cab8a15c29489f8f97092f3655637e9b8f19
+DIST cgit-0.12.tar.xz 85152 SHA256 2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7 SHA512 59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34 WHIRLPOOL f240e353545786cb90a328d2f3533070ff775cc192a915dd4e6cd9f9d1fa1be304a1412a2a63d45ed036f93ddc310d35c3884b1dfea40ad202a4bc5d69661e64
+DIST cgit-1.1.tar.xz 86268 SHA256 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 SHA512 8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051 WHIRLPOOL b1df953aa1bf43f4fb0900e03ecf23c0dcddc743955efc6b3428cf7fe20a2babe8c5a2676e13e3bce37fed13fcf60c70afb2fe54049a17b4c74f2e8cc7fe621b
+DIST git-2.10.2.tar.xz 4106108 SHA256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a WHIRLPOOL 808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6
+DIST git-2.7.0.tar.xz 3861524 SHA256 fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d SHA512 e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3 WHIRLPOOL e0dc8071ebc4e0558a2f2b9d8b32d840f4278e893777367029e84a57bf52d1d00eadb778a3e6df70c93de8cb754b94ff985ae6025ff98d6276629d7d3318aa19
+EBUILD cgit-0.12.ebuild 2244 SHA256 d28f4b82056902ec224b70923aebea3823a21604be6407dbad176a5382fc8e1b SHA512 728d6d98fe8d732ebb5b94de016c4933212a9acee6e7838af12be8611e157298b77e5c0ad753605a86bbd98c4bf2222b120853980f419b1a53f786449d79c31a WHIRLPOOL abd8ecb5c70cc8ec0e99fc542b9af9259cfd6b497a9f70ded7d2e0f876b8b79b2065aa905dc5c4b26123d87c9c2a37c12d46900d509cecd5e07d5ceb36d82602
+EBUILD cgit-1.1.ebuild 2247 SHA256 ca3daa3a88c1a1d2a7ac49fd43cf6d7b87fe087fa4f0802ffe4dc0556b35b4c1 SHA512 ac680f3bcbbca340ab2f58feb90fa782a7652dff0ba9e5c9a029312c9986980ec6114426fcec3b77f6cc57ca755bcfe98218ed3601e820c7c1a570bcf6e8819e WHIRLPOOL 4303eabc67bfb6807ca4a1d69b82fcf651865c42ed5ef762ce7631c49d3e13290e5f41e3996ddea73eff4d2aff20ae24d07a11d62be539c9c7991f2708b56708
+EBUILD cgit-9999.ebuild 2161 SHA256 6716741e65ed0291847ae95c826c820e4f21ec0bc44e6522b8e2a063c98e950c SHA512 a2a85cb6d1a692f11a591dc9a0a91e301f949692a3e1a3eb493951affafcac83e21ab7bed354f5c04acbb0fc6112987e40ebd1ffd1d74260583680b7e272e0dd WHIRLPOOL f788552d8e95102176ad15c97b2486f4efb5918eb10f8db4c8c4b4d633d21af291bb9a07199b765639b4e9956d3646e5433812a84ed0c1803262329f5e2721dc
+MISC ChangeLog 3632 SHA256 6e7ae8922fffdabc9e222839e1295de96d9b5f366be1f58ad66b8c363602961b SHA512 77661a7066d4614d890819e69674b31f73e6b699a21879b338f1202afdabbe298205d261366a4d48ea47858e88955f0509638df71ef0794dfb6a74f25c413f2d WHIRLPOOL 44c76e24261e514116e90641f253b69ad17eff96e64ce81b4a879383c284f5cfc0f10ddd79699f053592486f33ba429791c99fe7967cdb32e15b595f27710649
+MISC ChangeLog-2015 5420 SHA256 8ef94660178fa66202d09d06a4984f371d62b18204acd0b0134be0423d1f3194 SHA512 4d732d05ffce8640fd3c3466d929387a32f7f470d65dd3fd74dcdccf2e4f192e758f3f47cdf3bdb22b3b5fd7189324c5651e432004e368fd8ae294fa7fd50cb4 WHIRLPOOL d4b67ae47a5eebeaceba7de8830d96ef9ed7f7a0c6026ca9ade579ae50d9a823ddc758868e3408646e3add8d02bbad909189b3ee2d706151f4386b63483bb9f7
+MISC metadata.xml 785 SHA256 ff52ae7bfcbf653954eb06b4b852324ecd8deda0d128dc66ec5906886aeff203 SHA512 dd9913901422f70df64638a4e8244da670ac9708ea8a0027b2e6aab5b960e27c117f2c486e6ebede40f8c5f475eec054a2896c08166f38113e1ee3ab97694d90 WHIRLPOOL f534b0e6b7601f7ceccef1c2e173bfa303c50ca4f151a806757d79bddc2be1cd26fa1a0a2a6d4b77b0e104e0941b8da945dc4450b76c5baeec2f5f26fa9b310e
diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
new file mode 100644
index 000000000000..443d7f856dcb
--- /dev/null
+++ b/www-apps/cgit/cgit-0.12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.7.0"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="http://git.zx2c4.com/cgit/about"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
+	http://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc +highlight +lua +jit"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	dev-libs/openssl:0
+	virtual/httpd-cgi
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+	!<www-apps/cgit-0.8.3.3
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser "${PN}"
+}
+
+src_prepare() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	use doc && emake V=1 doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgit/cgit-1.1.ebuild b/www-apps/cgit/cgit-1.1.ebuild
new file mode 100644
index 000000000000..cd69e657df24
--- /dev/null
+++ b/www-apps/cgit/cgit-1.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.10.2"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="http://git.zx2c4.com/cgit/about"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
+	http://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +highlight +lua +jit"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	dev-libs/openssl:0
+	virtual/httpd-cgi
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+	!<www-apps/cgit-0.8.3.3
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser "${PN}"
+}
+
+src_prepare() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	use doc && emake V=1 doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
new file mode 100644
index 000000000000..528f1032f17b
--- /dev/null
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs git-2
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="http://git.zx2c4.com/cgit/about"
+SRC_URI=""
+EGIT_REPO_URI="https://git.zx2c4.com/cgit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc +highlight +lua +jit"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	dev-libs/openssl:0
+	virtual/httpd-cgi
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+	!<www-apps/cgit-0.8.3.3
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser "${PN}"
+}
+
+src_prepare() {
+	git submodule init || die
+	git submodule update || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	use doc && emake V=1 doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgit/files/cgitrc b/www-apps/cgit/files/cgitrc
new file mode 100644
index 000000000000..a1d9f2f572b9
--- /dev/null
+++ b/www-apps/cgit/files/cgitrc
@@ -0,0 +1,130 @@
+# Enable caching of up to 1000 output entriess
+#cache-size=1000
+
+
+# Specify some default clone prefixes
+#clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
+
+# Specify the css url
+#css=/css/cgit.css
+
+
+# Show extra links for each repository on the index page
+#enable-index-links=1
+
+
+# Enable ASCII art commit history graph on the log pages
+#enable-commit-graph=1
+
+
+# Show number of affected files per commit on the log pages
+#enable-log-filecount=1
+
+
+# Show number of added/removed lines per commit on the log pages
+#enable-log-linecount=1
+
+
+# Add a cgit favicon
+#favicon=/favicon.ico
+
+
+# Use a custom logo
+#logo=/img/mylogo.png
+
+
+# Enable statistics per week, month and quarter
+#max-stats=quarter
+
+
+# Set the title and heading of the repository index page
+#root-title=foobar.com git repositories
+
+
+# Set a subheading for the repository index page
+#root-desc=tracking the foobar development
+
+
+# Include some more info about foobar.com on the index page
+#root-readme=/var/www/htdocs/about.html
+
+
+# Allow download of tar.gz, tar.bz2 and zip-files
+#snapshots=tar.gz tar.bz2 zip
+
+
+##
+## List of common mimetypes
+##
+
+# Instead of defining mime types ourselves, grab it from etc
+#mimetype-file=/etc/mime.types
+
+# Or do it manually here
+#mimetype.gif=image/gif
+#mimetype.html=text/html
+#mimetype.jpg=image/jpeg
+#mimetype.jpeg=image/jpeg
+#mimetype.pdf=application/pdf
+#mimetype.png=image/png
+#mimetype.svg=image/svg+xml
+
+
+##
+## List of repositories.
+## PS: Any repositories listed when section is unset will not be
+##     displayed under a section heading
+## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
+##      and included like this:
+##        include=/etc/cgitrepos
+##
+
+
+#repo.url=foo
+#repo.path=/pub/git/foo.git
+#repo.desc=the master foo repository
+#repo.owner=fooman@foobar.com
+#repo.readme=info/web/about.html
+
+
+#repo.url=bar
+#repo.path=/pub/git/bar.git
+#repo.desc=the bars for your foo
+#repo.owner=barman@foobar.com
+#repo.readme=info/web/about.html
+
+
+# The next repositories will be displayed under the 'extras' heading
+#section=extras
+
+
+#repo.url=baz
+#repo.path=/pub/git/baz.git
+#repo.desc=a set of extensions for bar users
+
+#repo.url=wiz
+#repo.path=/pub/git/wiz.git
+#repo.desc=the wizard of foo
+
+
+# Add some mirrored repositories
+#section=mirrors
+
+
+#repo.url=git
+#repo.path=/pub/git/git.git
+#repo.desc=the dscm
+
+
+#repo.url=linux
+#repo.path=/pub/git/linux.git
+#repo.desc=the kernel
+
+# Disable adhoc downloads of this repo
+#repo.snapshots=0
+
+# Disable line-counts for this repo
+#repo.enable-log-linecount=0
+
+# Restrict the max statistics period for this repo
+#repo.max-stats=month
diff --git a/www-apps/cgit/files/postinstall-en.txt b/www-apps/cgit/files/postinstall-en.txt
new file mode 100644
index 000000000000..b164123f0196
--- /dev/null
+++ b/www-apps/cgit/files/postinstall-en.txt
@@ -0,0 +1,45 @@
+There is a few variants of configuration:
+1) Via global config file: /etc/cgitrc
+2) Or via local config file, shipped in ./conf dir into webapp_dir. It has to
+   be explicitly specified with CGIT_CONFIG env variable in your web server
+   configuration.
+
+If you would like to update the list of git repositories in cgit automatically,
+you might consider adding something similar to the following as a cronjob:
+
+"${MY_CGIBINDIR}/cgit.cgi --scan-tree=/git/repo-parent-path > /etc/cgit-repos"
+
+Then add "include=/etc/cgit-repos" in /etc/cgitrc. This way it's simpler and
+more convenient. You won't need to update your cgitrc every time you add a new
+repository.
+
+===============================================================================
+                              Apache HowTo
+===============================================================================
+
+With a default apache vhost config you can now access your repository at
+http://<vhostname>/cgi-bin/cgit.cgi/
+
+If you wish to access your repository starting from the root and don't want
+'cgi-bin/cgit.cgi' to be invisible, 2 things are needed.
+
+In your apache vhost configuration file for your domain, add the following
+rewrite rules to your
+<Directory /var/www/<vhostname>/htdocs> section.
+<snip>
+        RewriteEngine On
+        # Redirect all non-existant urls to cgit
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule ^.* /cgi-bin/cgit.cgi/$0 [L,PT]
+
+        # Redirect the empty url to cgit
+        RewriteRule ^$ /cgi-bin/cgit.cgi/ [L,PT]
+<snip>
+
+To make cgit create the correct URL's internally add to /etc/cgitrc (or your
+local config file)
+Enable virtual-root=/
+
+After these rules, you can now access cgit via http://<vhostname>/ to get the
+listing, and http://<vhostname>/repository to go directly to repository.
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
new file mode 100644
index 000000000000..8839288399a0
--- /dev/null
+++ b/www-apps/cgit/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<longdescription lang="en">
+	cgit - cgi for git
+
+	This is an attempt to create a fast web interface for the git scm, using a
+	builtin cache to decrease server io-pressure.
+	</longdescription>
+	<use>
+		<flag name="highlight">Enable source code highlighting</flag>
+		<flag name="lua">Enable support for Lua scripting</flag>
+		<flag name="jit">If the lua flag is enabled, jit uses LuaJIT instead of vanilla Lua</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
new file mode 100644
index 000000000000..a55122325a3c
--- /dev/null
+++ b/www-apps/chromedriver-bin/Manifest
@@ -0,0 +1,6 @@
+DIST chromedriver_linux32.zip 3154004 SHA256 3aca7babed99aec08a5eda717822532e9db81548b444d3aed53c4d8d2e3b19ab SHA512 36d853050c58bfc79e3b04e14f9c00cb3b5dad42cbc6a7433b06ef841184443750d714d7a5c80528e237831adf68ddb3f24540b9f19e6601e9e483e57f50cc7b WHIRLPOOL 308f6c5e5cd9bc6148e1c92172bafce20739908fe7d2a3a40159fca104a32250d91496bcb0540b1195be3bfe7697792daa8ed1187ee6da71e7cc8ee972407b0a
+DIST chromedriver_linux64.zip 3116161 SHA256 0c01b05276da98f203dc7eb4236c2ee7fe799b432734e088549bd0aadc71958e SHA512 ae1fa127560af1b8419c273f9e23253a19423276294cb920c87b0c209134244315c4d3878b9025589471d72056abb0087ef897f684e28d63b5fc71d628dd1791 WHIRLPOOL 01580ed5cdaab1f9be8068e1533f0518ca854d73afc4ce7251bcc32719e797e8a748824126ea833fef079c2d6306efd611f7b948bf609828f77767d9b81d7306
+EBUILD chromedriver-bin-2.24.ebuild 582 SHA256 106db913959b1c9025fa559c76fc69d1ca6a9076707e1bff8b3b578d3429d2d4 SHA512 b36ee542a2d76f5a10c33dfa18cf8ad1072aa7f917f22addb9ad56dd1e7a7739734c9573e1a102e19c77e405c66c4e549bb05b2f60653eb56aafdb3ba85e81e1 WHIRLPOOL f58d4e9d018734ffbef882981e9a7e7b1bc6b8f2ce7ebfe6d63bf3c7bf557451e7e1a9af04d06e75c0b5eb6fde0f8183e7401ecc5795d2bd1931b5a7968a4652
+EBUILD chromedriver-bin-2.30.ebuild 582 SHA256 106db913959b1c9025fa559c76fc69d1ca6a9076707e1bff8b3b578d3429d2d4 SHA512 b36ee542a2d76f5a10c33dfa18cf8ad1072aa7f917f22addb9ad56dd1e7a7739734c9573e1a102e19c77e405c66c4e549bb05b2f60653eb56aafdb3ba85e81e1 WHIRLPOOL f58d4e9d018734ffbef882981e9a7e7b1bc6b8f2ce7ebfe6d63bf3c7bf557451e7e1a9af04d06e75c0b5eb6fde0f8183e7401ecc5795d2bd1931b5a7968a4652
+MISC ChangeLog 337 SHA256 b5fa471b78360d5c9ec736fd53a6602ba488a63e7fa03a14c6545452e433f805 SHA512 dcd87ae2e3d506a611534ee6d236e30586b3f5560a9ffeaeb0c5f4cda4023252644391af474d9a77ce446959c90ffdbb23360a53559ee9b126f06652628adbe4 WHIRLPOOL 296ac6fbc10396732b45751eafdc8e930258548b60fdf35cf6ce71e2d4e0d37eb79094767de4520645772dbe56efb2275f6ceb2359eb8a1afd69ee4c794d1976
+MISC metadata.xml 495 SHA256 856348f4baa08b582ea7ca4abb3f73ece7ee3dd71136a0b5d6e00c6118a0408c SHA512 3dd4709b42bbb654cd29d041e1310b4c06ad8f9cfd867e0b59b753dbed85b7e4389b009cf89982ec931482405e8d926280fdf3f75f8948b9a4c3d0c4af7a8a22 WHIRLPOOL 85c650bbfc92f93122076743f0f88db734c5626f55c1ac0e1743de89d56d3c77faea5a2bcc4c31dc6801430873eb6ab914574eec4219f635358ef3aa5168e11f
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild
new file mode 100644
index 000000000000..f74d7cc4c865
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip )
+	x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild
new file mode 100644
index 000000000000..f74d7cc4c865
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip )
+	x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/chromedriver-bin/metadata.xml b/www-apps/chromedriver-bin/metadata.xml
new file mode 100644
index 000000000000..bc54c240e76b
--- /dev/null
+++ b/www-apps/chromedriver-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription>
+    ChromeDriver is an open source tool for automated testing of webapps across many browsers.
+    It provides capabilities for navigating to web pages, user input, JavaScript execution, and more.
+  </longdescription>
+</pkgmetadata>
diff --git a/www-apps/collectd-web/Manifest b/www-apps/collectd-web/Manifest
new file mode 100644
index 000000000000..62ea081ecc79
--- /dev/null
+++ b/www-apps/collectd-web/Manifest
@@ -0,0 +1,5 @@
+DIST collectd-web-0.4.0.tar.gz 771364 SHA256 08cda1ae2efe971087a7f312c9686dc8104bcb58c426925dca1a4e1be24551bd SHA512 7ce242ceab9d98c28332c66d8db727fe8f4ea357eb847f0d3f9275bac813941255bbaf0078282a4cd08750915ee81665d52ba07a94d1a3a72298b822de7a95e9 WHIRLPOOL e7772ffee202ea1701a5193a8f4554eee2fe1b1ac4dc8a65cc73c0c5024743341b5fc0e56d28106d6cb2185068abc5c5002700af6250754be8c421678c96d98e
+EBUILD collectd-web-0.4.0.ebuild 818 SHA256 cde3093f765dca81a75e2cb1d44a26e41b8dcc10a8d0830f0b19a403a676fde0 SHA512 66dcd9008a8c666498ba3b8be2ae5cd0a5315894a9e559c4f3e0e1cbcbb0dab23ed81fd5da6a91fd1283b6c63c0aeb99d5ffde3e988c07423a9afd30056baff0 WHIRLPOOL 8029010a3ea26e968664f9875d84fc7997d2bbfb1c39a4c3866723c4197fced6c531325696691c8a5408aa404922aa3caaf9126061bc39b8100da4b1eb12b168
+MISC ChangeLog 2442 SHA256 859f7ff50d4fcb4eb5366c943f91cd681c908089f3db599c13e6bc1f1768647a SHA512 aa0dd04b85b75c76a40a8b3b24c38fb5efe5a1935265553c67df5a2be6437e3d78f3d22e4a7f5ba1e2263062d95b6508ac72e273bd116dbf4bb3bb881825f4ae WHIRLPOOL eb2d8dc07c4dceee7cffa698b702c3ed3c253b4b8f89a95ea63ea400e19630f0d2c239506e21082ea09e2a2dbc01e4a239b060954559513f03f0a0021460dcb2
+MISC ChangeLog-2015 1119 SHA256 e8d6560a50072b7742667976e97902503252d059c65e75d1723327f66876ca9e SHA512 332319b2f16af389f182c2344640f1d59c298f5452db2c56ebfd217a0bffcb85c78740aeaa2d2ec28c2f2ec42d11f436b34f9b89e83321b99baeedc56ce238cd WHIRLPOOL 5502c5d6d6ebe0e3cd2a3a1d4b145b47a41f2aa5fc0bf3cf97ab0994850b5c6d7688dba9d341d3bc5c9b76030fc701a3ba6d9f5543f8ff8edb5ee644364f41d3
+MISC metadata.xml 335 SHA256 493360cf039300aea2610c4e1a51b40827b1347972c816d202bbac7cbeb741cb SHA512 b1a5faf853e5c3a9faaa39ce427cb1a1f6c6693df62d08a1b4114eff809265bff44fedea36d7e3ea4c5dd91acb0a2f39e2e202025d4a259f77af8b8ee9797696 WHIRLPOOL 6df0a8c0976215581425347fb961939bae71032b5fdf610ffd27856790bcf338cd4ba6f5419548dfab7e0ba111a401a7d917e9e9e773133e587a50158863f1e6
diff --git a/www-apps/collectd-web/collectd-web-0.4.0.ebuild b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
new file mode 100644
index 000000000000..adc5865c33f2
--- /dev/null
+++ b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit webapp
+
+DESCRIPTION="Collectd-web is a web-based front-end for RRD data collected by collectd"
+HOMEPAGE="http://collectdweb.appspot.com/"
+SRC_URI="https://github.com/httpdss/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+need_httpd_cgi
+
+S="${WORKDIR}/httpdss-collectd-web-a23c49f"
+
+DEPEND="dev-perl/HTML-Parser
+	net-analyzer/rrdtool[perl]
+	dev-perl/JSON
+	dev-perl/CGI
+	dev-perl/URI
+	virtual/perl-Time-Local
+	virtual/ttf-fonts"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	webapp_src_preinst
+
+	cd "${S}"/cgi-bin
+	insinto  "${MY_CGIBINDIR}"
+	doins -r .
+
+	cd "${S}"
+	insinto  "${MY_HTDOCSDIR}"
+	doins -r iphone
+	doins -r media
+	doins index.html
+
+	webapp_src_install
+}
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
new file mode 100644
index 000000000000..65d831e8d139
--- /dev/null
+++ b/www-apps/collectd-web/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">httpdss/collectd-web</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/curator/Manifest b/www-apps/curator/Manifest
new file mode 100644
index 000000000000..3abe119f354a
--- /dev/null
+++ b/www-apps/curator/Manifest
@@ -0,0 +1,5 @@
+DIST curator-3.0_pf078f1686a78.tar.xz 408412 SHA256 c2409844eb3fdc4667933c8d9f645f5e583864fd0e587318a54ca6e732e9b6c4 SHA512 5f6866396762d510319f8f36205ac1caa4468e761431ed1445d57858fab18120da0e3ff38b2aedf6d4d97fc6ed0998a62a3ed55476442b4537a092bc8d435751 WHIRLPOOL a02c8e1f01240b5fc91b1f3b771145635a3c9efe6da84167211a0b98415cdd43afefdefad2bf021ae3de3e24416a98da0078f66e19f3e4e7cfda5c8a3fcbf6c0
+EBUILD curator-3.0_p20110120-r2.ebuild 694 SHA256 cfdb85f8b9210dd07e409b44165350031c2c8e9cc4fabb6d5f403b64331c8d0f SHA512 3609ef82e3809a17ac5da4a43c341013a57197bdc27aff74a41b57a2026888745ca53d69f2789bf7a17bc6f25abb362fbe658fc4b8e72e9de0b1c07008bfd994 WHIRLPOOL bfa7ad3dfbaf643a9fac0cf6e3249d3838b221acfd8afdd0cd4878906b90db459638e184b65ccccc8adb9ce59d01739fa8af4c3bab670507ca5d7cff1ae325ee
+MISC ChangeLog 2760 SHA256 cd2725e3abe51c5cc5bd88a4be043f3ee080b53053f7e843ce710f0c1987ef5c SHA512 d1a845c8dd72d45be9c1b064ac33d61bfb9410d22fecc2c6b509a1c03147fc5bccd7aa2e6c60e876fdd0be1bc4f5fb158ad72c543ebb78af63a880f3e9daaa90 WHIRLPOOL 815ddabc74a34b72db34643ce8fd34d13aca33e33f52fd005bb11237b915d7f536674e0318ac57e4a0e6be0c369587461a652f812c6672198e0748d7b844fe68
+MISC ChangeLog-2015 2685 SHA256 9abe222ac8184c8ac6d2e80dfd6543ee683a260841077b76506854e733d5a117 SHA512 b00e274d6ad77a286b095cd3677eb040e548c3ddee4a03f27c2edbe79c1a302d2b2bd4171f1d58a092c51695a125f2a6f8838e49b8f2fe9dca79ad125a80ee82 WHIRLPOOL 106c7778f419ca7a53a06b4b6a181465acc6a5125500ac1c58ed65e8af5d9dfe681bf36798aa61196d702eec2ca36ed178de03db7e85e54d7dea14fa4287d0ec
+MISC metadata.xml 254 SHA256 505bbe1dda85e72f5fc88df19d80870b6c8afa7399b0cfd6cdca6eb006606526 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8 WHIRLPOOL 7fc3bad9398937e998517aa35693607fbcde33d68a3727ba226147840e1a9adf71d459cc8a5f035600193bdb14e259c417cfd6155b5532d03ead8c9321a9abe9
diff --git a/www-apps/curator/curator-3.0_p20110120-r2.ebuild b/www-apps/curator/curator-3.0_p20110120-r2.ebuild
new file mode 100644
index 000000000000..965e48375b6c
--- /dev/null
+++ b/www-apps/curator/curator-3.0_p20110120-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Gallery generator"
+HOMEPAGE="http://furius.ca/curator/"
+SRC_URI="mirror://gentoo/curator-3.0_pf078f1686a78.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/imagemagick-tools"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/curator-3.0_pf078f1686a78"
+
+src_compile() {
+	python_fix_shebang hs/curator-hs
+}
+
+src_install() {
+	dobin hs/curator-hs
+	insinto /usr/share/curator
+	doins -r hs
+}
diff --git a/www-apps/curator/metadata.xml b/www-apps/curator/metadata.xml
new file mode 100644
index 000000000000..3adf7af8a01b
--- /dev/null
+++ b/www-apps/curator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apps/cvsweb/Manifest b/www-apps/cvsweb/Manifest
new file mode 100644
index 000000000000..829cd318796e
--- /dev/null
+++ b/www-apps/cvsweb/Manifest
@@ -0,0 +1,13 @@
+AUX cvsweb-3.0.6-perl518.patch 791 SHA256 67d58cf9447050a8db26e56f836e1c74417a58d3d9d88ea1dd86fb3e9df81693 SHA512 9cdd1f92974dd35c70280913301050b6d2f0a6d37e19bd87834aefd78985469f508262f7e63d282d0ab98446dc4687626fd8b166a1c59a20e2098d23c45cf145 WHIRLPOOL 1e43665d43cc3eb01a72062709e82ee463be6008ca7bad398ea2e1b30d21cb9683092869fc6cd51e4a6e6e6f7112d6d3ee78438875bfe028dcd7c8584bb0cd2b
+AUX postinstall-en.txt 35 SHA256 1f0dd317eb5e367a5a9a281967a9842859a251134268ba9043869bdf8fc0128a SHA512 ba2ac529a8b20dfbe9110559a33d80dbe2b846af99b49bb8602520084e24474ef89ea2dd309287455ca94f9d9332ac8f36b2b7a2082dfb063e46456f1d11ca74 WHIRLPOOL 475ee106f736f3b175a1b4761a1aac74acf6fd2f25ad5dcfff648ad0651e1a29cf9888b846a69f5e398e9f52f814f5979cec56eaccdb37e325497d00d2182ce0
+AUX reconfig 381 SHA256 cf9e8d281abff2be46b265f504381c0aabb950d803ab513ff9d9942ac551bffd SHA512 73883f035c7d82de255a9aad5cc58d20b614e70eec86d5b524783e28e34e60888a0215923fd956aa851a42be31a3eb27634ad5d693148722160b569ea73b749b WHIRLPOOL d4b123b68a8fa44744434eccea682110f35cc7bdae3f83fa09bcd71a71186ed626211289b96f685a8124379452daa7937c20e55806ec0cc64ea80b76d6a5e0f7
+DIST cvsweb-1.112.tar.gz 37239 SHA256 55656465590231d8ead238cb2b7def59a9f00ad5f126176c15f2a9e340812fa4 SHA512 f0e427d4225498a4a7342335f902d7f37ca546135e2ec90e4e1fa14923c301ba5479061fae27a2728f94e45b833242c86d73dbad797681e24eb54c30b796c59d WHIRLPOOL 9908f3975028d47cb55a46e354fddd74f1d1ff2e0dfe126964a86158f382d4f9f7e81e1dff5ce9ab5a4079e78dd769149b3ee0c8c55acd2fd587a921ac58cde4
+DIST cvsweb-3.0.5.tar.gz 72199 SHA256 ab1acebde0b4f2c75932bab529150c8280cf881deba81323d71733d81c28643c SHA512 68b6d0a1ef3ec17c1cdd71f90e1cfa27aa8a4591f1bb0cf342a168e7fb2c79ff0d5d0fe56916aa1255f43524c8ed281c228eea18183a0410a69789fefea5f8d3 WHIRLPOOL af1ae78daf51966f622d9835bc4d53fcaf324b12bedb7cd182fb540147d15a51ecea338d88d1716b0f37f43eacf59caa84ea4f509316a29ba545611687c27f6a
+DIST cvsweb-3.0.6.tar.gz 72484 SHA256 07391ee70212ae42e54b8f6d5e613623ef2aad5fd7474899a102fcca48d213c2 SHA512 32ac58bcb025746e4cc20bdc12d1bd915e2286a4093afebf8d60cb94a70ac614301f9b7f0a175458b14262a03d3d2eb8c29eabaf9127bef1aa6847905f331cc6 WHIRLPOOL becd4a96f21b178595be2083f8117e84b6203508fca09a9a74891cc324f8086b6a2b273eabfbb50301864a0f5f53a84374f7e3e0c9a1a32b0e7bd08a1a60aaa3
+EBUILD cvsweb-1.112.ebuild 716 SHA256 e740a9ab8e324134c77ced175e456c0c034e04f67a530228dd7dcb25bef9b4cb SHA512 2deb62c5b57b365206dd71feba1958f226171932516fbafef03f7f3389b07c7b05b86a2679ae14b2fd12b751671291646f089992973c85cf3becfe4b721a32cf WHIRLPOOL 8db85e8cefcae8e1e9c2b6207722cd89e49a0fd5e50194e543ac1c0840879da9452b3827c5ea1d2920f3fd947d8df01ff8fd0e7214dd5c0ba00d4794f39ff6f9
+EBUILD cvsweb-3.0.5.ebuild 927 SHA256 248c78cfa85060db04479451db85ad92a64f5a4afbefa6aef128969ee93d8954 SHA512 a568dae3c228f722e2d7c3dc8f1f943207274f8dd87bfd526837e3f5666656c5c67babb38a2fea5bd980c7314fbfa5147e2e2e54d9538db2c5fbb93fa760970b WHIRLPOOL 4c50803fe99441c92bbd68d8bdc814ae75e74887c7580885438dca299792316743ece048251451625cbbf153ed0a6848f2f40a9e2c06769539ff7b76d9c5ef6b
+EBUILD cvsweb-3.0.6-r1.ebuild 1007 SHA256 dcb051f974291968641dc014cdef219f5953a64f5da2acbbc0ab58d3d43bc8c8 SHA512 75e8a1b8561f89bdf7f8525b08374850e43867e5f7b6d6140924ea5b41446fc42fcd6ce2188ac5f6756934471265ae637407643b56108d170672751de273bf34 WHIRLPOOL fc34e3927ea031e2956b1f34eed3ee1454b5e7fb18a48d48212801700fc7038af2b6305f56ec2e9d5458a0f69ae572d16c0642625c2bdbcb02d3285e1d01c7d3
+EBUILD cvsweb-3.0.6.ebuild 932 SHA256 035f2ad11f74f052024136ec6f0cc07371f7b3cc63cd6b43a62c3ee07059c3f2 SHA512 dfbfd43bbdc58aced2541655d28f52d96c77a8c8428848bf18ca0cce7a7aba148d64ccafc22c5569be3784042a9e9f309a2737f1d93a15c124774ef8ca4cede2 WHIRLPOOL 76ee31bc6a33fab4b5e899806af3ac1885aabce3d7738f359a9c8be163b3664102952feb17b655d09bb7e1ed746ed140d011bc58b3df0fdd09d6ad725087c44d
+MISC ChangeLog 2663 SHA256 4bb4ee2c90f57dfa7d448da0b1b5ff1b1e4879b8f7c6fa1c46c8359d891da1c1 SHA512 4a6302d6a9bbc5a6ede77849082d3cf637945c684109749ea8034fd8f2d986297c566eaa743f7232020e1d7fc2dcb66647e96917a3c7d1594b12d7932cdc1557 WHIRLPOOL 12a5c03b3a17d095ca0722623737ee1810d10e798359e1c52ba663f70b41419f949db8066bd08e99e7900561330cade20498c7a5c85bef5de01070c241224532
+MISC ChangeLog-2015 3078 SHA256 d350c20ed147a6f53e29d39250f988e327ed6981c5022839cbfc32bf76021043 SHA512 adc8a374ca0a2f53e9b018ff1e97f703d7e3300b339740411e507ac57f38054965f77f7c590e63cd138a4f8d60953fd9fb7293d11e691d2c0a95394274086a9a WHIRLPOOL a5d57653b32b0360b43d06c2aa87edbf95696b14667c13b96a24ec0de5206d6b8e143a7947d1c582fe9c94388f7d0b29e150f5f973a2dad24d72ab6adc574db6
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/cvsweb/cvsweb-1.112.ebuild b/www-apps/cvsweb/cvsweb-1.112.ebuild
new file mode 100644
index 000000000000..475a89beac01
--- /dev/null
+++ b/www-apps/cvsweb/cvsweb-1.112.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="WWW interface to a CVS tree"
+HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5
+	>=dev-vcs/rcs-5.7"
+
+S="${WORKDIR}/cvsweb"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	local x
+	for x in cvsweb.cgi cvsweb.conf
+	do
+		cp ${x} ${x}.orig
+		sed -e "s:/usr/local/web/apache/conf/:/etc/apache/conf/:g" ${x}.orig > ${x}
+	done
+}
+
+src_install() {
+	insinto /etc/apache/conf
+	doins cvsweb.conf
+	insinto /home/httpd/cgi-bin
+	insopts -m755
+	doins cvsweb.cgi
+	dodoc README TODO
+}
diff --git a/www-apps/cvsweb/cvsweb-3.0.5.ebuild b/www-apps/cvsweb/cvsweb-3.0.5.ebuild
new file mode 100644
index 000000000000..04e2333ac8f0
--- /dev/null
+++ b/www-apps/cvsweb/cvsweb-3.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="WWW interface to a CVS tree"
+HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+	>=dev-vcs/cvs-1.11
+	>=dev-vcs/rcs-5.7
+	>=dev-perl/URI-1.28
+	dev-perl/IPC-Run
+	dev-perl/MIME-Types
+	dev-perl/String-Ediff
+	>=dev-vcs/cvsgraph-1.4.0
+	>=app-text/enscript-1.6.3"
+
+src_install() {
+	webapp_src_preinst
+
+	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
+	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+	exeinto ${MY_CGIBINDIR}
+	doexe cvsweb.cgi
+	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+
+	dodoc README TODO NEWS ChangeLog
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild b/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..09482ea3a6c7
--- /dev/null
+++ b/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="WWW interface to a CVS tree"
+HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+	>=dev-vcs/cvs-1.11
+	>=dev-vcs/rcs-5.7
+	>=dev-perl/URI-1.28
+	dev-perl/IPC-Run
+	dev-perl/MIME-Types
+	dev-perl/String-Ediff
+	>=dev-vcs/cvsgraph-1.4.0
+	>=app-text/enscript-1.6.3"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-perl518.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
+	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+	exeinto ${MY_CGIBINDIR}
+	doexe cvsweb.cgi
+	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+
+	dodoc README TODO NEWS ChangeLog
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/cvsweb/cvsweb-3.0.6.ebuild b/www-apps/cvsweb/cvsweb-3.0.6.ebuild
new file mode 100644
index 000000000000..00ed18debcbd
--- /dev/null
+++ b/www-apps/cvsweb/cvsweb-3.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="WWW interface to a CVS tree"
+HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+	>=dev-vcs/cvs-1.11
+	>=dev-vcs/rcs-5.7
+	>=dev-perl/URI-1.28
+	dev-perl/IPC-Run
+	dev-perl/MIME-Types
+	dev-perl/String-Ediff
+	>=dev-vcs/cvsgraph-1.4.0
+	>=app-text/enscript-1.6.3"
+
+src_install() {
+	webapp_src_preinst
+
+	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
+	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+	exeinto ${MY_CGIBINDIR}
+	doexe cvsweb.cgi
+	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+
+	dodoc README TODO NEWS ChangeLog
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
new file mode 100644
index 000000000000..ba1195ae9160
--- /dev/null
+++ b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
@@ -0,0 +1,25 @@
+Source: 
+http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/cvsweb/patches/patch-cvsweb.cgi.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
+
+Fix warnings from newer perl versions
+
+--- cvsweb.cgi.orig	2013-07-30 12:49:33.268655300 +0000
++++ cvsweb.cgi
+@@ -1192,7 +1192,7 @@ EOF
+ <legend>General options</legend>
+ <input type="hidden" name="copt" value="1" />
+ EOF
+-    for my $v qw(hidecvsroot hidenonreadable) {
++    for my $v (qw(hidecvsroot hidenonreadable)) {
+       printf(qq{<input type="hidden" name="%s" value="%s" />\n},
+              $v, $input{$v} || 0);
+     }
+@@ -2951,7 +2951,7 @@ sub printLog($$$;$$)
+   print "<br />\n";
+ 
+   print '<i>';
+-  if (defined @mytz) {
++  if (@mytz) {
+     my ($est) = $mytz[(localtime($date{$_}))[8]];
+     print scalar localtime($date{$_}), " $est</i> (";
+   } else {
diff --git a/www-apps/cvsweb/files/postinstall-en.txt b/www-apps/cvsweb/files/postinstall-en.txt
new file mode 100644
index 000000000000..e6e1dbf1e54e
--- /dev/null
+++ b/www-apps/cvsweb/files/postinstall-en.txt
@@ -0,0 +1 @@
+Now edit ${VHOST_ROOT}/cvsweb.conf
diff --git a/www-apps/cvsweb/files/reconfig b/www-apps/cvsweb/files/reconfig
new file mode 100644
index 000000000000..10767108f1a9
--- /dev/null
+++ b/www-apps/cvsweb/files/reconfig
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed "s|/usr/local/etc/cvsweb/cvsweb.conf|${VHOST_ROOT}/cvsweb.conf|g
+	s|/usr/local/etc/cvsweb|${VHOST_ROOT}|g
+	s|/css/cvsweb.css|/cvsweb.css|g
+	s|/usr/local/etc/apache/mime.types|/etc/mime.types|g" -i ${VHOST_ROOT}/cgi-bin/cvsweb.cgi ${VHOST_ROOT}/cvsweb.conf || die "sed failed"
+fi
diff --git a/www-apps/cvsweb/metadata.xml b/www-apps/cvsweb/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/cvsweb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
new file mode 100644
index 000000000000..2c8e543801b0
--- /dev/null
+++ b/www-apps/davical/Manifest
@@ -0,0 +1,16 @@
+AUX awl-locations.patch 2303 SHA256 8ec4c20da78172272718dd47ca95a673b98d679c8aa809abb5d6f8a28c7cc3e1 SHA512 38aca5e25ee3fa7c9d06ec9bb027a28ac175535657be1eb7dc160c95101588a182a1907109b4d4969b3e136a72e142a5b6a0d1734b5a7418a2418ba2f9ce3f5f WHIRLPOOL 55bc8a612cfede94a837a985b905f581b3e3a8f8df40fd588a721b3f4c06d1a8b45d7f7665686f76e2bcf82c7106ad089e615736b25febcf6aad81e68181cf18
+AUX awl_location.patch 1156 SHA256 67a0bc37c10a2468919e647953766b8121009c0f3d0eb17c08580987300a0219 SHA512 89a4599d4ef417cba923c2a5f35bbf0b3f6618d8beb344a2ae0ff42c564be2e040ed336f1d8bd8013eda48e77233cb25846d59716b486f441d78fc0d75739f44 WHIRLPOOL c96d02b2074ae5547ee8dc4a6ee8e8b12fef64b9d7949c1ff02f8551834037df58ee6eba40a2e011cfc2ac3f52e83a848cbb7b621ad527be6dfafaf0d278b10c
+AUX inc_path.patch 1418 SHA256 b0f4544639ce76b3cdcd032854bb94178580e12dd51cb9d8d5d6a1f29747a138 SHA512 f5f4019322627d32a1fa34251bc5cb5788103ff8048c11c000f034db3118154dd193fd510721cc664e6c492c23331fa2c13dbcddd00c00197dec9d63c4196fd3 WHIRLPOOL cf77f8a9f16b45a2e72c4589ccb1be65a387bab18d8a370c7b0efed289e462960cbf4db5348766e8ff632ceef3d97d1bdeb059e09224dbd87e03a0b8f721840b
+AUX postinstall-en.txt 730 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4 WHIRLPOOL 9c87177121fb9929201754ea84ba2a435c2b388a796473a35440f09c7f1b6c033f230423ecbb8acf9fdd8c2b9717acf9d2f72b2bcce136fb27d619f5f79d1a48
+AUX vhost-example 366 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97951807235b333 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9 WHIRLPOOL 357e068c6f5fe1f785f130698fbb8ad530c154d13c5260e13dd3cd3cd8df50bc9eeb69ee1011953e482465bfbe7494b9b344fa7143128e2ec3f9b9f8da545b68
+DIST davical-1.0.2.tar.gz 2739740 SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6 SHA512 8eb1df963b0e3aa87c28e75001c4301698abff74fd4581bdc826bfad8d8e1cd5aa0b641c668dbecc2f85ca8f3bca8ec9a508d268881da004cbb84017c2604dcb WHIRLPOOL 92c3e127659a818290f5d46b1c5818719174b0aee8a4f0b8e29f1ad39022d62b22f5840036d7ec6497c40dd05935ee37a7eba478e179e0baa5abc3723e392aa6
+DIST davical-1.1.0.tar.gz 2967572 SHA256 cc52f09c1f8706aa2b6d598b77ef0997b6e7ee31db1f1325864d705514505816 SHA512 5c272418b5c324d0ea4cbdd9c1124171ecd1fe1f3df4953569b02a47359469539205ff48e92aa19abaa667bb7c69f1b8b8196d79e549645009ac0b7bbddd7c18 WHIRLPOOL e224f62c4143d5c92387a346ec1ff14504b7892308d302a3f50d749725c58b8edbc23642640cd29b85e4095b4e3352242ccc25657cd4193f13e191a0ac894a24
+DIST davical-1.1.1.tar.gz 2979425 SHA256 09bd92a35d2730fe687f6801796d8da1090cb8e36c2910c056a01b00cb73cafc SHA512 6f0b2a13ba6698ea1a7d16988c795888820a08d125ac3d622b6c9fc21f831b698e8ce2c9c7ae25e64252f38502e473daabbd0626c5b2450646efb7cdb7f5b31e WHIRLPOOL 82e1a3530dd2247d46effd2df13554d3af2f2141d3c5efb7eb3cc1d514f8defc7a479ff47d135872ef712ae63d6a39ba4d65df14c2885ab2ca7b6510e6db23bf
+DIST davical-1.1.3.1.tar.gz 3031220 SHA256 4439c2df0052241b65c61eb4f0b10c406d93afd65a5cc6b523b597c0a7b05c15 SHA512 1944c4750799e9388adcaf1d5df6a2a5daccc34dd7274673a6b27cf0c32b2357d3cdd6d7c0928ea182408ce5111530f6b0e2eb6d882eb47ee1dcfa6eb8d4fe4b WHIRLPOOL d32252bef2c5f4d772a7d0744d8d6aaabbde2de2f3e259802c80242e5f87ecf5ed4ea965daa2c5ec134c214c46bbbfc1e234fcdbb23f507f6de1ed328d9f6934
+EBUILD davical-1.0.2-r2.ebuild 1524 SHA256 dc075ce4a3d731fc92a4eefa40525f5978d2427cabfcac4f7424a9ac17c7a2aa SHA512 a153225166179a94097083eeeff752728074a682a0eef566875a3e0ab5887fa5e670b5f35740f0264aab3cb65f97c685edab42c18ba7c3317f226aa32211b681 WHIRLPOOL 81a119a6b7ba75f3c8f3c38fd9f45591caf1860fb9bd7044dd537cc4f8af0472e8ea5f84cd39f278deb4b1d013e33cd8793c7a426400fe46be5202a840fa34dd
+EBUILD davical-1.1.0-r1.ebuild 1504 SHA256 d89fc8e2108f350836837e7a58cf8bbc1624aa3fc0961df4b2d3cc7dd803cd81 SHA512 516ba880869db947f76387a4e6d355dbe1392256901dd447840be61ac8fb1dde762f6b9166b2bea754e63f2d26f782dc40d50f56e893d873476de28ed42eabb1 WHIRLPOOL eb70e19a67a40ac3e1c9438d8594375c24c28e656cf641e16ba2237c6f2065e9087404041862faeefb22ea2d708de762ad12e146029d71ba2ea2f1ae7c072446
+EBUILD davical-1.1.1-r2.ebuild 1499 SHA256 c716da6e37896fea87ac95cff37422e8c0af8ce92b00cb48df0879df55560f95 SHA512 68373843aebb1da62840a1891cfa7cb6c6cb593d50e4dc48da25f925bd0657316a5553f14cc152b2a962d5394baf1a924fb4e37a2bc85b1806f35fe1824b10d8 WHIRLPOOL 036f8e12fb5a768c7644cbc79ae822c74c871fa591b96faa85520433f01de4c81befb25ce0900e4a24cad074d48370efd5907acafffe68a3e6f5211852cb5e9a
+EBUILD davical-1.1.3.1-r2.ebuild 1567 SHA256 a6c753a54f32f9b99088aabbd545cf38a749bc288e17f65f8c5c87b46f3a34ab SHA512 be1cefe42341c70c85480da6298f6cb9b80abf417d9e22de310473212db464284c62c8afb3d83965caea34c813e19da3ef76aba4df279b2fe8ca865178094aba WHIRLPOOL a2f86a4083f4df07a99b79422f2fafd38ef6016ade85db980c69a210b29ead3be64b800bba1006281fffbeb60e5f7eb094e5986894b9bc46ecd23927e0f3c965
+MISC ChangeLog 3477 SHA256 c56eeb8c319ff52e0c02d5341eae43130477707bb872493c8551e285fbc5171d SHA512 913a781a1a85b18406c5e3465e6a5c7c6d21ac8f09688dde85d6e1289462d900e5abcca4554cd850e6d496de202f6a7ba072a13eb6ea50688a6b6fd8b12caa6d WHIRLPOOL e1a700706cfb3a56ad2e834af4a6a5f38aa819eb76275ad2cf81b0cfd6336af3ff1a3a09ca2ebb967bd8de8bf2b3c2577149feb1c74441d331bbd89b403c6c91
+MISC ChangeLog-2015 7371 SHA256 604efeeef8726c4988ee15e6eeeca5229fa6e5af6351bc49520b044824012f7b SHA512 7ee54b0fd4bbfff65ac919d0dbb1eff0b888c3193000065ea98b95d09ba6e2d498d3102af41a00d754fd91d4f568361338f074614dc361fb747a9933b6e29459 WHIRLPOOL d565025f24a1303e1812710a943bdda12c46368c2483391f6e90bf3842d89a9ca3d1a28b3b04218767dfd72e3e0dbaf86c864776496756dda1171641ded45f90
+MISC metadata.xml 289 SHA256 b01d9209bd293f2ce11786f6061344eb427c5370bfcd0b20a3b97f3cd8e88375 SHA512 eb4947560bda57063dd746f397daafccc5d30e8aa694d75419a2dd4da56461fd6c82274c13e1ac01f8bad0d742c00f4116c20ceefe50f383988c9d12be27c90c WHIRLPOOL e8797141a6d561bf4750a69f8a92d9007579ef6271e134b5d429e0374d522f616a8a4beb5ff85333787880b0d1de3618b4f984a2c595dbc4e2e8f3b23be2da04
diff --git a/www-apps/davical/davical-1.0.2-r2.ebuild b/www-apps/davical/davical-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..2705cea82653
--- /dev/null
+++ b/www-apps/davical/davical-1.0.2-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+
+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=">=dev-php/awl-0.51
+	sys-devel/gettext"
+RDEPEND="
+	app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/YAML
+	>=dev-php/awl-0.51
+	www-servers/apache"
+
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	emake built-po
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess
+
+	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/*
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example"
+
+	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/davical-1.1.0-r1.ebuild b/www-apps/davical/davical-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..43091254bcf5
--- /dev/null
+++ b/www-apps/davical/davical-1.1.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+
+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="
+	>=dev-php/awl-0.51
+	sys-devel/gettext
+	"
+RDEPEND="app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/YAML
+	>=dev-php/awl-0.51
+	www-servers/apache"
+
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	emake built-po
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/*
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example"
+
+	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/davical-1.1.1-r2.ebuild b/www-apps/davical/davical-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..0826a035786f
--- /dev/null
+++ b/www-apps/davical/davical-1.1.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+
+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=">=dev-php/awl-0.51
+	sys-devel/gettext"
+RDEPEND="app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/YAML
+	>=dev-php/awl-0.51
+	virtual/httpd-php"
+
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	emake built-po
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/*
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example"
+
+	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/davical-1.1.3.1-r2.ebuild b/www-apps/davical/davical-1.1.3.1-r2.ebuild
new file mode 100644
index 000000000000..03ec48493ae8
--- /dev/null
+++ b/www-apps/davical/davical-1.1.3.1-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="https://gitlab.com/${PN}-project/${PN}/repository/archive.tar.gz?ref=r${PV} -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-php/awl-0.55
+	sys-devel/gettext"
+RDEPEND="app-admin/pwgen
+	dev-lang/php:*[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/YAML
+	>=dev-php/awl-0.55
+	virtual/httpd-php"
+
+S="${WORKDIR}/${PN}.git"
+
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl-locations.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	emake built-po
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/*
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example"
+
+	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-locations.patch b/www-apps/davical/files/awl-locations.patch
new file mode 100644
index 000000000000..e0105bffbd2f
--- /dev/null
+++ b/www-apps/davical/files/awl-locations.patch
@@ -0,0 +1,93 @@
+diff --git a/dba/create-database.sh b/dba/create-database.sh
+index b1dd1fa..d25f9d9 100755
+--- a/dba/create-database.sh
++++ b/dba/create-database.sh
+@@ -10,22 +10,29 @@ DBADIR="`dirname \"$0\"`"
+ 
+ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXXXX`"
+ 
+-testawldir() {
+-  [ -f "${1}/dba/awl-tables.sql" ]
+-}
+ 
+-#
+-# Attempt to locate the AWL directory
+-AWLDIR="${DBADIR}/../../awl"
+-if ! testawldir "${AWLDIR}"; then
+-  AWLDIR="/usr/share/awl"
+-  if ! testawldir "${AWLDIR}"; then
+-    AWLDIR="/usr/local/share/awl"
+-    if ! testawldir "${AWLDIR}"; then
+-      echo "Unable to find AWL libraries"
+-      exit 1
++# Candidate locations of the AWL directory
++awldirs="${DBADIR}/../../awl
++/usr/share/awl
++/usr/share/php/awl
++/usr/local/share/awl"
++
++# Disable globbing and use newline as seperator
++set -f; IFS='
++'
++for d in $awldirs ; do
++    if [ -f "${d}/dba/awl-tables.sql" ] ; then
++	AWLDIR="${d}"
++	break
+     fi
+-  fi
++done
++
++# Renable file globbing and reset seperator 
++set +f; unset IFS
++
++if [ -z "${AWLDIR}" ] ; then
++    echo "Unable to find AWL libraries"
++    exit 1
+ fi
+ 
+ export AWL_DBAUSER=davical_dba
+diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh
+index 7191615..809fa8c 100755
+--- a/scripts/po/rebuild-translations.sh
++++ b/scripts/po/rebuild-translations.sh
+@@ -10,17 +10,30 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
+-
+-if [ ! -d "${AWL_LOCATION}" ]; then
+-  AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+-  if [ ! -d "${AWL_LOCATION}" ]; then
+-    AWL_LOCATION=/usr/share/awl
+-    if [ ! -d "${AWL_LOCATION}" ]; then
+-      echo "I can't find a location for the AWL libraries and I need those strings too"
+-      exit 1
++
++awldirs="../awl
++`find .. -type d -name 'awl-*.*'`
++/usr/share/awl
++/usr/share/php/awl
++/usr/local/share/awl"
++
++# Disable globbing and use newline as seperator
++set -f; IFS='
++'
++
++for d in $awldirs ; do
++    if [ -d "${d}" ] ; then
++	AWL_LOCATION="${d}"
++	break
+     fi
+-  fi
++done
++
++# Renable file globbing and reset seperator 
++set +f; unset IFS
++
++if [ -z "${AWL_LOCATION}" ] ; then
++    echo "I can't find a location for the AWL libraries and I need those strings too"
++    exit 1
+ fi
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
new file mode 100644
index 000000000000..7eee3d8fcfb8
--- /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 000000000000..2230249df0f9
--- /dev/null
+++ b/www-apps/davical/files/inc_path.patch
@@ -0,0 +1,28 @@
+--- 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');
+@@ -80,6 +80,7 @@
+         '../../awl/inc'
+       , '/usr/share/awl/inc'        // Where it ends up on Debian
+       , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
++      , '/usr/share/php5/awl/inc'   // Gentoo's standard for PHP5 libraries
+       , '/usr/local/share/awl/inc'
+   );
+   foreach( $try_paths AS $awl_include_path ) {
+@@ -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 000000000000..5a88a2bdf2e4
--- /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 000000000000..d6f0da2088cf
--- /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/www-apps/davical/metadata.xml b/www-apps/davical/metadata.xml
new file mode 100644
index 000000000000..a7029b1a1086
--- /dev/null
+++ b/www-apps/davical/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
new file mode 100644
index 000000000000..576ad6042b69
--- /dev/null
+++ b/www-apps/dokuwiki/Manifest
@@ -0,0 +1,10 @@
+AUX htaccess 170 SHA256 62da7d1754d82a8408a324b37691b1b391ce222cb290234318f4e44f7cfae19a SHA512 a19dba09a2a5c6926b56ca1063e329e431253825550890be56a46faccd736aec7236167b5da1f0b0cfec47a9935f340f246b4bfaaaaeba06644d08a76fc52514 WHIRLPOOL 12b983669b61ded932a3bb8d65deb22f9143cbee75ab13ee63b1593e1a9ac21ffdaa3f250434107c8be2bb1afbfcd27416ad016a05245283b88418cb2c22f613
+AUX htaccess-dist 1639 SHA256 36747f3f013acb2698a253c91f9d9b9ac531efc8d6bb91de61367ea1f3e2c99e SHA512 8d05756eb04a61fc9a89b814d0cf9022feb57c3de10fa74cf1964bdba7910d25448109147facccd8447a4ff446cb7a0cf8d8134642061d23b03e0921b032fc76 WHIRLPOOL e2afd57b591c8625f7c197f584641afddfd89309c1d9d29632634f10f3f9697d69620d57ecc04baca01865b7c493655c04939a6d6088c35d526c99e046340c70
+AUX postinstall-en.txt 1791 SHA256 405a54af08d9d08f903bbd33398e7d716ab37228b2ff0e4af81dc2368d64f2bf SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5 WHIRLPOOL 1389c2f1b7e550fa36b979664872de257c7177b4cc5976e90dcd86e4888ffaf439688a8d842490a806a58af9c689c2c40160e2969b7fc023886411a3a8893d0a
+DIST dokuwiki-2016-06-26e.tgz 3464178 SHA256 af63ccaa54b617a809d78642c7e83fe6581c545b869aab7440d63ab82b0120bd SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039 WHIRLPOOL 028c5ac4c72d0bc29d8d534133e61749683169f1f5a5ad4627fff8cf9bcd9bd5b4cb6e5ac845cd1572f9417fe2c23e2234d484c0920250ffacc830075abfa913
+DIST dokuwiki-2017-02-19e.tgz 3505643 SHA256 93172a28ab88107a8abac1e6a34fa6cef54b6e407cd03a8cc14d2a604a63e888 SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4 WHIRLPOOL b3eeee3bff1d1ea8bd62432dcd79480b929cdb4a86331aa0179690d6c7602ba8176d79c276316ea4a9b81a645e91e7739d2332dc23ccc249867328556f5540da
+EBUILD dokuwiki-20160626e.ebuild 1658 SHA256 a823628c4acd2d1b043e3ce0524c09aaec007ee9d479e01e3585940dcd42afe6 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b WHIRLPOOL bddfc1b04c2982f1e58a6ccefd8caeb4ae934228361ffe7ad0eaf537021e7f9de06dea54f9ae8317df44f2c625f800f3b7ff9e26ce2c7d61a5f386597a363a43
+EBUILD dokuwiki-20170219e.ebuild 1658 SHA256 a823628c4acd2d1b043e3ce0524c09aaec007ee9d479e01e3585940dcd42afe6 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b WHIRLPOOL bddfc1b04c2982f1e58a6ccefd8caeb4ae934228361ffe7ad0eaf537021e7f9de06dea54f9ae8317df44f2c625f800f3b7ff9e26ce2c7d61a5f386597a363a43
+MISC ChangeLog 3811 SHA256 420ed0a0f1093129de0574ad59816dc0a5ec9760e422d1f765346645c39bdf65 SHA512 3904ade7c1e87db4b07d06f5cf5469a402ada94df7957af644ddfd16feb27e37cdcf59dfaa612a633b29d1371c5477fa86ca507ecbaf8e5a03e872ba4e39304b WHIRLPOOL 17b8b0923d34d4f217aa4b7a706ee3f21992ec2d564a408a3d0e05a5b7a85ea692c8c00f23eca1855ac04790718985c44c4bdd5f57aba989618fbf72d0a01ef8
+MISC ChangeLog-2015 13949 SHA256 b663b87a3f05a47fb545333ccfc874e4f30d6567c5f55b15029ead3a5e779ea6 SHA512 0e5ddb6743bfc3be71f0a9dc550e11a0af5ac825fb098492dadba670e21fd0651fcf65853f33f0caceec9a22eb9bcef1da2b519d42896a02be2cca1ca4f30eda WHIRLPOOL 704d0455dfcef0446e94d4a42ede7ba255ae769b7486dc2fd2a5a6c062e4d5ddee4ed69d3d59a52b484a9ae09dd3acf234f775b82426a5cefbe8e12e8f8db5a2
+MISC metadata.xml 820 SHA256 683046ea0f982e4b9cff81159ba7fe07f4a3dd2f981aa0d02256b124e8b6501e SHA512 9fc806f40f766674a758578017d2dd6a81ff81d65b9dc202c811d4970eea0b2e5135e49c9b655bfd25969ba038ce449885424020ac52c2b2e493665b9d2e313f WHIRLPOOL fa9f979b735ec4b611b363f75d200d4698b43a2dd9a5e40838e29e2e52ef072a18a05472b0a9438bcb1f81262b4194ba8df4a1ac41d549fc25559b16c701bdcf
diff --git a/www-apps/dokuwiki/dokuwiki-20160626e.ebuild b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
new file mode 100644
index 000000000000..d6e837cfd1cc
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PV="${MY_BASE_PV}${PV:8:1}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
+SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# create initial changes file
+	touch data/changes.log
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README
+	rm -f README COPYING
+
+	docinto scripts
+	dodoc bin/*
+	rm -rf bin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Copy custom .htaccess that works with both apache 2.2 and 2.4
+	for dir in "conf" "data" "inc" "inc/lang"; do
+		insinto "${MY_HTDOCSDIR}/${dir}"
+		newins "${FILESDIR}/htaccess" ".htaccess"
+	done
+
+	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
+	insinto "${MY_HTDOCSDIR}/"
+	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
+
+	for x in $(find data/ -not -name '.htaccess'); do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
+	webapp_configfile "${MY_HTDOCSDIR}"/conf
+
+	for x in $(find conf/ -not -name 'msg'); do
+		webapp_configfile "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/dokuwiki/dokuwiki-20170219e.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
new file mode 100644
index 000000000000..d6e837cfd1cc
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PV="${MY_BASE_PV}${PV:8:1}"
+
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
+SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# create initial changes file
+	touch data/changes.log
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README
+	rm -f README COPYING
+
+	docinto scripts
+	dodoc bin/*
+	rm -rf bin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Copy custom .htaccess that works with both apache 2.2 and 2.4
+	for dir in "conf" "data" "inc" "inc/lang"; do
+		insinto "${MY_HTDOCSDIR}/${dir}"
+		newins "${FILESDIR}/htaccess" ".htaccess"
+	done
+
+	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
+	insinto "${MY_HTDOCSDIR}/"
+	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
+
+	for x in $(find data/ -not -name '.htaccess'); do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
+	webapp_configfile "${MY_HTDOCSDIR}"/conf
+
+	for x in $(find conf/ -not -name 'msg'); do
+		webapp_configfile "${MY_HTDOCSDIR}"/${x}
+	done
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/dokuwiki/files/htaccess b/www-apps/dokuwiki/files/htaccess
new file mode 100644
index 000000000000..18532a25d643
--- /dev/null
+++ b/www-apps/dokuwiki/files/htaccess
@@ -0,0 +1,10 @@
+# Apache 2.4
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+    Order Allow,Deny
+    Deny from all
+</IfModule>
diff --git a/www-apps/dokuwiki/files/htaccess-dist b/www-apps/dokuwiki/files/htaccess-dist
new file mode 100644
index 000000000000..dc8caceeceea
--- /dev/null
+++ b/www-apps/dokuwiki/files/htaccess-dist
@@ -0,0 +1,43 @@
+## Enable this to restrict editing to logged in users only
+
+## You should disable Indexes and MultiViews either here or in the
+## global config. Symlinks maybe needed for URL rewriting.
+#Options -Indexes -MultiViews +FollowSymLinks
+
+## make sure nobody gets the htaccess, README, COPYING or VERSION files
+<Files ~ "^([\._]ht|README$|VERSION$|COPYING$)">
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+
+	# Apache 2.2
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+	Deny from all
+	</IfModule>
+</Files>
+
+## Uncomment these rules if you want to have nice URLs using
+## $conf['userewrite'] = 1 - not needed for rewrite mode 2
+#RewriteEngine on
+#
+#RewriteRule ^_media/(.*)              lib/exe/fetch.php?media=$1  [QSA,L]
+#RewriteRule ^_detail/(.*)             lib/exe/detail.php?media=$1  [QSA,L]
+#RewriteRule ^_export/([^/]+)/(.*)     doku.php?do=export_$1&id=$2  [QSA,L]
+#RewriteRule ^$                        doku.php  [L]
+#RewriteCond %{REQUEST_FILENAME}       !-f
+#RewriteCond %{REQUEST_FILENAME}       !-d
+#RewriteRule (.*)                      doku.php?id=$1  [QSA,L]
+#RewriteRule ^index.php$               doku.php
+#
+## Not all installations will require the following line.  If you do,
+## change "/dokuwiki" to the path to your dokuwiki directory relative
+## to your document root.
+#RewriteBase /dokuwiki
+#
+## If you enable DokuWikis XML-RPC interface, you should consider to
+## restrict access to it over HTTPS only! Uncomment the following two
+## rules if your server setup allows HTTPS.
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^lib/exe/xmlrpc.php$      https://%{SERVER_NAME}%{REQUEST_URI} [L,R=301]
diff --git a/www-apps/dokuwiki/files/postinstall-en.txt b/www-apps/dokuwiki/files/postinstall-en.txt
new file mode 100644
index 000000000000..1816ba6bf88d
--- /dev/null
+++ b/www-apps/dokuwiki/files/postinstall-en.txt
@@ -0,0 +1,52 @@
+To complete installation you need to perform the following steps:
+
+    1) Configure dokuwiki base options
+    2) Check the config
+    3) Notes
+
+1 - Configure dokuwiki base options
+
+    The first thing we need to do is set base options of dokuwiki:
+
+    $ cd ${MY_INSTALLDIR}/conf
+
+     Edit dokuwiki/conf/dokuwiki.php (see config [1]) if you want to change
+     anything within it. Better yet, create ${MY_INSTALLDIR}/conf/local.php containing
+     those lines from dokuwiki.php which you want to change. This way, your
+     changes are preserved when overwriting the dokuwiki.php with a new
+     release.
+    
+    $ cp local.php.dist local.php
+
+2 - Check the config
+
+    Finally, test if everything is set up correctly. Use the check option in a
+    URL and pull it up into a browser:
+
+    http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/doku.php?do=check
+
+3) - Notes
+    
+    Please see the website [2] for more information on setting up dokuwiki.
+
+    Dokuwiki's default config leaves editing wide open, so please read the
+    acl [3] and user [4] documentation before proceding farther. If you use
+    the plaintext authentication, you may need to do the following:
+
+    $ cd conf/
+    $ cp users.auth.php.dist users.auth.php
+    $ cp acl.auth.php.dist acl.auth.php
+    $ chown apache:apache users.auth.php acl.auth.php
+
+    This enables apache to write to the files for editing the acl/user
+    creation capability.
+
+    If you're updating from an older version of Dokuwiki or want to learn about
+    other authentication methods, check the documentation about authentication
+    backends and plugins[5].
+
+[1] https://www.dokuwiki.org/config
+[2] https://www.dokuwiki.org/dokuwiki
+[3] https://www.dokuwiki.org/acl
+[4] https://www.dokuwiki.org/plugin:authplain
+[5] https://www.dokuwiki.org/auth
diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
new file mode 100644
index 000000000000..6cbe76a6b937
--- /dev/null
+++ b/www-apps/dokuwiki/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jmbsvicetto@gentoo.org</email>
+		<name>Jorge Manuel B. S. Vicetto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<longdescription lang="en">
+		DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
+		creating documentation of any kind. It is targeted at developer teams,
+		workgroups and small companies. It has a simple but powerful syntax
+		which makes sure the datafiles remain readable outside the Wiki and
+		eases the creation of structured texts. All data is stored in plain text
+		files - no database is required.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/dotproject/Manifest b/www-apps/dotproject/Manifest
new file mode 100644
index 000000000000..69b57d6c113e
--- /dev/null
+++ b/www-apps/dotproject/Manifest
@@ -0,0 +1,7 @@
+AUX dotproject-2.1.7-pear-date.patch 1755 SHA256 3880c324cc829c5f47bcd04c2a8e6d86ddde3c6ecbd4eb162a5aa4af50d9e7b3 SHA512 fca1ffba1bd9df2b49b1e8fd129c807bfaca1f5c847b862fe5b8b159f243e116d7e21f5445c6383d0ac0bfd6e5ed480da10c5c78c5b10f62862f759c8078446b WHIRLPOOL d20b216fb610914c0a5292a68be108234070ffcbc2b6a564d83afd78cd1ca926feeafaecc834a75e62dca6c8c44e9c82b6f358dbbe574448016aae1bfa5c1609
+AUX install-en.txt 609 SHA256 d549f68d108393e1f21f463dabbc82d28844243bf16800bbd8b73fb5d3a2ab41 SHA512 ad00eb64e70702f032f2f0c8f17daf8263659982d24b554e18c70a59e2dbbcdb14f36f3f245faf36e1ec36e3676954975d00c4f9256ddc2b7bf1899e77c961dc WHIRLPOOL fb0bb637205adce6ec47c0fed24e1ebc900dc3cccb0390d5bdb3131886ac4b91fab4da7ac894ac11d248d9c9ca80690ba7f09aab0b85edfef6b47705cf32f95a
+DIST dotproject-2.1.7.tar.gz 4528969 SHA256 1c55e2bfa50f543c4f6fb877870fa99ffe2abb3971aa8ab53c03b25a578a9a74 SHA512 887637d8b66096ca0313dd257de44f2afef587c795cb8009861698f799db4e09677f6cd7e5ee57d3655e81219e25257c379deafac77003bf7e6f82e70eef8f58 WHIRLPOOL ee158b755338e44148913765c58becca1394f1e0bd6218be7636949c64db26f9dfa0ae219d1aee77158e31d72290c68681146b44538bed79ae538bf48076a59e
+EBUILD dotproject-2.1.7-r1.ebuild 970 SHA256 6684379ae91903d36b287500194f3e36f0a11d533e31c1e22f32dc96a0354155 SHA512 d8356469fafb5d313f786ffe5d2173ae4d7a1424e3dc8b14b9aeef248acdf6d47583babee5e88e977aaf0ca516b85cdeadd72d0bd1739988bab4482ba4eb7a4e WHIRLPOOL d85efead28ab2a9ab0a94357cf29f45d90645eb98948ba1f74ccb1e0d793603d238127b9927d852107702e19b8dbed2e2298876e99bfab6346402f90e33a2755
+MISC ChangeLog 2767 SHA256 6309a13c8a66f55372b163005edc71ea663e0567c02475588741e5b08ed19437 SHA512 496529d89dbeb1d104a44897f1b9667e8c6a73aa870aed9249adf395f266e7b93fedd4a9a3897b981f88ac34e3c19388708a17cd6b5eded3b01d550f1bf22de7 WHIRLPOOL fadef6515204c5ac075e81cd9bc372e83c191a51e06ce8d71a6bcfe8e2dc894a217250a1052621086bdb01419a7905a803c5b28b5df30248f57cbd71f2bb10bd
+MISC ChangeLog-2015 4016 SHA256 e85264adb1bbe808b1d570c46193da556407bdbfbb1a3a045b283f0f0b6abfaf SHA512 aaa5f1f471e62f53cad3a5ab9e7aaa04b1a096f6fb1e413fb8b53368dcb162e9da615ca24c84d3316679f3b1e395f790135f7812444c3df6fcf606fed47fb88a WHIRLPOOL dfbd4e9931915fd3f9e68ff4518dfd543041e465837a2e26b4f63a1a5539dcdbf17b4ce8a6ac4134123288283349ba8eae1eb08335123ed9e231b71f5176a9e1
+MISC metadata.xml 330 SHA256 87c388e237de1a1ce7cc57ebd06a958399956351cb919e3b665e5b25f7267b5b SHA512 2ebc3fc3cc42efad9475207bb7680c9fcf60d05ec532a1b3f30b0bdb00d811f34b12eb6a8deb01335ea04f24376de5d3a68648f891e2c9055cdf2ce21b9f72b7 WHIRLPOOL fc99563d8c1682fe62962c84de4ccb4a473c5bf7d9184647ae2880d080f43f972f1af8be0c00d8bb6fc3b8c538487d0c49e33a44ed613f52ca51eb8be65be729
diff --git a/www-apps/dotproject/dotproject-2.1.7-r1.ebuild b/www-apps/dotproject/dotproject-2.1.7-r1.ebuild
new file mode 100644
index 000000000000..dc826c296f7a
--- /dev/null
+++ b/www-apps/dotproject/dotproject-2.1.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils webapp
+
+DESCRIPTION="dotProject is a PHP web-based project management framework"
+HOMEPAGE="http://www.dotproject.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-text/poppler[utils]
+	dev-php/PEAR-Date
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pear-date.patch"
+}
+
+src_install () {
+	webapp_src_preinst
+
+	dodoc ChangeLog README
+	rm -rf ChangeLog README lib/PEAR/Date.php lib/PEAR/Date
+
+	mv includes/config{-dist,}.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/includes/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/files{,/temp}
+	webapp_serverowned "${MY_HTDOCSDIR}"/locales/en
+
+	webapp_postinst_txt en "${FILESDIR}"/install-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch b/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch
new file mode 100644
index 000000000000..a907589f00e2
--- /dev/null
+++ b/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch
@@ -0,0 +1,39 @@
+diff -u -r dotproject/classes/date.class.php dotproject-patched/classes/date.class.php
+--- dotproject/classes/date.class.php	2011-03-10 06:11:25.000000000 +0100
++++ dotproject-patched/classes/date.class.php	2013-01-03 12:35:36.598020904 +0100
+@@ -8,7 +8,8 @@
+ }
+ 
+ 
+-require_once $AppUI->getLibraryClass('PEAR/Date');
++#require_once $AppUI->getLibraryClass('PEAR/Date');
++require_once 'Date.php';
+ 
+ define('FMT_DATEISO', '%Y%m%dT%H%M%S');
+ define('FMT_DATELDAP', '%Y%m%d%H%M%SZ');
+diff -u -r dotproject/modules/calendar/calendar.class.php dotproject-patched/modules/calendar/calendar.class.php
+--- dotproject/modules/calendar/calendar.class.php	2012-06-19 11:05:19.000000000 +0200
++++ dotproject-patched/modules/calendar/calendar.class.php	2013-01-03 12:36:10.898019883 +0100
+@@ -7,7 +7,8 @@
+ ## Calendar classes
+ ##
+ 
+-require_once ($AppUI->getLibraryClass('PEAR/Date'));
++#require_once ($AppUI->getLibraryClass('PEAR/Date'));
++require_once 'Date.php';
+ require_once ($AppUI->getSystemClass ('dp'));
+ require_once $AppUI->getSystemClass('libmail');
+ require_once $AppUI->getSystemClass('date');
+diff -u -r dotproject/modules/projects/projects.class.php dotproject-patched/modules/projects/projects.class.php
+--- dotproject/modules/projects/projects.class.php	2011-06-20 13:07:49.000000000 +0200
++++ dotproject-patched/modules/projects/projects.class.php	2013-01-03 12:36:12.709019829 +0100
+@@ -10,7 +10,8 @@
+ */
+ 
+ require_once ($AppUI->getSystemClass ('dp'));
+-require_once ($AppUI->getLibraryClass('PEAR/Date'));
++#require_once ($AppUI->getLibraryClass('PEAR/Date'));
++require_once 'Date.php';
+ require_once ($AppUI->getModuleClass('tasks'));
+ require_once ($AppUI->getModuleClass('companies'));
+ require_once ($AppUI->getModuleClass('departments'));
diff --git a/www-apps/dotproject/files/install-en.txt b/www-apps/dotproject/files/install-en.txt
new file mode 100644
index 000000000000..049fdc4da7e5
--- /dev/null
+++ b/www-apps/dotproject/files/install-en.txt
@@ -0,0 +1,17 @@
+You will need to provide a database for your dotproject installation.
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+http://www.gentoo.org/doc/en/mysql-howto.xml
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install
+
+and provide the credentials required for the database access.
+
+Note the administrator password dotproject will provide and after
+logging in with these credentials you can start to use the application.
diff --git a/www-apps/dotproject/metadata.xml b/www-apps/dotproject/metadata.xml
new file mode 100644
index 000000000000..d66b5239964e
--- /dev/null
+++ b/www-apps/dotproject/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dotproject</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
new file mode 100644
index 000000000000..44adc638d6b5
--- /dev/null
+++ b/www-apps/drraw/Manifest
@@ -0,0 +1,8 @@
+AUX postinstall-en.txt 137 SHA256 433a5ba1d31484646faea29ad158ae674c487cff8d867d7818fcc97ca0430041 SHA512 17286b3758a6f2606b80ae493725647128b6f7ebce3318c3ffcf7ce13e4bc14c730013ec4633421630cdfbbd1eaa7310587066fac8063a777221d4b31581bffe WHIRLPOOL 7d7609682d3c22722ba52ec43af83d6831ef920f4b607d500bea200d8181f68163a7fa8d4d9832b112dfd89f854f1e83b39816412eb51c2002fe0e1542c194b5
+DIST drraw-2.0.1.tgz 40970 SHA256 4fb52e116635951a5767be08b589c34633095394f94c7df5cbc2b8b88cc41c69 SHA512 35f03864aae70812a5afd948c0f159f4fb873501117c3f8dfc8a227c2b3067d03e9d3bd524f74277750d0ba4f922770a73d8657548e7ee0eda1281b543202020 WHIRLPOOL 3b69228cdb5a69e01546ce80e84b3cc1b621ce1f0e142654c56f6e6073d4ad1a59bc9aaa542c1212f692a9991585124af438d715dee8ccf6b20671cc161d3953
+DIST drraw-2.1.3.tgz 45970 SHA256 c3290781426f81327632b4b0da80360882438f3d44cca81fdeaa3f9b22c3674e SHA512 2ac1ff34a4744a76aba0e3dfafcd0b6b4139bfaa20942965feef1434e72ddcb2f22f9e68d8f39b8fafe7ca252cbbb22e5ac9eb54ee1380f6aa251d48edded960 WHIRLPOOL 31ed238deacce376bfeed2da27b8ef34563e25aecfd4f794a3f3af2340e327611f03d632f771209bd4d743ba3ff39c5c2f40311a1c7f7ae4be0c4d2e5fa0bf65
+EBUILD drraw-2.0.1.ebuild 1027 SHA256 2d566877dafd19077481fe848a750613c9036eea22ba7a53cf45b47ee2e40097 SHA512 2a6ba1986c312c0601e1f6a907131d1acc89ab50c2a2ff8165d4318a8b358dbce5ebb33476357394d46f4ba190a4882af29fa5ff2ca889321d70dd0f064a3b89 WHIRLPOOL df6ffcd7fc8f6dc401fb62b3c47e92a3769481b576945251f4ed7d4db0a944921b85bd60d8d2dce6bf9578460130d5d59c8edeea7935b6f29977807d1b4562b6
+EBUILD drraw-2.1.3.ebuild 1034 SHA256 4a957a9a36da0fc8d839d1544b44dc910e47ed0204374ecb63027759a3156a07 SHA512 ae8c6048b1ab1c5b071b77195e1a09153b85b7defc97ed6f3f840efb741b4a7b66c2728322ffd0ed452cfab23f8e68c94d22e4529e495773569a01ffdb3a2bbe WHIRLPOOL bcad0ee3399263ce3cf8a9123c413547eeff58e19bb2b22dc76c224537d40e01c4f3c10f414ad4f56c293c6079d21655f935ca809e49ce1ef469075dc23becee
+MISC ChangeLog 2496 SHA256 8729878c353142edcd40b7a4f3d63a68d46ab780716718c291aeec3c3c4c6882 SHA512 060eecbb59f09522527cbd717e39985116a1022009b6ae86ae39112f81666c2e3c90cf06b3ed0ca6cba4ce5a2ad188926fae4d9ef9e9aca128ae11e8572746f8 WHIRLPOOL 829876fad1285dae5ce461accfcc9f9fb7558c893294e4381908481f574ef5bfbfc9291d703bc3a777b21266c14c89b2c7388aef1acd205c5d719353433445c9
+MISC ChangeLog-2015 1425 SHA256 2ba1be1a8475c4ec84a8e5945e6176af71c637366d2b4652377bfbd89c1afcf4 SHA512 41b50320dd8a75fc6f6e525007b34d5ce0348ae56bb9b800e1815cae5a6f5e2591d36a5754c8041f560457441f8c9c3ed57e91aa8a87ed82bcf92f329f551660 WHIRLPOOL 01dd138667ab7110444507cf247f77ce85482bb2e2f2e5aa4dcb19933d6b4a7604d5b80d391e7f8a382f4fda5910b8fe271aa6c1433f6e56325a4cf5a3c722b9
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
new file mode 100644
index 000000000000..db9c7e1cb1c1
--- /dev/null
+++ b/www-apps/drraw/drraw-2.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
+HOMEPAGE="http://web.taranis.org/drraw"
+SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ppc"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	dev-perl/CGI
+	>=net-analyzer/rrdtool-1.0.47"
+
+need_httpd_cgi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
+	sed -i \
+		-e "s|/somewhere/drraw/saved|/tmp|" \
+		-e "s|/somewhere/drraw/tmp|/tmp|" \
+		drraw.conf
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGES INSTALL README.EVENTS WISHLIST
+	rm CHANGES INSTALL README.EVENTS WISHLIST
+
+	insinto "${MY_CGIBINDIR}"
+	doins drraw.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe drraw.cgi
+
+	insinto "${MY_ICONSDIR}"
+	doins icons/*.gif
+
+	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
new file mode 100644
index 000000000000..6682f05f4365
--- /dev/null
+++ b/www-apps/drraw/drraw-2.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
+HOMEPAGE="http://web.taranis.org/drraw"
+SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	dev-perl/CGI
+	>=net-analyzer/rrdtool-1.2.1"
+
+need_httpd_cgi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
+	sed -i \
+		-e "s|/somewhere/drraw/saved|/tmp|" \
+		-e "s|/somewhere/drraw/tmp|/tmp|" \
+		drraw.conf
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGES INSTALL README.EVENTS WISHLIST
+	rm CHANGES INSTALL README.EVENTS WISHLIST
+
+	insinto "${MY_CGIBINDIR}"
+	doins drraw.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe drraw.cgi
+
+	insinto "${MY_ICONSDIR}"
+	doins icons/*.gif
+
+	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/drraw/files/postinstall-en.txt b/www-apps/drraw/files/postinstall-en.txt
new file mode 100644
index 000000000000..87ca1040a9d4
--- /dev/null
+++ b/www-apps/drraw/files/postinstall-en.txt
@@ -0,0 +1,3 @@
+Now edit ${VHOST_CGIBINDIR}/drraw.conf
+You may want to edit the CGI executable in ${VHOST_CGIBINDIR}
+to set the path to the config file.
diff --git a/www-apps/drraw/metadata.xml b/www-apps/drraw/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/drraw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
new file mode 100644
index 000000000000..c06502a4d5f9
--- /dev/null
+++ b/www-apps/drupal/Manifest
@@ -0,0 +1,8 @@
+AUX postinstall-en.txt 1595 SHA256 af706f90b7671b0b6e4577c48490a71f97f78d8876d84ccd69d48040a7b7340e SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760 WHIRLPOOL 8d210bb0de40134f2e82f43b6b6261f28454f79d69f38bea4c8e27a0ebb71cd59b0518aa24955a4623b29cd457364fca263c987ee4635ef934571897c3ce47e4
+DIST drupal-7.56.tar.gz 3277833 SHA256 02fb4b46060d53c2f876d2381a8741249819e3a02ea1d7291036f6ea280d7b69 SHA512 ab7ad8d9cb26e89b9d81280b1677584072db627d508ccade9442c95a90f24c94d11561013c8a7297ddae6ae43696d0b711b8c37ab98f89539f6f0e0154db6344 WHIRLPOOL fda209ecaf63d32cb665b31dc1aff994d0fea7ac542df331efff8c05e006a77463e7a420a1b1f8c9bffb375cf963db745e354ad5585cf4aa2ec92da68ed53352
+DIST drupal-8.3.7.tar.gz 12739663 SHA256 0a86d82878500f8512a624fb13736ddf82a1c8f424d9a45776ce6b10d560eeab SHA512 d454a51b2bc7ffbad3e461df1d2ea1f38797716b046a520ad65fab5f5c398091b28bc623d3efc2d18176e6506a95e113e1d5e5a0a76e50ca7f22a995920ea671 WHIRLPOOL 9ea7653dfd117f7552a12fdcbe96556a8a2cfe1e4bdc7386aff8882f8e43a9d3a097fd3ec98d0a77ab6d19079ecf1b09c8617cf8d69198f968a0fbe09dfd0dc8
+EBUILD drupal-7.56.ebuild 1773 SHA256 3e55b9bc42133d4828db9a25cef2eccd3dec073167384644eb5017402d070ae9 SHA512 fb9455f1a3364666966890be63bd443020c3a234234809387912130590c72c63029ac6b54b3db6367cfd1ca4f9c99401c37c3c23a75b5c62dfd07158a535a847 WHIRLPOOL da2c418d28d49b130221d2143108c8ed2d3d70377f4caf161d35d1dfcf64e64eded760ed60c2902154289fdc841888eb13e8b341fbeaa31c88da8f128fd68ad5
+EBUILD drupal-8.3.7.ebuild 2428 SHA256 bf527904a96359bbad8aca7e0fb2d9cc45fed7de4b0e90c4d96dbcd35ea0593d SHA512 62d870e7b416ade4bee62d260c9518ada5077ceb8918ef40b5143d0644af1845f0e660208336e57d5cad7c63cc88ca1e6b185b0d3df9cc6c5ea4dae1efb3ab24 WHIRLPOOL bb20edaf9029933b5f2efa45004507969d542cfa37ae91f92bffe763e9ab2c55fec61ba914d4172c1f36408c418cd52aeff9cf980c8920b3c8972f021a9732c3
+MISC ChangeLog 10980 SHA256 048894042c2194430bef50f501566c1abea4e7caa14dfcccca052c3f06501ba0 SHA512 cb5c4edeeabe70cbc2595fd83fd07d90c94bc59dc4d1e071bad04a7d22b790f6e1f38d7380a245f8720ea8f441b147362e17d3d3a64f626393aa2a5cc74f990e WHIRLPOOL 4ab72289db5c154dd5184ebd3b0d6afedde66a073c459c64b85e7494f607eda3f36deab2bb4156baa31d96f5c7ba663da6a332aef31b31ab255fb02914658290
+MISC ChangeLog-2015 19643 SHA256 2bcae5da2b4af7aca7302af81ebb31eaf2f77e679b35f06f6d47a4eceff7e3e5 SHA512 b9f6bec92daad0641ad5a6fdc465afcb6ca7db82ad610820d7756e032cea04b8e55de597bccfd0ac788d72a88a2d346f305aa5af40f7f8920ca4f51e78df8f7f WHIRLPOOL f6642438c5868290887ff48d166abb78e7ec10403dd7d237cf5df25fea4a6779d818be9a38b015191eed234f4308b898cd48303a3e414818cf5058b42c946b69
+MISC metadata.xml 419 SHA256 20ba6ebfe05525e16aa1976f070f1cc2c77a68ff1cf0b1a8cb498a3c289143b6 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1 WHIRLPOOL da04d7e5b52ce5869a65a355db4ed0c90e27dfb421f17936a70fc8f72b872e165226eeec08665515b97deb4ba4bcfab28184bf2d756ec9c1bd439f0fbce5e61c
diff --git a/www-apps/drupal/drupal-7.56.ebuild b/www-apps/drupal/drupal-7.56.ebuild
new file mode 100644
index 000000000000..e740a5e30253
--- /dev/null
+++ b/www-apps/drupal/drupal-7.56.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+}
diff --git a/www-apps/drupal/drupal-8.3.7.ebuild b/www-apps/drupal/drupal-8.3.7.ebuild
new file mode 100644
index 000000000000..d0f9fcc2d95e
--- /dev/null
+++ b/www-apps/drupal/drupal-8.3.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
new file mode 100644
index 000000000000..f507dc323d7a
--- /dev/null
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -0,0 +1,41 @@
+You will need to provide a database for your drupal installation.  
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+https://wiki.gentoo.org/wiki/MySQL/Startup_Guide
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+and provide the credentials required for the database access.
+
+If you installed into a vhost, for the above address to be accurate,
+you need to pass -h "<host>" and -d "<install dir>" into webapp_config.
+The protocol is hardcoded, so you'll have to use https:// if you're
+using an SSL / TLS connection.
+
+SECURITY NOTICE: If you use SSL on your Drupal installation, you
+should enable the PHP configuration option 'session.cookie-secure'
+to make it harder for attackers to sniff session cookies.
+
+References:
+CVE-2008-3661
+http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-secure
+http://drupal.org/node/315703
+
+To run Drupal on a web server[1] other than apache, one needs to do
+some work, mostly related to adding the configuration in the .htaccess
+files to the web server config files and enabling redirection.
+For lighttpd you may want to check [2][3] and for nginx [4][5].
+
+ [1] - https://www.drupal.org/requirements/webserver
+ [2] - https://groups.drupal.org/lighttpd
+ [3] - https://www.drupal.org/node/43782
+ [4] - https://www.drupal.org/node/1030854
+ [5] - https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
+
+After that you can start to use drupal.
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
new file mode 100644
index 000000000000..0283916c75f4
--- /dev/null
+++ b/www-apps/drupal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+<use>
+	<flag name="accelerator">Add dependency on a php accelerator</flag>
+	<flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
+</use>
+</pkgmetadata>
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
new file mode 100644
index 000000000000..a1ba93dc2178
--- /dev/null
+++ b/www-apps/dspam-web/Manifest
@@ -0,0 +1,7 @@
+AUX postinst-en.txt 935 SHA256 9d864da422c9e28e8ac645a2534af7a885d22ff4b49e5b7ef938e8bb84ea81dc SHA512 b7a2253cf0c91c966f538ebf2bb839fbe2affef1c249c9bf7f3b32f07810195a502ff149f1cfebbf1abfc39c84edbfd0df7952ca7d21049bfe2175bd9456cb12 WHIRLPOOL 87bccc02668e678097b540e44569d070c6076fd4e2744d80a7ed1dfa27ec29c3666a1a0c0afbcd3ab0ccbf1d64465bffc7ba0dced6a35b9cba44b6b8eebbd16a
+AUX setperms 255 SHA256 85cfd1a8a6e322698c5e09573dfb4e04220e8642d1835e9a7eedbb809736e9ed SHA512 38bd7c199950a4df65e5583e84da1a776beecf6a2726dc483663b282b29bfd8d80a86ff680850f1ff6b8fc10e8a049c1efd666377c157f2726c665246884a1ed WHIRLPOOL 4f57c0aa60ac7b090168b2c0ddb099f949477d261f2d1d00616792bdafa219f5a900e02399ec312a41d08487de6750c2e95d9553ac2cc641f730c52d3a025a87
+DIST dspam-3.10.1.tar.gz 1044198 SHA256 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063 SHA512 44c8ee6df058ed6b9c97722201bcd99645f93dd697676b2480a221280d8d1bc64c6eb03d4c69eede7c54028bbfc4583e7bbd7c4607587bcd037a559e868040ee WHIRLPOOL 9e422324150d34295b1dbc4caaaca408711a15d23a4f488c2950921829f5c44f5a719a93ae5160d3f26822efd0f70809697dab0607fde7e25857dc63866faa19
+EBUILD dspam-web-3.10.1.ebuild 1698 SHA256 e04627b4db55aa28c09b778fe1cb981d1bb05cf26bfebae8aacebd26b791b2fc SHA512 37e20d57b8f6c2220deca084b02fddfc5c77c50b3d2010f9ba3f11daaf1b24b5865c2dc74ddb1194a9b4ee79bcd515e8aec01975fcaad908081bcfb19c1f8106 WHIRLPOOL 6510f2b17f0c6ccfca23c103a8cba2d2d5e83adc2a075445e1500e5a18d10166a4821a0ec5987754d605ad1e6cc1ca6fd810cfd85b528d0eb3e4bf9e7c657a01
+MISC ChangeLog 2476 SHA256 e7f0858e4377f8d5ed40e34f331a68c1197647b266b3d65d53c24ce3abbd6d80 SHA512 7f18ee3dd4fa62473903d9bbb85b77a4145230223d5cbd6ed0d8f77a9ca699910b7e729c71ec2909a69777c43b0c1a0a97b1adac44925d9d60e9ac3155a22175 WHIRLPOOL bcfcbd2404066b632d83139eff89375352e911a705367914c1efd7fcd816bbad19c29814be19e32224c9f3540cea591ec1c5bbc131bd2a4fb917fb6e991d9876
+MISC ChangeLog-2015 7711 SHA256 c74ac6ad1882849643c6bb2e33226143e20b7fbd751fd7ef9b341250608c1c07 SHA512 065b99fe02563e26d3efa17c8bfecfe316d57c795c9beb46680bccfa319e042cb5be03bf093ab30bbf4e9e56509db65fcb230496deed3939c629f6f3bc76c7c7 WHIRLPOOL 255c979b60ecfb3e1ba5a2e9ee605f349734ac0ed2052c2ab1a60c8fcda5ddbdbb400863b4e48781fec7f4d20ac76e5f006d0ea9be6704c5c9fde2475e48f295
+MISC metadata.xml 364 SHA256 311633420681aea721f8632da35ba8643d664b58778f80f68d576148625a0cf8 SHA512 a30327548152850c82f53069bf25d9742e5e56d2f476923411526208e1c92a181ebdb3fe7f7f0a3538560b88d8f2686842034999e7d4b22a84f7f30a260aef0e WHIRLPOOL 792e17b3fbd0615cd5b7c5442bca685d7cbc4eb5cdcb1c0319468a5bb403c37dd8f455e45a456e1fba9fb1a4ff78f6807024bb55b8a2d7dd9f013f7d0a05b1a7
diff --git a/www-apps/dspam-web/dspam-web-3.10.1.ebuild b/www-apps/dspam-web/dspam-web-3.10.1.ebuild
new file mode 100644
index 000000000000..7ab4583673b5
--- /dev/null
+++ b/www-apps/dspam-web/dspam-web-3.10.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit webapp
+
+DESCRIPTION="Web based administration and user controls for dspam"
+HOMEPAGE="http://dspam.nuclearelephant.com/"
+SRC_URI="http://dspam.nuclearelephant.com/sources/dspam-${PV}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=mail-filter/dspam-${PV}[-user-homedirs]
+	dev-perl/GD[png]
+	dev-perl/GD-Graph3d
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil"
+
+need_httpd_cgi
+
+# some FHS-like structure
+HOMEDIR="/var/spool/dspam"
+CONFDIR="/etc/mail/dspam"
+
+S="${WORKDIR}/dspam-${PV}"
+
+src_configure() {
+	econf \
+		--with-dspam-home=${HOMEDIR} \
+		--sysconfdir=${CONFDIR}
+}
+
+src_compile() {
+	cd webui
+	default
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cd webui
+	insinto "${MY_HTDOCSDIR}"
+	insopts -m644
+	doins htdocs/*.{css,gif}
+	insinto "${MY_CGIBINDIR}/templates"
+	doins cgi-bin/templates/*.html
+	insinto "${MY_CGIBINDIR}"
+	doins cgi-bin/{admins,configure.pl,default.prefs,rgb.txt,*.cgi}
+
+	webapp_configfile "${MY_CGIBINDIR}"/{admins,configure.pl,default.prefs,rgb.txt}
+
+	webapp_hook_script "${FILESDIR}/setperms"
+	webapp_postinst_txt en "${FILESDIR}/postinst-en.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn "If you're using apache dspam-web's config requires the scripts in the cgi-bin"
+	ewarn "to be run as dspam:dspam. You will have to put a global SuexecUserGroup"
+	ewarn "declaration in the main server config which will force everything in cgi-bin"
+	ewarn "to run as dspam:dspam."
+	ewarn "You should use a dedicated virtual host for this application or at least"
+	ewarn "one that don't have any other cgi scripts."
+	ewarn
+	webapp_pkg_postinst
+}
diff --git a/www-apps/dspam-web/files/postinst-en.txt b/www-apps/dspam-web/files/postinst-en.txt
new file mode 100644
index 000000000000..500f5002abc2
--- /dev/null
+++ b/www-apps/dspam-web/files/postinst-en.txt
@@ -0,0 +1,32 @@
+Define your virtual host like this:
+<VirtualHost *:80>
+	DocumentRoot ${VHOST_HTDOCSDIR}
+	ServerName ${VHOST_HOSTNAME}
+	
+	#Use dspam.cgi as main index
+	RewriteEngine On
+	RewriteRule ^/?$ /cgi-bin/dspam.cgi [redirect,last]
+	
+	SuexecUserGroup dspam dspam
+	ScriptAlias /cgi-bin/ ${VHOST_CGIBINDIR}/
+
+	<Directory "${VHOST_CGIBINDIR}">
+		Options FollowSymLinks ExecCGI
+		SetHandler cgi-script
+
+		AllowOverride None
+		Order deny,allow
+		Allow from all
+
+		AuthType basic
+		AuthName "DSPAM Control Center"
+		#For those lucky enough to have a LDAP authentication database
+		AuthLDAPURL ldap://localhost:389/ou=People,dc=yourdomain,dc=com?uid?sub?(objectClass=posixAccount)
+		Require valid-user
+	</Directory>
+</VirtualHost>
+
+The configuration files are:
+   - ${VHOST_CGIBINDIR}/configure.pl
+   - ${VHOST_CGIBINDIR}/admins (super-users of this service)
+   - ${VHOST_CGIBINDIR}/default.prefs (not used by those who use MySQL or PostgreSQL backend)
diff --git a/www-apps/dspam-web/files/setperms b/www-apps/dspam-web/files/setperms
new file mode 100644
index 000000000000..91c4fcf10fdf
--- /dev/null
+++ b/www-apps/dspam-web/files/setperms
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [[ "$1" = "install" ]]; then
+	chgrp -R dspam "${VHOST_CGIBINDIR}"
+	chown dspam "${VHOST_CGIBINDIR}" "${VHOST_CGIBINDIR}"/*.cgi
+	chmod -R ugo+r "${VHOST_CGIBINDIR}"
+	chmod 0755 "${VHOST_CGIBINDIR}"
+	chmod ugo+rx "${VHOST_CGIBINDIR}"/*.cgi
+fi
diff --git a/www-apps/dspam-web/metadata.xml b/www-apps/dspam-web/metadata.xml
new file mode 100644
index 000000000000..55f6db411c72
--- /dev/null
+++ b/www-apps/dspam-web/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+<longdescription>Web Administrative interface for a statistical-algorithmic hybrid anti-spam filter</longdescription>
+</pkgmetadata>
diff --git a/www-apps/eyeos/Manifest b/www-apps/eyeos/Manifest
new file mode 100644
index 000000000000..f2d17255cfdf
--- /dev/null
+++ b/www-apps/eyeos/Manifest
@@ -0,0 +1,5 @@
+DIST eyeos-2.5.tar.gz 27820727 SHA256 d7ae68977e8cfd2f012f0541e840a6cc51a7a768b5ab6cc6938cc70fdc400f98 SHA512 8e2ecfff6fcde5dd7a54b260b7fdf9020892d8ca070125646a20c898329a255178fa627b10d54bbc5f98d1aede30c1f3e7afa1fcb6f434dd5a710fa6f46feac1 WHIRLPOOL 4556f9c45c3dc08e5cedc58c6c85788613d18949b60473f7123e304bcfa2c2816c0ab7b3d318904bc03291007a7aef33b6de3978caa86340979e6dbc0b42d95b
+EBUILD eyeos-2.5.ebuild 1242 SHA256 5ea372c7684bc15515c918b6474e8ab5b6fb30c191ef41b8ca30d5e33833e6d1 SHA512 e5a99f951a2374e84a698b73eb565e8d94e20fc02d80ae8b7b7fc57fe56cd5bbdf40dcb65519a856a666f2a5c96c2906a43ff0ce3115228ac6dc5461ca3db48c WHIRLPOOL f49e83c31dff11259d1e210048679545755860cd7882fdb30b98b7c0bbd4bde57885c3979aa1c6c5f1876bd30d05c4c4ef29bc301fa72cf474cc77bed2bf8313
+MISC ChangeLog 2166 SHA256 d29c15e43a2bb2b99d59818a7eccfb97e0faaff73f9dbb654060b92868032067 SHA512 15939081c23509cd45794b2fc499df1c242aca7c902646905055ca674e9115aa5dd0c59c6fe325c9c0e769f6e813aedd59b151f597d2a8a29a0c9e6d99858ca0 WHIRLPOOL f88d4d21f7bae9aa3349c79ef7ae4f08c4033f5ead3b25709663d9e18783234add540e71c801c30315bc9b0c829c8cf95efbb7028400a97c5f79c3bfca722362
+MISC ChangeLog-2015 2463 SHA256 f1a7a110cc2f87f3cb5cdffd617c2fc553eb8d7500de792ad68d2eacb8dd07c5 SHA512 6cde9f7915d49740fe19ec77202b1899baef019b3ca0990a6d4e7f67c029394e9844991f989a08fa90c088e3413f4771017211c8583508c55a003db36de41d43 WHIRLPOOL 7562698ec4f55c45c3dd0c34ff18a9af437495e23ba4af8e67f3728ccef1bad666b11638e22429e21b05092905899b8efa28f11eff9ec2ce6cdebddaf0ee92ff
+MISC metadata.xml 624 SHA256 e538c9874775fc69a50d43a96e0f6a42fce680f8d53a4b35c3cbba1bf7b9524f SHA512 df72301f8bd966901b35477fe3ee2e30cdc546fc5bbdca0f18111627b095dcb9023dbd7b6d442588f9ec79f56bf09afa9f3b2a62b2e5c24dbe286ab3cf181143 WHIRLPOOL 6f6ae4453ce6c6b7c25d5a63b88ddcc062902e1ea4f8535a0167d4df530ccbb026beeb5645e04b6d1ba15d8bb39e7ddbcb9ea01286a0902d60e96046d83aee30
diff --git a/www-apps/eyeos/eyeos-2.5.ebuild b/www-apps/eyeos/eyeos-2.5.ebuild
new file mode 100644
index 000000000000..9f40ac764ad3
--- /dev/null
+++ b/www-apps/eyeos/eyeos-2.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit webapp eutils
+
+DESCRIPTION="AJAX web-based desktop environment"
+HOMEPAGE="http://www.eyeos.org"
+SRC_URI="mirror://sourceforge/eyeos/eyeos2/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl,crypt,gd,json,mysql,mysqli,pdo,sharedmem,sqlite]
+	virtual/httpd-php"
+
+S=${WORKDIR}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Placeholder for first install
+	touch "${ED}/${MY_HTDOCSDIR}"/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/settings.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/settings.php
+
+	# Ugly, but eyeos needs write access in too many places
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/system
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/tmp
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/users
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "To finish your install/upgrade, point your browser to the eyeOS installer at:"
+	elog "	http://${VHOST_HOSTNAME}/${PN}/install/"
+	elog "Specific extensions may require additional packages (available or not in"
+	elog "portage), check the installer output"
+	webapp_pkg_postinst
+}
diff --git a/www-apps/eyeos/metadata.xml b/www-apps/eyeos/metadata.xml
new file mode 100644
index 000000000000..8b1ff2f2c914
--- /dev/null
+++ b/www-apps/eyeos/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>eyeOS is an open source web desktop following the cloud computing concept, written in mainly PHP and XML. It acts as a platform for web applications written using the eyeOS Toolkit. It includes a Desktop environment with more than 60 applications and sys utils</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">eyeos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
new file mode 100644
index 000000000000..76956c6b2913
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/Manifest
@@ -0,0 +1,11 @@
+AUX freeradius-dialupadmin-1.70.3-sqldebug.patch 370 SHA256 ee25d726bddaa4b29d8146a5d1574e0253a4dbb1786fcfaa4903e9bb8735f844 SHA512 41b4902a452bd051e4e4b80b8661154806f276da99b0fa17baee0f9c45927b6abd41815fc19f8a89b481e7855eaf92c1bff3e53c4deaa5b9dc1d00c7626a7297 WHIRLPOOL ed6d165f96fe1d856985a21cac9467bedd1f7866208a0c51de50441442f12185c2247b3c331ee5ba9532b34b75ffb4c48aec33708d9afd6d8c0ff489e9fff186
+AUX freeradius-dialupadmin-1.80-gentoo.patch 1162 SHA256 0efb7da6e8d37214c7042a5e5f96cee0649e79094abde5a0a89a2024e2d7f17d SHA512 a6b0cc0601ea8365dcad2804d6130e95ef9258c0445b8a7a82583fb93f1b80fb6d8e264387219b891f47ee618ccf7912c6880af1d7bc06335a957324bdc4c36d WHIRLPOOL 3d3c199ff891ec5349004c660e9530670f06e0e1ec70a4e6b670506ced605254c79803b6859063afce6984fa21cd71f8c6d4fa65c9f7ce8ef301a37a063a702d
+AUX freeradius-dialupadmin-1.80-tmpfile.patch 8171 SHA256 268dc9012720a35741cbf7c59874274a3ebb9f48a0d53c7759ed14d174a75bb2 SHA512 5726e15b43ed52cd0f548933bc9c12fbcae8fb15a60e1ef0074bc7c2e4d85475145e4ddba669a84c7330f404e462d174301b11c9596c11e2f957e17fbaf97695 WHIRLPOOL 7fa482b05da0bf1b5bfb527b8bf42ddbe0840964df6e63fa565231aa409c2e00a8a8cd7b8f397b4b7667af67383a238c175b49d4af5b16fb09033f1f265a3dcc
+AUX setrootpath 200 SHA256 4088512950a512a6c1b02e0355e00750dca37136ec32611a0099d00fdbdd54de SHA512 efa8c8ca5242f2b51b46ab25876bdf4cc3ca789a706567cad5e6e8889bcc94fff8b6bebfa8e1416d9f7a6ce8c832f37b17261516d79b970619ba024d8be10f38 WHIRLPOOL 222fb07dd00d10541019db58b4e50c244beaa864f831cc35e7d12b906fb94cebdf4e197b1bb200b4183b5a72ea25467beeb3cf1d176dadb61fab0e79f12cdba4
+DIST freeradius-1.1.6.tar.gz 3175652 SHA256 d503bac14ca37eab4798f6ab3dbdfb744aa846f7dc76ded45966d127948e71f8 SHA512 437a1705d559849bce3c11216b0b25392668ee96300d455a2ae92b6ca233f0308eca62c06d659f26900509855237f7d17c5eb566b13bbc4cda8999a18da4b8a1 WHIRLPOOL ad484519bb073fe6e399477b2b9cc2c1d38d4a75efaa77d4516fb29a4ccc2d4cc7f8f92df697fa79b8c241d1639478bcddc79b4a57ccab3eb94a6bb0b12a48f7
+DIST freeradius-server-2.1.1.tar.gz 3648766 SHA256 48139053bd4498e6ef0535178059286fafd5ad6642b0348936060fd373194147 SHA512 68f9abda7f3219ab2be6393021866ac3fda5302aa2cae85877666f3db86a09f293286003815e596cb1dfd67479b6577f7568d412953b7a2d22a7cbdc00c71b88 WHIRLPOOL 47a7b98009f6d71b8e38420b441b477713b6cf3aaca52e66d92d593b2f97744030e0ee668e1080a452b7bfe2d186ffaba5309fd4decdd6048f6fa8d3d52d460d
+EBUILD freeradius-dialupadmin-1.70.3.ebuild 1879 SHA256 6e52fe4c2105d5e420ffdbde22e2c84641af999356cbc4135eeaae461d55a5f2 SHA512 a74d0724cf2a9b453ea46ae53d9e268804fe9efed5aba1752d630ef2ceeea5dc56f39d7f64705934578beeccaeecc9cc675b5b7b92aede12735b2e5b190c6906 WHIRLPOOL abf68f71f5e622f3e5b4b155c57a928795a1327950d2e39bf3bd3d2dce0b35435ebdd78d0eb5e082db63e93957ff61e85d26b304dcf20e6cb5a2528e06007120
+EBUILD freeradius-dialupadmin-1.80.ebuild 1952 SHA256 52de6259b14b33b600d0c5fe67546f1dae1fe46a0a47b5be2baaf67f30d307ff SHA512 e423fb6e5f727a97c6d00211f6e71b67f1df96032696d8774f027b32877865485708461ae300f8eab01c8081d230a66b2c16bf0a85b8ea3ac7634be1e1f91048 WHIRLPOOL 355d6e79245e06fdcfc370a7807a78306b4ad00378936d331ba62108776414024b9c3af23f3a276de837e104c18991361a4f6c5bb54d48b94c1dab32a94ab089
+MISC ChangeLog 2972 SHA256 45f7ca391c87260bb4c1db6a0bdd39ab631d9974d0bab492862fbdbcab079864 SHA512 d6e74e2179311064e341fffb4414e670299e210b6790462ff33dd5425e4eb2447baffed455bd7a6e9ae03798ce3f67c1235e5a7518bb29c32f40ca7e9d71eb45 WHIRLPOOL 45df43b0d16f272938c9163edf0d549ab5cb978fac9bbf102a33341e8da26694c4ccab5679a4d367f039208f419f2fa5e3052d3abe035fab0b627cac433d5085
+MISC ChangeLog-2015 2512 SHA256 d61f24b26151b2bf94acd194b6ebf69d7473304679be874717198108332af861 SHA512 1166b5ab47add27284cd98f33399ddc66243dede10193202ce685a10971dd0de7402110db71dc9843554ef95ddd2a01fd7dd040b1d8aed2691b34e835e135c79 WHIRLPOOL b2eee5284df86141fec279cb1cb7614b8e94d439cc0dd72e73ba4ae0c9e5f750ab17211aa0120eb400f8b4f2ce81f35c482e55bdbd6faec4f50e5658b4d27af0
+MISC metadata.xml 534 SHA256 95e4bfb933911abd22acf3ad7bd0481b01bf6a538c470f41e8db5ded0525c164 SHA512 546c777bb50229dcf29c18d4f62a78c20e2715e49f97134c397133d632423b683426da3f37ceb7e1ccbcf392ed4dce6e5c97fb702d256a71844b09db074c845e WHIRLPOOL 9366c4b2f9bf9fe3a1a0134483c43ec8c883a92b438c4fdf2a2e3f0fbd10f79b17ed7bfada2e2f06160f075ec6e2535d18c04eae68367f9ab749d0e255a36b18
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
new file mode 100644
index 000000000000..1fab1838917b
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
@@ -0,0 +1,11 @@
+--- dialup_admin/conf/admin.conf~	2005-07-24 17:32:01.000000000 -0400
++++ dialup_admin/conf/admin.conf	2005-07-24 17:32:24.000000000 -0400
+@@ -247,7 +247,7 @@
+ #
+ # Uncomment to enable sql debug
+ #
+-sql_debug: true
++#sql_debug: true
+ #
+ # If set to yes then the HTTP credentials (http authentication)
+ # will be used to connect to the sql server instead of sql_username
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
new file mode 100644
index 000000000000..7501ba11f1e4
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
@@ -0,0 +1,32 @@
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/Makefile freeradius-server-2.1.1/dialup_admin/Makefile
+--- freeradius-server-2.1.1.orig/dialup_admin/Makefile	2008-10-12 10:13:16.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/Makefile	2008-10-12 10:16:16.000000000 +0000
+@@ -4,7 +4,6 @@
+ # Version:	$Id$
+ #
+ 
+-include ../Make.inc
+ 
+ DIALUP_PREFIX := /usr/local/dialup_admin
+ DIALUP_DOCDIR := $(DIALUP_PREFIX)/doc
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf freeradius-server-2.1.1/dialup_admin/conf/admin.conf
+--- freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/conf/admin.conf	2008-10-12 09:14:12.000000000 +0000
+@@ -204,7 +204,7 @@
+ #
+ # Uncomment to enable ldap debug
+ #
+-ldap_debug: true
++#ldap_debug: true
+ #
+ # Allow for defining the ldap filter used when searching for a user
+ # Variables supported:
+@@ -274,7 +274,7 @@
+ #
+ # Uncomment to enable sql debug
+ #
+-sql_debug: true
++#sql_debug: true
+ #
+ # If set to yes then the HTTP credentials (http authentication)
+ # will be used to connect to the sql server instead of sql_username
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
new file mode 100644
index 000000000000..1da5671761ff
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
@@ -0,0 +1,148 @@
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct freeradius-server-2.1.1/dialup_admin/bin/clean_radacct
+--- freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/bin/clean_radacct	2008-10-12 09:29:50.000000000 +0000
+@@ -5,6 +5,7 @@
+ # Works with mysql and postgresql
+ #
+ use POSIX;
++use File::Temp;
+ 
+ $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+ $back_days = 35;
+@@ -42,11 +43,10 @@
+ 
+ $query = "DELETE FROM $sql_accounting_table WHERE AcctStopTime IS NULL AND AcctStartTime < '$date';";
+ print "$query\n";
+-open TMP, ">/tmp/clean_radacct.query"
+-        or die "Could not open tmp file\n";
+-print TMP $query;
+-close TMP;
+-$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/clean_radacct.query" if ($sql_type eq 'mysql');
+-$command = "$sqlcmd  -U $sql_username -f /tmp/clean_radacct.query $sql_database" if ($sql_type eq 'pg');
+-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/clean_radacct.query" if ($sql_type eq 'sqlrelay');
++my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
++print $fh $query;
++close $fh;
++$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
++$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
++$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
+ `$command`;
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins freeradius-server-2.1.1/dialup_admin/bin/log_badlogins
+--- freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/bin/log_badlogins	2008-10-12 10:09:58.000000000 +0000
+@@ -14,6 +14,7 @@
+ 
+ use Date::Manip qw(ParseDate UnixDate);
+ use Digest::MD5;
++use File::Temp;
+ $|=1;
+ 
+ $file=shift||'none';
+@@ -29,7 +30,8 @@
+ # CHANGE THESE TO MATCH YOUR SETUP
+ #
+ #$regexp = 'from client localhost port 135|from client blabla ';
+-$tmpfile='/var/tmp/sql.input';
++$tmpdir=tempdir( CLEANUP => 1 );
++$tmpfile="$tmpdir/sql.input";
+ #
+ $verbose = 0;
+ #
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats
+--- freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats	2008-10-12 09:29:50.000000000 +0000
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl
+ use POSIX;
++use File::Temp;
+ 
+ # Log in the mtotacct table aggregated accounting information for
+ # each user spaning in one month period.
+@@ -51,14 +52,13 @@
+ 	AcctDate <= '$date_end' GROUP BY UserName,NASIPAddress;";
+ print "$query1\n";
+ print "$query2\n";
+-open TMP, ">/tmp/tot_stats.query"
+-	or die "Could not open tmp file\n";
+-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
+-print TMP $query1;
+-print TMP $query2;
+-close TMP;
+-$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
+-$command = "$sqlcmd  -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
++my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
++print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
++print $fh $query1;
++print $fh $query2;
++close $fh;
++$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
++$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
+ $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
+-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
++$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
+ `$command`;
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats freeradius-server-2.1.1/dialup_admin/bin/tot_stats
+--- freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/bin/tot_stats	2008-10-12 09:29:50.000000000 +0000
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl
+ use POSIX;
++use File::Temp;
+ 
+ # Log in the totacct table aggregated daily accounting information for
+ # each user.
+@@ -48,14 +49,13 @@
+ 	AcctStopTime < '$date_end' GROUP BY UserName,NASIPAddress;";
+ print "$query1\n";
+ print "$query2\n";
+-open TMP, ">/tmp/tot_stats.query"
+-	or die "Could not open tmp file\n";
+-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
+-print TMP $query1;
+-print TMP $query2;
+-close TMP;
+-$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
+-$command = "$sqlcmd  -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
++my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
++print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
++print $fh $query1;
++print $fh $query2;
++close $fh;
++$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
++$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
+ $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
+-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
++$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
+ `$command`;
+diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct
+--- freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct	2008-10-12 09:29:50.000000000 +0000
+@@ -5,6 +5,7 @@
+ # Works with mysql and postgresql
+ #
+ use POSIX;
++use File::Temp;
+ 
+ $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+ $back_days = 90;
+@@ -44,13 +45,12 @@
+ $query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date' AND AcctStopTime IS NOT NULL ;";
+ $query .= "UNLOCK TABLES;" if ($sql_type eq 'mysql');
+ print "$query\n";
+-open TMP, ">/tmp/truncate_radacct.query"
+-        or die "Could not open tmp file\n";
+-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
+-print TMP $query;
+-close TMP;
+-$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/truncate_radacct.query" if ($sql_type eq 'mysql');
+-$command = "$sqlcmd  -U $sql_username -f /tmp/truncate_radacct.query $sql_database" if ($sql_type eq 'pg');
++my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
++print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
++print $fh $query;
++close $fh;
++$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
++$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
+ $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
+-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/truncate_radacct.query" if ($sql_type eq 'sqlrelay');
++$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
+ `$command`;
diff --git a/www-apps/freeradius-dialupadmin/files/setrootpath b/www-apps/freeradius-dialupadmin/files/setrootpath
new file mode 100644
index 000000000000..124364c291ac
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/setrootpath
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$1" = "install" ]; then
+	sed -i -e "s:/usr/\(local/\)\?dialup_admin:${VHOST_ROOT}:" "${VHOST_ROOT}"/{conf/._*admin.conf,conf/admin.conf,bin/*}
+	chmod -R o-rwx "${VHOST_ROOT}"/conf
+fi
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
new file mode 100644
index 000000000000..00b0e8d6afa6
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils webapp
+MY_FREERADIUS_P="freeradius-1.1.6"
+
+DESCRIPTION="Web administration interface of freeradius server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_FREERADIUS_P}.tar.gz"
+HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+LICENSE="GPL-2"
+
+DEPEND="dev-lang/php
+	dev-perl/Date-Manip
+	sys-apps/findutils
+	>=net-dialup/${MY_FREERADIUS_P}"
+
+S="${WORKDIR}/${MY_FREERADIUS_P}/dialup_admin"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-sqldebug.patch"
+
+	sed -i -e 's:/usr/local:/usr:' \
+		-e 's:/usr/etc/raddb:${general_raddb_dir}:' \
+		-e 's:/usr/radiusd::' \
+			conf/admin.conf
+	sed -i -e 's:/usr/local:/usr:' bin/*
+
+	#rename files .php3 -> .php
+	(find . -iname '*.php3' | (
+		local PHPFILE
+		while read PHPFILE; do
+			mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
+		done
+	)) && \
+	(find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
+		die "failed to replace php3 with php"
+
+	# remove cvs data
+	ecvs_clean
+
+	# fix dangling ../ to deal with the way webapp-config installs files
+	find . -name '*.php' | xargs sed -i \
+		-e 's:../conf/:../../conf/:' \
+		-e 's:../html/:../../html/:' \
+		-e 's:../lib/:../../lib/:'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/*
+	insinto "${MY_HOSTROOTDIR}"
+	doins -r conf html lib
+	exeinto "${MY_HOSTROOTDIR}/bin"
+	dodoc bin/*.cron bin/Changelog*
+	rm bin/*.cron bin/Changelog*
+	doexe bin/*
+
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins sql/*
+
+	dodoc Changelog README doc/*
+
+	webapp_hook_script "${FILESDIR}/setrootpath"
+
+	cd "${D}/${MY_HOSTROOTDIR}"
+	local CONFFILE
+	for CONFFILE in conf/* ; do
+		webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
+		webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
+	done
+
+	webapp_src_install
+}
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
new file mode 100644
index 000000000000..d2c682b129ad
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils webapp
+MY_FREERADIUS_PV="2.1.1"
+
+DESCRIPTION="Web administration interface of freeradius server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/freeradius-server-${MY_FREERADIUS_PV}.tar.gz"
+HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+LICENSE="GPL-2"
+
+DEPEND="sys-apps/findutils
+	sys-apps/sed"
+RDEPEND="dev-lang/php
+	dev-perl/Date-Manip
+	>=net-dialup/freeradius-${MY_FREERADIUS_PV}"
+
+S="${WORKDIR}/freeradius-server-${MY_FREERADIUS_PV}/dialup_admin"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-tmpfile.patch"
+
+	sed -i -e 's:/usr/local:/usr:' \
+		-e 's:/usr/etc/raddb:${general_raddb_dir}:' \
+		-e 's:/usr/radiusd::' \
+			conf/admin.conf
+	sed -i -e 's:/usr/local:/usr:' bin/*
+
+	#rename files .php3 -> .php
+	(find . -iname '*.php3' | (
+		local PHPFILE
+		while read PHPFILE; do
+			mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
+		done
+	)) && \
+	(find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
+		die "failed to replace php3 with php"
+
+	# fix dangling ../ to deal with the way webapp-config installs files
+	find . -name '*.php' | xargs sed -i \
+		-e 's:../conf/:../../conf/:' \
+		-e 's:../html/:../../html/:' \
+		-e 's:../lib/:../../lib/:'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/*
+	insinto "${MY_HOSTROOTDIR}"
+	doins -r conf html lib
+	exeinto "${MY_HOSTROOTDIR}/bin"
+	dodoc bin/*.cron bin/Changelog*
+	rm bin/*.cron bin/Changelog*
+	doexe bin/*
+
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r sql/*
+
+	dodoc Changelog README doc/*
+
+	webapp_hook_script "${FILESDIR}/setrootpath"
+
+	cd "${D}/${MY_HOSTROOTDIR}"
+	local CONFFILE
+	for CONFFILE in conf/* ; do
+		webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
+		webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
+	done
+
+	webapp_src_install
+}
diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
new file mode 100644
index 000000000000..f6fe7565b8f6
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+The FreeRADIUS server comes including a powerfull web interface written in PHP 
+to administer radius users, called dialupadmin. Dialup Admin supports users 
+either in SQL (MySQL or PostgreSQL are supported) or in LDAP. Apart from the 
+web pages, it also includes a number of scripts to make the administrator's 
+life a lot easier.
+</longdescription>
+</pkgmetadata>
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
new file mode 100644
index 000000000000..eeab78b266f3
--- /dev/null
+++ b/www-apps/gitea/Manifest
@@ -0,0 +1,10 @@
+AUX gitea.confd 74 SHA256 edf43ca063fccf9951cd1e3975fdfa7ba0e26b47d7442596ce27bc5f2fd21e4c SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25 WHIRLPOOL 7cfce49d1b3053dc07318c2f2626bf2d6029f9dead23c800a775277928c486225297668a34e6e7d322e506b3c3b68652a3aa31514e30e49ef9a1dc72ea3fb738
+AUX gitea.initd 681 SHA256 d54242e9f1f8854f97cc0acf47242a2ace8ee388c9af7d152ef831ca57bbf3c0 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986 WHIRLPOOL afc8b379026eb28360ef92671ffff1930dec68817653766ce7d3c108912aee33e6e2b3b3b33bedc39edcd5c0a9ac57012130f423be1bf7589465544d471b9050
+AUX gitea.logrotated 87 SHA256 19538aff00c6ad5377df593391f33f59b28333ebe7a95eb9848ce663a6f7c9ba SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 WHIRLPOOL 7d8d3dea943948757803a4091a6950a2f9b2859570ee5783bf524c248557e72625042ecdaa9d694177c9a6e3e942dacf5a06e1298994ba009269d3417c299026
+DIST gitea-1.0.2.tar.gz 13448604 SHA256 f75e220f8c44a9b7c67d2d5339479e690df9f03ec3337eede3aab0c7e8e55c87 SHA512 1826e60961adc585fd54a2c913e6cfaa9754052a932981f83eb6a1f2521d09eb7165545f80494439763c8f13bb1f4ffc24b791162cae7b739fd9eb96f7db530c WHIRLPOOL 3afcfbf4d15b94b4b8e5fde511626ce6acfbf201a58b54f3cd077b6c6487f62b3a0b3e4ef7c3c4526a432e0aa4833e038ca7d69e2e09cf9fe329ea65607f42ab
+DIST gitea-1.1.3.tar.gz 13018735 SHA256 c36b96707585d5395b10145d81e732c29e1d1476e7bff55ee6e131a3e516f1de SHA512 c674699bc51ad367d4e47aa1b65e2025d57747cd516df6a7d7e715bf7467a3504dcf461823db15365a61ac91a35b68bce2486b645d09708a6e952fff379c12e4 WHIRLPOOL 1134cf37e09a9e20a927ef9119eb92c2e716af092717ffcce1003d62c08f95452e054820e8392b6797d89c045d8ae317b3d0f50385367e2eb4c636e404e16073
+DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
+EBUILD gitea-1.0.2.ebuild 2450 SHA256 c762c14a7819401d1232d6f7c7109d8918f9ce0f23f11d0303ca13b183b94b1b SHA512 e2980081bb3b30cc046853ba6ea9a7fe8c0f9ed72329b79f06db4e86e3c6608e7b7b669a1e2337c19fa21dda7262f3de7072afedc4e9a5d3144e5976c7f100c3 WHIRLPOOL c2a8dd8c086ee9b1ed15a25bb0d0082295b889e6e5a36580f0dbda01100a368e6fb0ff720fbb3b763696fac206f56e914e2077026f0b10674a5353e8a3470bc5
+EBUILD gitea-1.1.3.ebuild 2450 SHA256 1a549f918363bbae88e0ddd8156593087a28e0e332f8027910d3064ca9b53c31 SHA512 47845442511a19ef76572a01199d32b1fad93540addad3578152e457a78eeac7ec941ea1bd19c134b6514c729230492d8f68f2b3693fea9ecaa21d881176530b WHIRLPOOL afc3eace56cdf14f695db3ba012d0311b829a28d2d40cee1e7297f2c16dd349337e194b7c94a2631e7d6de51fbda714236688329466cefbd336589d4760ad526
+EBUILD gitea-1.1.4.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
+MISC metadata.xml 324 SHA256 cf95cc2d754abaf77062d71409b6cb4bc9cd630637518db74d8f8af0bfa1effd SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee WHIRLPOOL 4694b3b159f487e2fbeccadd34cb56080888a5422fd8bd0c39db9e18b82bbd0ea1772ba6c2a068968f80c02babd74780e158b790b9b2d260d0ff466a2808e3db
diff --git a/www-apps/gitea/files/gitea.confd b/www-apps/gitea/files/gitea.confd
new file mode 100644
index 000000000000..8b1710b06fbc
--- /dev/null
+++ b/www-apps/gitea/files/gitea.confd
@@ -0,0 +1,2 @@
+# arguments for gitea
+command_args="--config /var/lib/gitea/conf/app.ini"
diff --git a/www-apps/gitea/files/gitea.initd b/www-apps/gitea/files/gitea.initd
new file mode 100644
index 000000000000..ea618140c580
--- /dev/null
+++ b/www-apps/gitea/files/gitea.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gitea, a self-hosted Git service"
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+user=${user:-git}
+group=${group:-git}
+
+command="/usr/bin/gitea web"
+command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	-e GITEA_CUSTOM=/var/lib/gitea
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+	need net
+	after net
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}
diff --git a/www-apps/gitea/files/gitea.logrotated b/www-apps/gitea/files/gitea.logrotated
new file mode 100644
index 000000000000..ec6ddfe606b9
--- /dev/null
+++ b/www-apps/gitea/files/gitea.logrotated
@@ -0,0 +1,8 @@
+/var/log/gitea/* {
+	su git git
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/www-apps/gitea/gitea-1.0.2.ebuild b/www-apps/gitea/gitea-1.0.2.ebuild
new file mode 100644
index 000000000000..48f821befd27
--- /dev/null
+++ b/www-apps/gitea/gitea-1.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea/..."
+EGIT_COMMIT="e2c8d6fcb2c4073ed5cf164d88e7b5d44d95943c"
+ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
+	sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
+		-e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
+	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
+		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
+		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
+		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
+		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" src/${EGO_PN%/*}/conf/app.ini || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} build
+}
+
+src_install() {
+	pushd src/${EGO_PN%/*} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins conf/app.ini app.ini.example
+	popd || die
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/gitea.logrotated gitea
+	newinitd "${FILESDIR}"/gitea.initd gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
+		elog "No app.ini found, copying the example over"
+		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
+	else
+		elog "app.ini found, please check example file for possible changes"
+	fi
+}
diff --git a/www-apps/gitea/gitea-1.1.3.ebuild b/www-apps/gitea/gitea-1.1.3.ebuild
new file mode 100644
index 000000000000..45ea9f668ac8
--- /dev/null
+++ b/www-apps/gitea/gitea-1.1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea"
+GIT_COMMIT="06a554c"
+ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
+	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
+	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
+		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
+		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
+		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
+		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
+		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
+		src/${EGO_PN}/conf/app.ini || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins conf/app.ini app.ini.example
+	popd || die
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/gitea.logrotated gitea
+	newinitd "${FILESDIR}"/gitea.initd gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
+		elog "No app.ini found, copying the example over"
+		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
+	else
+		elog "app.ini found, please check example file for possible changes"
+	fi
+}
diff --git a/www-apps/gitea/gitea-1.1.4.ebuild b/www-apps/gitea/gitea-1.1.4.ebuild
new file mode 100644
index 000000000000..56e96b9e348b
--- /dev/null
+++ b/www-apps/gitea/gitea-1.1.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea"
+GIT_COMMIT="34182c8"
+ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
+	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
+	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
+		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
+		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
+		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
+		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
+		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
+		src/${EGO_PN}/conf/app.ini || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins conf/app.ini app.ini.example
+	popd || die
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/gitea.logrotated gitea
+	newinitd "${FILESDIR}"/gitea.initd gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
+		elog "No app.ini found, copying the example over"
+		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
+	else
+		elog "app.ini found, please check example file for possible changes"
+	fi
+}
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
new file mode 100644
index 000000000000..0cb7df9d1ee6
--- /dev/null
+++ b/www-apps/gitea/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">go-gitea/gitea</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
new file mode 100644
index 000000000000..cc05fed10a7a
--- /dev/null
+++ b/www-apps/gitit/Manifest
@@ -0,0 +1,10 @@
+DIST gitit-0.12.1.1.tar.gz 274787 SHA256 c95f78a9d3060c6695c0d8f3f6e2cc01f64d0b535d8c6c3e591a9fd802d534a5 SHA512 ad27445b517e268d773993f2f642b8fa392c25b863ee6370d235708c9d6015363a253afd9e3ea0ed46414b6b5ad98bad445f73e9f459285d0c31590ef42b91f1 WHIRLPOOL 1a6a3eca1c34c8f974184a3546d3243f5356f7b559fa34b9934569e04c35812fe8b09b795ee8dee2b3cf4443d6de45ccc66ffaf8e7b4dffa188b9264dc63c085
+DIST gitit-0.12.2.1.tar.gz 271239 SHA256 15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4 SHA512 dd81ae190bd77b39e15881d87dd7efdcd02ac16a4933f3d44a5c900275fc494c8bc9a883c92fcf18ff49a6285d6dd56464e57695c9cb39d5616d43dbdcc58162 WHIRLPOOL 789dfe9308e20a5c0d4f161fda257f80877691c364762eb0bc41b3e5b9da8f6e53919912a34372100a9e04ae8075a5b99009a7a5358f3af8c95576f15f5f8583
+DIST gitit-0.12.2.tar.gz 270891 SHA256 160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78 SHA512 3420335d3aabfde5466e4a70319712d87cf98e7151fe9a23d58807f74fa2bdb74cbf028fe4ab764a192f0e7ad9c56b70749029d64306c495d8012824c8f281cf WHIRLPOOL bccf2ff198130e54dfb994fc7e2831afcc3a32133e409871ee8047815f822aa6b81ae6e218938f27b2186742e59d1065582bf9d3fcaae90ec77d33a26d3e7826
+EBUILD gitit-0.12.1.1-r2.ebuild 3431 SHA256 d8ac5b9fe8a2ac393e4fceec8ff9f6d66f45c37348cdf02105fc79a58d2b5b7c SHA512 e30db2b635e9a47b6a74d7459483ab472143c26ba8a54b65d575f43c4b0bbdb90854154457d2a94d88e86710a13f795352c1fa40d8f018b210b7ad3af8a8cb49 WHIRLPOOL b349642de3baa918552ec5acd195418705c635b66a6a05a784f9b9301e4b332ea100047af0e6de34e930f253c52a6ab3ddc306e6e6f2a7ff24a9aa8e503ed87a
+EBUILD gitit-0.12.1.1.ebuild 3368 SHA256 56ee04013538cd7df33155fbfffac630a1a61864e52e83a96ec20260dccb29d2 SHA512 88d114591b85d38df649208f633e31b0939db1f34e09a3577fff3ffcb6bb8d63a027c5e38491d8e27ec7a75d8b64143787699fd5b3f2ae2ddd93b7985dfe9153 WHIRLPOOL 508b8f9059c60087a19c783a3d39707cd2add2f719f9842a4bb02c968ea29bbd0c994dc06bb071811ee9c89fb2ca2dafa87b6ac79c5c0dcb4b4150853df941a3
+EBUILD gitit-0.12.2.1.ebuild 3392 SHA256 eb8fbbaa556a4bd2190bd36f0fb0ecd02c13a95fec2df0bb0fe22f04571e96c8 SHA512 62bbb9363771d5f356164383a12ecdf31dfc31c2fde34e7a03a2d2fe92da4991fca3e873e14ac423a5ccffa685e62d49d943598b321ba48e881984f8f6df511b WHIRLPOOL 225a8eb5b926561666469b975b728fe9eeff07c13ccb9b48a98d2c6a84fe5b2cec5ea2c05850f737f544925879a2370c91c25914bd8da1f6b6289a2be8858d5f
+EBUILD gitit-0.12.2.ebuild 3361 SHA256 72ef7f1012a3954807f1c42699acc9e247af477fb0486f259b93a5dbb8dc21fe SHA512 6e0f4acaea641fd4fb18d25b4c4cb8eb8b67028de6b1df3ec7b10e0714e82cae79e510bbe78a41e60ce385748afc8d4b28dc059be4d31e1a05180ac7c02cadfd WHIRLPOOL 1b90779f845686c9cf469338bcf5a1dcfa90772be2a7ef04dfd744ffdc3a2e218bfdb018e220111031ae9ba50312842e02511023788343c86ac15b3f99f164e7
+MISC ChangeLog 4181 SHA256 487d76243b47a220015b14c04184c7934e2848e5a34601e32dffe68c867bf90e SHA512 04ba2cafc0685f274349f134cce9daf71e62ce60c436840d33d843a4311a440c8d600cb0dd96ee2533183897921c2e3af329df16e1516e38d4aa12cb4917bd10 WHIRLPOOL 71f4f02fecc313fa432daee96ab55f515f75276afb8c43140d75d9fcfb059bad584ff9c897c74aa368202b99d41075312d5d9d4b7482c5da2275aa07cbe9a0db
+MISC ChangeLog-2015 1411 SHA256 a0a339da736fd8ea3abc916bcdf36c1d71a4ad91e7d0d047587d8d5983632f2d SHA512 3e8cc9e1f134e97961993bfd8f166a1f13b494604bb14869fa240d97d6e38a1d5c5be50d121f7da5519033a78d37229b254369c2ef7f1f4278995536ca33dd99 WHIRLPOOL cb9259fcc03096b1c163f1ba4c9d562e49a96a3ee4883acb984559170dce49898821ec4f16db3dc0b5b9d25f013e56a9e21875b39bd8e6731d43cb5e43d40b4e
+MISC metadata.xml 1425 SHA256 c1868684877e4a2e82b1f454cda6276f558aec1e840c48c45ddb98a2628fab42 SHA512 c3e877337e7c03fbe0a53d46b704100a19c450862be2f2de49b0a130e18f0704656ee371f832b8fe6efb0145f5af7d86deac024bb7972c01572da53c6439f9d6 WHIRLPOOL 2e9906494c75dfceabe45d9aacf10775d45f257c14071632578677ff260c231cf20cb1a8599af58f9bd6cb0a355a6ec4007287b05c7e397cdcb11e550d528479
diff --git a/www-apps/gitit/gitit-0.12.1.1-r2.ebuild b/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
new file mode 100644
index 000000000000..e5f5c987a448
--- /dev/null
+++ b/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.18:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'tagsoup >= 0.13 && < 0.14' 'tagsoup >= 0.13' \
+		'aeson >= 0.7 && < 0.12' 'aeson >= 0.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.12.1.1.ebuild b/www-apps/gitit/gitit-0.12.1.1.ebuild
new file mode 100644
index 000000000000..828413fdc4f2
--- /dev/null
+++ b/www-apps/gitit/gitit-0.12.1.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.18:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.12:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.12.2.1.ebuild b/www-apps/gitit/gitit-0.12.2.1.ebuild
new file mode 100644
index 000000000000..3f726c930eac
--- /dev/null
+++ b/www-apps/gitit/gitit-0.12.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.20:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?]
+			dev-lang/ghc:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.12.2.ebuild b/www-apps/gitit/gitit-0.12.2.ebuild
new file mode 100644
index 000000000000..6d1b430eeb33
--- /dev/null
+++ b/www-apps/gitit/gitit-0.12.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.19:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
new file mode 100644
index 000000000000..f5359672dbc6
--- /dev/null
+++ b/www-apps/gitit/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Gitit is a wiki backed by a git, darcs, or mercurial
+		filestore.  Pages and uploaded files can be modified either
+		directly via the VCS's command-line tools or through
+		the wiki's web interface. Pandoc is used for markup
+		processing, so pages may be written in
+		(extended) markdown, reStructuredText, LaTeX, HTML,
+		or literate Haskell, and exported in ten different
+		formats, including LaTeX, ConTeXt, DocBook, RTF,
+		OpenOffice ODT, and MediaWiki markup.
+		
+		Notable features include
+		
+		* plugins: dynamically loaded page
+		transformations written in Haskell (see
+		"Network.Gitit.Interface")
+		
+		* conversion of TeX math to MathML for display in
+		web browsers
+		
+		* syntax highlighting of source code
+		files and code snippets
+		
+		* Atom feeds (site-wide and per-page)
+		
+		* a library, "Network.Gitit", that makes it simple
+		to include a gitit wiki in any happstack application
+		
+		You can see a running demo at &lt;http://gitit.net&gt;.
+		
+		For usage information:  @gitit --help@
+	</longdescription>
+	<use>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="plugins">enables optional plugin runtime loader</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/gnopaste/Manifest b/www-apps/gnopaste/Manifest
new file mode 100644
index 000000000000..3f9e4e0d393b
--- /dev/null
+++ b/www-apps/gnopaste/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-en-0.5.5.txt 164 SHA256 9175d92b3ac639ae0a1c9698aa2b6e455f75a56eaff4c3978c139ac9776fec4e SHA512 88f210c452dc6c6be71f923246995bfd94120bb802330b14af09e3d8f2e4d68e24794ff8e790089d96694a6da4bf1fad4154d284f3748ef54e5f168cbb7fb39f WHIRLPOOL 8413ff8c6fc42826e381879054920844a4f2a09286b926ccb29f990884c601707a769c8188e7b7ecc6945fa05fd2cea6bf5281fa73cdde4b2b7dcce74279e89c
+DIST gnopaste-0.5.5.tgz 162271 SHA256 e11fc5eb0898f84c1f0b74956d09dd57b747bfd71334c8ac2774d0207308a1a0 SHA512 6dacf606688a730f2e01a8fe55be4c1167ddcf405f23dcf97310ea3471ac3232273cc9154792956cb5f8812a53e96e38bd4a286d9af3d9fb602206e35a530fc5 WHIRLPOOL 9a450554616f78cbbfb8ae2d1752f0839ee32895cdb4a8b1b9138a8c3937efa4eaeaa5d6dcfb09a74ff6caf85acbe4e453fc90e40d18635e02684185ca917855
+EBUILD gnopaste-0.5.5.ebuild 745 SHA256 99ff95eb78cbab2789c89f2411b97105302cb9bcb8bd038e904a232714d8093f SHA512 1262a11566bf9d30cb5c8e70bc49c643d437b5496ba9771f5374be7ba12400942a6037dcc9f7e8858b064c910ce310fdbc3688dba8b5d981fb3fdcb80b59b326 WHIRLPOOL d22d25bbccc21c61dfef4858847981a3af1a20baba2c488deebfeb0e78bfbe6cef2c381f93202cb2938505bd44da90298feae33382689d58a8362f5565046e70
+MISC ChangeLog 2463 SHA256 2d60b0b34862f05adde1908e071bcccae95fcb3fd9db004d5a7d7138ce187434 SHA512 f368e31f910cc0093d6e2619d9d36d4584cd10611270b844913149876999706bf481fa2278a6733bd21ac7578617ad6b84915db11922ffe6aad61ea31ebed5d4 WHIRLPOOL 92a23b956907fd9586e9a4b7b12804bf66ca7e6a9ecf2e5d86b5a1c0b2ed44555d70bac78cacdd31f90155d8d6985b6999f7e890bb875c6efa00ab4409b52a02
+MISC ChangeLog-2015 1372 SHA256 5c4f545faffc82a2b459edf3a6aa8aca00034f82a1f29ebf4d4c281bb0ddde41 SHA512 515f11825329d0c366f1defbf03308b13e73aa225203b6fb83c7bf40c0d6b337f04bbb2d888afd6d6566752637e1708263bdf7897e0e2a0f20055b4c6aad31be WHIRLPOOL e014642e5630a0e7ad225998fa269571eabe2df6d8c104be1b2799b6f5e097ee49d23d814c3d025555b219153f0da3dd34172dd52d73ac523a12ebf87ba228f6
+MISC metadata.xml 328 SHA256 dd619f4bfb294fd05962f8b797109f2bdfa7f76a5bc34da67399034cf894be66 SHA512 cfd49600e80178dd0e4b9655a0f8b8eec436f11dcccc03c1911e7f1989448f305601321fdc94b00f7c42b77badde25012b979610185c6f4dd03ba3603924ae33 WHIRLPOOL 61ba61612536833dba393a5ceabea36dad25c185be5e622cb94428b1e6dc7d99cb27f66b225ca8c50972d4db5d99552bbe10d3c9f925d086a45c08e9c64e65e6
diff --git a/www-apps/gnopaste/files/postinstall-en-0.5.5.txt b/www-apps/gnopaste/files/postinstall-en-0.5.5.txt
new file mode 100644
index 000000000000..2e9d4585cfd4
--- /dev/null
+++ b/www-apps/gnopaste/files/postinstall-en-0.5.5.txt
@@ -0,0 +1,4 @@
+Start your favorite browser and follow the install 
+instructions on the installer under the followinging url:
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php
diff --git a/www-apps/gnopaste/gnopaste-0.5.5.ebuild b/www-apps/gnopaste/gnopaste-0.5.5.ebuild
new file mode 100644
index 000000000000..0c4e915dfacc
--- /dev/null
+++ b/www-apps/gnopaste/gnopaste-0.5.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp eutils
+
+DESCRIPTION="gnopaste is a nopaste script based on PHP with MySQL"
+HOMEPAGE="http://gnopaste.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[mysql]"
+
+need_httpd_cgi
+
+src_prepare() {
+	esvn_clean
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/install.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PV}.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/gnopaste/metadata.xml b/www-apps/gnopaste/metadata.xml
new file mode 100644
index 000000000000..00e684791565
--- /dev/null
+++ b/www-apps/gnopaste/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnopaste</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
new file mode 100644
index 000000000000..ebaa354aa9ab
--- /dev/null
+++ b/www-apps/grafana-bin/Manifest
@@ -0,0 +1,11 @@
+AUX grafana.confd 162 SHA256 5b9e125f2648ed98125097770b609dcce543443f0862b99c0653f55b3b9be895 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c WHIRLPOOL cffd9b5c07791af6873b26868e0402ab882410b124fc48a86f367cab09c1a3edf3cc112a83a879e041ce7f717ddad8f70199e5f714281e19da701eeaadcaeb4b
+AUX grafana.initd.3 972 SHA256 0f898484e081a416429d4a881c99988aea6a9d9d2085b326c5dd1e85163cbb39 SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442 WHIRLPOOL 85f5634bb9fcd78c45d1d5c207951402a60be9b5f5595b47d8785bf1fa3a26f4238346a1d2a16a2e1457620b2cb5b20bfa46f5ed8cdf12e1b5f6297691a0db66
+AUX grafana.service 651 SHA256 406238530f759454339ef57d5297038bf9aea15b1ec919eb4aa9619584165f7b SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4 WHIRLPOOL f4a9f08a49fc749e4e4189d1f288dd1a3a394ac3d1e6607639a9c559ee83ff9e59a4f4a5956400a2941e934d44fae619d3bf7a63089bdb6997179df9459c3278
+DIST grafana-bin-4.4.3.tar.gz 47282503 SHA256 90d0c53f6a9edb5f6fb5acb58265a167ef41f5b06701301eafc30bafa28566dc SHA512 21eea944931a9d4a7120d6f2e27fb5300f747ba0ff12cc93b160d38133400548701e342e6481e647f4252d34740aa49a7ebbe8c63a2a30a9fa6a057b90deb87a WHIRLPOOL d5fffbf9dc21fbb0711335a6234233a95bcd801bc3701e1b1be8b037977a291d77e668e950f6bf2c7f848c2395ccfe424b9abf97062f8d1b08b3b676e24f0f81
+DIST grafana-bin-4.5.1.tar.gz 50375732 SHA256 62fe532e5c2f7a56c713d53ee91c710e3213bae642447fd4624d6df806702651 SHA512 ea529a58aa835113ac2b4e8fb7b7f4f7dfa2a554e4aa212f81838faf193de7914a924b80162caa4bfee79d7dbd35278a792c15ca7e0302e062e26e93e29dd488 WHIRLPOOL 02959f0c93a0d257b56dd12bd9abe06372d51155751811c05ecf2281c2a52e3b41ef7d0c2aa2102c66e3d549f1a87f8f62fcabe00bedef7aad5185cbf550e087
+DIST grafana-bin-4.5.2.tar.gz 50374607 SHA256 c438a7ef775dd64e2ebfc72bef1e5a69849f1802b1921f30d6904e8cf05281a6 SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7 WHIRLPOOL da931ffb2e4a73a77cc64afd3adace46a6043f31455c5bfec9181c0d80aa5191877ffba95d0f77b147ef17f268bb10e3921f7b4304988a08e9b70d87bc40b9c6
+EBUILD grafana-bin-4.4.3.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+EBUILD grafana-bin-4.5.1.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+EBUILD grafana-bin-4.5.2.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+MISC ChangeLog 3787 SHA256 7c5499b4ee86c942885dc7ce4bef893e78f6021866021ddd2d3c23e3ed4ceaaf SHA512 414365d302b28b7764df04eb01400c4ba459ec6538cd788b0ea84188b83d23f17d50e65f7f4763a1cd1b4e60cb52b7c2cc6e181de3558fcd5422534eec449a3e WHIRLPOOL ae426267c20f6c10682a1964d30c760897b215cb84f6aa52f6a49286b0fd3b2d38a7d62c56f7495321165c2c92086ac898a19d033c236d07b1d2317d359cccfc
+MISC metadata.xml 368 SHA256 4ae4d3d18cf294a94d808004217a1179c782f8385a2d29f6113d522d57e6cb85 SHA512 1a122f3c2926cd0b933f4f35c56d02ae7a601bb124bc1173f5e422dba35d00d8d91e7018c06bbeda0e9b39699efa86bcb3973a60935fc034dbd23a8d672aebac WHIRLPOOL fd3c8de9f27844fde5ac3054213bcb24dc596a6545f1b057900c769b969b58ccf722db75b6a4925f914606bf3bee5375edb800a564b43813de2c12521449e8a4
diff --git a/www-apps/grafana-bin/files/grafana.confd b/www-apps/grafana-bin/files/grafana.confd
new file mode 100644
index 000000000000..207ef765f653
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.confd
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/grafana
+
+# The user to run your application as.
+GRAFANA_USER=grafana
+
+# The group to run your application as.
+GRAFANA_GROUP=grafana
diff --git a/www-apps/grafana-bin/files/grafana.initd.3 b/www-apps/grafana-bin/files/grafana.initd.3
new file mode 100644
index 000000000000..c454fb249753
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd.3
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting grafana server"
+
+    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/dashboards"
+    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/plugins"
+    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/sessions"
+
+	start-stop-daemon --start -b \
+		--make-pidfile \
+		--pidfile /run/grafana.pid \
+		--chdir /usr/share/grafana \
+		--user ${GRAFANA_USER}:${GRAFANA_GROUP} \
+		--exec /usr/bin/grafana-server -- \
+		-config=/etc/grafana/grafana.ini \
+		cfg:default.paths.data=/var/lib/grafana \
+		cfg:default.paths.logs=/var/log/grafana
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping grafana server"
+
+	start-stop-daemon --stop \
+		--pidfile /run/grafana.pid \
+		--user "${GRAFANA_USER}" \
+		--retry=TERM/20/KILL/5
+
+	eend $?
+}
diff --git a/www-apps/grafana-bin/files/grafana.service b/www-apps/grafana-bin/files/grafana.service
new file mode 100644
index 000000000000..66fefe67e3ee
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Grafana
+Documentation=http://docs.grafana.org
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=grafana
+Group=grafana
+Type=simple
+Restart=on-failure
+WorkingDirectory=/usr/share/grafana
+ExecStart=/usr/bin/grafana-server                      \
+    --config=/etc/grafana/grafana.ini                  \
+    --pidfile=/run/grafana.pid                         \
+    cfg:default.paths.logs=/var/log/grafana            \
+    cfg:default.paths.data=/var/lib/grafana            \
+    cfg:default.paths.plugins=/var/lib/grafana/plugins
+LimitNOFILE=10000
+TimeoutStopSec=20
+UMask=0027
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
new file mode 100644
index 000000000000..3a8308e2d6d7
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf vendor
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-4.5.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.5.1.ebuild
new file mode 100644
index 000000000000..3a8308e2d6d7
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf vendor
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-4.5.2.ebuild b/www-apps/grafana-bin/grafana-bin-4.5.2.ebuild
new file mode 100644
index 000000000000..3a8308e2d6d7
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf vendor
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/metadata.xml b/www-apps/grafana-bin/metadata.xml
new file mode 100644
index 000000000000..6edc60113039
--- /dev/null
+++ b/www-apps/grafana-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<description>Proxied maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
new file mode 100644
index 000000000000..30126761f4b3
--- /dev/null
+++ b/www-apps/groupoffice/Manifest
@@ -0,0 +1,14 @@
+AUX postinstall2-en.txt 707 SHA256 8f3f1efcf2d9cca8c63254175cff3566fd4d733b8e630c4d141f28240901309f SHA512 a4b3fc6f576a80d80f86786bad1b13cc879dbe13c79c26e4141aeb160487ce2989e404f867a2e4e0dfdae8caa186f9e752baf962dcea902a090e500b9306d413 WHIRLPOOL 4adecb72d36913dad66a3458383c8737a751eeddb391fd9f3a1583734778a9b5e5b86c1ee14caf4d2041f82925ada5b2d75e826d623de97db1fbb9765b18e659
+DIST groupoffice-com-3.7.52.tar.gz 12259892 SHA256 af07123e16e9ebeafa4aeeaa7ae3c6dd45bc333ae1588a6c540c5973bb8f64d6 SHA512 f989392398d2756baf5222b0fb29add094385ea217f3065059c5eac71a82a594f820997968c07f842675d827bfcc12e3151488f57d52d4a706702f5db282d5fb WHIRLPOOL 87f5aa0a353ee7ed1ffb9576c48652885ccfa71f143310b30ad88190459ea5d777368b5c642a42f01c25516f8be8aa52f82b8a55d5749bea675cbd9819c778d8
+DIST groupoffice-com-4.0.144.tar.gz 13937659 SHA256 82e09433ab504ab84ba28743006c7e5bcbd2be7ef26f9bf6248127e7bd7a9cc3 SHA512 a7d590eee6782ac44f9fff72e46fa646dac6e59a6c78fd551541fb539398435a4a8fc4f6068e6ead254af00d7bbe78ea8bcd0c3d0ec5ea05a9110bd1e938b27f WHIRLPOOL 4a1fca56b6fbac6e558b39cce74ffc34de87a8a7382f6b3c28ea4fa11cee99e126e285ff527a7096527f136db24302e933fdc228578e4b5efb39ca0a9d26f58a
+DIST groupoffice-com-4.0.47.tar.gz 12354456 SHA256 0a84236d4d2f91d96c5a771a8add945404f3a7eef092dcaac9c2cc013dc6caac SHA512 bf354e8dac5af632da6e1b3d3b4bb6010f097329540a05e55287faf775c69a8078d0742a9d4cfc30bc838e6a23bcbe694b0e75d355a018d187f8617f60ff2236 WHIRLPOOL 84ea40ce408a1e829ecaebafb4008b2e11bac62e06a63103290271e970e75fcf9b6eab8b8f6c4ebfa292f92a819ef1a96bf55fd4c082d88dd76c5dc91c4ab406
+DIST groupoffice-com-4.0.97.tar.gz 13831704 SHA256 ab829824bc3f71b5dec903e1749facb9d481868ad994124107bbba8cf958b40e SHA512 0913f14ffbc4be17ac3e62e5e0a37aebddbd54d7f6dcfbead42122bb3c26e25fb32f5de13e0bd5161ee1063ab826fc7cdf427f15cf1881692a46ef81deb595fa WHIRLPOOL 8c007d49e2c0fd4913b86fdc5851528854459577a8843b9d86dc0ad2f6e2419e04401355e1ea3073255d81363e06dbb8bdd15387bb0ae0582beeab5b08798e44
+DIST groupoffice-com-4.1.7.tar.gz 14894191 SHA256 7fdd35989399614e43bd8117d2da7305f267b231a2c9580537ea2bf09a323a20 SHA512 9863eddffd06d058336ee8bcb67efd873a6dfb4fd4ad7c41ac2f7cdef95be17cd92661ee683a7c79fce4eff002acabba50d60af86ed02310d7d7d61aa589ed8c WHIRLPOOL d7519b48c422cb32c6fe4f10449beda7f043ac37fb9e321c73f656fdb8d5ea5eac66d02265ec5e40139b4169dcb3dcc1473a9094e933cd15d2f0985af3298e4c
+EBUILD groupoffice-3.7.52.ebuild 1199 SHA256 650e2a8981812a9983e5bdb417a4a7f21fb0bd5817822995b2afc0805fcafa9c SHA512 cb508bf62a249138d8290cfb16762f619bb185eafc5fd5adf4b57207cf4d5c262362f17c7d2052794e39888ed835695e8f0c1c8be30b38c5410b84da0746dcd4 WHIRLPOOL 0f461dacc38f88c31c7397f2dd5ae58f9436fb0bc3a82109bdcf2b853f66dd95c7f8cab686f198a735615b2eb008b1f3c1533a0d375ee3e39d6772c8342785d9
+EBUILD groupoffice-4.0.144.ebuild 1200 SHA256 8395ffe99375871a253216acae67742a8e8bf36478a496d568a42e9a9230224a SHA512 1b901c2a61efd18c7b6da77a8c4ccab106f5135387c7237b87dc4ce4df6550dd22973df82906d21825e8df4fb59d97864a83e6078012fee63e4636919c410bf6 WHIRLPOOL 0842de0aed078be960c271245925aacf6a34b2c5cc9bd6cbba712b37c7ce0fffd55a1b6f8db2f939ce3ffc2ea6b34558fe02826c27046de32d8e7fbfdd13e5a0
+EBUILD groupoffice-4.0.47.ebuild 1200 SHA256 8395ffe99375871a253216acae67742a8e8bf36478a496d568a42e9a9230224a SHA512 1b901c2a61efd18c7b6da77a8c4ccab106f5135387c7237b87dc4ce4df6550dd22973df82906d21825e8df4fb59d97864a83e6078012fee63e4636919c410bf6 WHIRLPOOL 0842de0aed078be960c271245925aacf6a34b2c5cc9bd6cbba712b37c7ce0fffd55a1b6f8db2f939ce3ffc2ea6b34558fe02826c27046de32d8e7fbfdd13e5a0
+EBUILD groupoffice-4.0.97.ebuild 1199 SHA256 2251fb05dffff186792d5c886a645c207a6da114009f1a91ae2aec9426d998f7 SHA512 63446cb0a64dbae7ffa32aa62b981eec26d97708cdeb6a96c26ec4c8c55cde69dc1e76245213eb5f727a13682fde21a792ed834299c6711267c61983658d954e WHIRLPOOL db09749eb18b072bf079c2ef40c9acf85709d6db4b8dbd18ec29c78013b8942bdfb9f1141cca04b904ab7cbe16f8d820870dee47527d6a5d60b5c12b4c90503a
+EBUILD groupoffice-4.1.7.ebuild 1199 SHA256 222f22aa20d8adfd88186642786d4cf19b2e2732152781b0213f25087e677687 SHA512 fecd840969e3e4475eb9df17161d667fbef8d8437f2204b91db44b7fa0b6448d85e6f991eea7e6278a684cc614fcf3f805fae7c4f2108fbc913c5495b1298b71 WHIRLPOOL 8e0da5c0621b96e52ccd45a1bad45a6775d6b15a021a7e214dd686b30cdfa16cbaa2830cf78421e24f2fa19bcc90e8a64584647e70020dd4041de9e664d5684a
+MISC ChangeLog 2721 SHA256 3ff73f7afe99f8a825e50057bfd4344059972e88f71250eca912f3ad67df0bfc SHA512 319556566611b1503b5e399877833446a89771e500e1521f7678a42647140272bbfd0adf857274cbd70e1c2472d420ec20871d7f0ae4909ddd6197b2bdb4a311 WHIRLPOOL 9d6ef704e2ac3613a4064a3afeb186674055f2bb51a4de72337d504f9b00027faf3b7978f0c6aeaf9769faa677280501bf62bf27185d0c279f14cb3d3bfa1f2d
+MISC ChangeLog-2015 7686 SHA256 52ac001c65e657addfb136c5b6e08e7f0044b04ad12d4564dff725954ba4239e SHA512 8d23ac141d4f51d1ab525b259b3739419ac234b19b46557ca0ad4df8fb05e50f31c0833ed842af369b0010653fc50b6c37ff2e4ceab5f441a05130985584f3d7 WHIRLPOOL a3a254953e2a5ac295a2254541249030882dc62dccfcbc48df3a747780e91570dab7cb9e89ad737dc8a0fb8bf23eb599586afdbceb671c979d2d6d818d857692
+MISC metadata.xml 332 SHA256 c99fad2c9e25d31729bbe2bd7543ccb5c25bd1b8e1bde7d37965a10a854ad2a6 SHA512 9ea21764f4fd8d5af004c37be6b9a3cf8c388fc4229b948336d68ce68bc0164589e1d02b95e1e4b2555a8cdde66929ebd70a979dc417bafd1b3c1da73a467756 WHIRLPOOL 9cb4e4b87289b55b0cc82df1e0821946e13c4bcf4e91d2556ccfef5a975dff28b1da780de88603460221a03a7bf5e51ad732bc3588123c5f468749a69e9d58c4
diff --git a/www-apps/groupoffice/files/postinstall2-en.txt b/www-apps/groupoffice/files/postinstall2-en.txt
new file mode 100644
index 000000000000..2ed6251afc8b
--- /dev/null
+++ b/www-apps/groupoffice/files/postinstall2-en.txt
@@ -0,0 +1,19 @@
+Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+to complete the install.
+
+Note: User data are stored in ${VHOST_ROOT}/groupoffice-<VERSION>/userdata
+Local data are stored in ${MY_INSTALLDIR}/local
+
+When you are done with the installation,
+rm -Rf ${MY_INSTALLDIR}/install/
+or use an .htaccess file to secure the installation directory.
+
+--------------------------------------------------------------
+ADDITIONAL FUNCTIONALITY:
+
+net-mail/tnef:      Install this package to decode winmail.dat
+                    attachments in the email component.
+
+dev-libs/libwbxml:  Install this package if you use the
+                    professional groupoffice version including
+                    SyncML support
diff --git a/www-apps/groupoffice/groupoffice-3.7.52.ebuild b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
new file mode 100644
index 000000000000..0aad18936b70
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.0.144.ebuild b/www-apps/groupoffice/groupoffice-4.0.144.ebuild
new file mode 100644
index 000000000000..a5590b026029
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.0.144.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.0.47.ebuild b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
new file mode 100644
index 000000000000..a5590b026029
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.0.97.ebuild b/www-apps/groupoffice/groupoffice-4.0.97.ebuild
new file mode 100644
index 000000000000..a249c1ee716b
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.0.97.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.1.7.ebuild b/www-apps/groupoffice/groupoffice-4.1.7.ebuild
new file mode 100644
index 000000000000..712f892a9147
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.1.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/metadata.xml b/www-apps/groupoffice/metadata.xml
new file mode 100644
index 000000000000..1910a4d57726
--- /dev/null
+++ b/www-apps/groupoffice/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">group-office</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
new file mode 100644
index 000000000000..c460543d488f
--- /dev/null
+++ b/www-apps/guacamole/Manifest
@@ -0,0 +1,27 @@
+DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 SHA256 f112c0ab83e4253f3a914716c5a7e61c4d7dc64d724e7c11bb4b695f386474a5 SHA512 0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698 WHIRLPOOL 013ad62f68050b8c431565fa375e6c3c50e2cd1b962b6409c3b79f8652f021f71139de6facf3cd4195b34067ad01fba33bc980bbe4d50d8cc3d7f984555396c9
+DIST guacamole-auth-jdbc-0.9.8.tar.gz 7018542 SHA256 7a4026e1cc3cb08bf4b7c265c91df62a616560b21ec14bbde32f5c52bd0e928a SHA512 c1c1a4f0f33a46108a45c826ad075825846838ad05205579024820f4737db6c96e35c5be3d20c78a0e088cecc08738369bdcf00c6efd43307848a71c710aa394 WHIRLPOOL d05038376e7f5cb1722c0e05a5a70892341806de27cf107c99e6545f3e7d239ff2ea6b7eb3b528099dfd764ff9b79a01e038e7c37ca008f7f502d752b323d836
+DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 SHA256 b9e0440202a4106b6fd0a8cdd9da7bfa476895ce8724edc7d75e80b89bca9780 SHA512 caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b WHIRLPOOL 3f674c98c6c0bf068426f3c78947f1f09fecc19d55a341b58f9adde8920bc30722077feed7f293d082009991bc08ab8cbddba2569a65e05fcc39b8a91f5f875f
+DIST guacamole-auth-ldap-0.9.2.tar.gz 382892 SHA256 478b0f5a3f9df0de4614b0432707cad443ea9f65ad219cffe904c6a91177250c SHA512 7ff6ed8aeac872aebfe654992208342370f991eabd141ac102ea553cc94b8c69c382344b5c8419745bcdc8f83b77d9b72577c8ddef9e2d000549a5fb1ae70617 WHIRLPOOL 846a673f1d61294b201d95160e2979254537fe80ffbbdc00756ee6202dd9886807a9c1f4b8f60653c528776a5c852cc7382cd14dec624aa10934fbf04e4a4584
+DIST guacamole-auth-ldap-0.9.3.tar.gz 382919 SHA256 0502e3d4e8512fbdd12b144285badfe2cd0b02fa9b0072b0b9772076998c8156 SHA512 e3eebeafd841d304f4c2beb21c1d54327bf0af2201794685c008d1812f05e70c8389888eec1e417c7e08600ebaf6f7f7330cddcf5176c9a12c987ba516155ebe WHIRLPOOL c7d2869d4ede53478cf55be4825dfdae4f47a7c03113e79dbf17afd190c823279f9967c2fefd518de0858484151901e5c3d4592ef3ffcb241c50949d59643068
+DIST guacamole-auth-ldap-0.9.7.tar.gz 384154 SHA256 479307fc54c20f0e4c661e135c0ad7251b3601054adbccdab2b7638cfa9c40bd SHA512 e750a89059a247ac17c7d137f8b7e03f43673a82559b91a39d0d1e69c94bb8212f7a17c335ec69f3c7d892c8ad0aaa746f50dfd247202468fc6c880e9126f1d2 WHIRLPOOL bdce95eb5d8a07de539dd44e55b6b44b746d0d3b12c7caba3c205ae584bdc69a83e5d05b753a650367fb2e172bd42eea0e3a21d3ef61f9e2cb35b8a028ac203c
+DIST guacamole-auth-ldap-0.9.8.tar.gz 1055810 SHA256 712d7462368b690ddecd26a9bac926f9f307c84a63d8af622996d29fea71c99b SHA512 b13947581dfad5b25a423369867c1a98327fd9a6a2124c12fe16c68700caefec217f18d01a1436419cb60dd43bb7f2126f5e47f3aebd069b2ce6a46759c0b402 WHIRLPOOL 270991364222ea8f0202cc0fb76c129859f717e24bd3e1653a880562d077eb9368d8e56f327f60b07f7c2d615b2981dcc604261288cd90630b53087a738369d6
+DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 SHA256 5419d62a8decae579b54773ed70c8f21b03c11a53c24de982e8f84a79d74423e SHA512 00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa WHIRLPOOL cacb8ee6387b43b0c4fd5c473680404828acc8cbdee219930043ef2f18857ca53b1502e8a650f0cbc6a4a2dfbb42d457991043a4823445e261eb2dc53aad9601
+DIST guacamole-auth-mysql-0.9.2.tar.gz 2104317 SHA256 74567dcb03f2b4bbe059a8270c568ccf54a0a0ed8491de4ed2c3500cde0eabc3 SHA512 4422358b1ced34ca468f130807da6f8d7c65f39a0c3e1c7eecf004803ca62ccccda07b5a7a2b72f4b4e8337ad60783e5514af6318c2cc38f37397ba14cd2f552 WHIRLPOOL cc9583781f53110fd53e4f5dd6e2fc24fdd8a1c160fc674db4694ca3517b20846f43e0bb1a172378982303d03e4be8b2cb3a9e0e5e7c52a4d0f708b4da3766f1
+DIST guacamole-auth-mysql-0.9.3.tar.gz 2104479 SHA256 1cd081758b81b7cc082c383c7c2804434cb90ce609f5d02ed5c48fdcd50d13e6 SHA512 b33e1228b261e3857c385260a15f7b3b6088bdcaf2785f837b9525c5469a7af6560610c8064614b438160d98e349487037d78c11737dbef6a83be6b41bd37e4c WHIRLPOOL 371617fecb15b193cb51a3f76896982365e7d1d4c394021eeaec5281f57ce885517240842ce30f9543b002db71907ae550173b8ba75f19c866f297c3c52985a5
+DIST guacamole-auth-noauth-0.9.7.tar.gz 5810 SHA256 0ff433a73dcbc014cc5c7269f408ef01d02ab0d743f4b45a868b0f98a38d61ba SHA512 1f5e6f0b9e035c75edc556ff47a73e8e6e047369306e00e1281a97ac4896c7563b41dfbd66c89926d972e01a5aee3fdd9c0214d91cb84a83f177a4e3df05d537 WHIRLPOOL 7b75d883f6785bee4470cc3dee70e964c36447c0d1434c785e23b2d5bed8b18b3488c04dc4f8ae04f5a12dd54ba88ac7035acea99cd89e855ff264b1c548a09f
+DIST guacamole-auth-noauth-0.9.8.tar.gz 6011 SHA256 3e3c060b37e6fd606b489ffb8b048749208d4124e075e42fb2b1cfe556cf4d4b SHA512 481f7ee88cbc7989734afb23cb9807d2cab71846ecdd17475f0e24afab5d3cd82040d5f448abe3eb01bfd828b9d834a753e0f0ec573b8b8c863fe5e2718ad1a2 WHIRLPOOL 8ad6bb47e47fe3f7e905e4f4e44a41affbe890a38d066357f255006ce0879f29a509255a750d2fae4a3d5e295e1f78fcd8898b22cd03060c2252df9d09859624
+DIST guacamole-client-0.9.0.tar.gz 314566 SHA256 2f98776e542fccdeb3a120ae266834e56935a30196d0c3088a8fa523a07f3594 SHA512 33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457 WHIRLPOOL 972ea5c2bfe7f7dc2b1cc42ca6bc49485c18e46b161180e6eddf828467dcce76cae58f89ca0a4e847ab33ebb0ee2ffa87b052c94a9707d8b1538cc3f1ac29c20
+DIST guacamole-client-0.9.2.tar.gz 386263 SHA256 c12f9b1b32621cc44d1e428d71eac5798f85f6b8df23edd3920907678205084c SHA512 e9e73b23b64883c64a1bd0908ecc9e685dc23308c3d44bd2c9c691e43fe383424bfc14816d0248b0f2a693da473a3a780a2d2469024aae53587b67f78d0b0af6 WHIRLPOOL 5a25e9942c9d9067bfad063833f89cc003ad8ba99c1ad1a2fd49d901f3c3616dac974f6abc67a4854129ea5160a7f7194a6b3e72e4741b0ff9a71025f57f229f
+DIST guacamole-client-0.9.3.tar.gz 396313 SHA256 e579ef8f5271c19955429b9d064fd58f7554031c078557c1d65e5d51f695d8d1 SHA512 4ec3ec74b1175ce6b3cde4b9669a3f54f21b45c489c592ea3cabd2af670bf0ec9449f8a368d416640ed7348e77c23ad05243b4fdff083a120f432053642f7727 WHIRLPOOL cb44f374acce366964554cd192440cd4eb71e6b5364bff31a853a7769becce34a608358c204702702220e602cf94732af59ab707b4fb38452cbc78fca541829f
+DIST guacamole-client-0.9.7.tar.gz 1580766 SHA256 905c32cb26844d7fca2a135cc6fcbc5017da7a71df5d4fed01786fe404ab9883 SHA512 eb9d9be14e9a55192c2e341fbd9b07d3cf1b3f4f06dbe97cdb5ca5d624362a895a6369100859716d9cf65562fa251424c9b3a36c2a7d4812bfb2814ab96dc5c3 WHIRLPOOL fbdade073fd2be4ea442d1b604f623a1e0046d744b86447e1eabc42643aae70eec62b596e2e014b294f14377c5823a42a498b75c06ded70346446b4ccc9c72b4
+DIST guacamole-client-0.9.8.tar.gz 1685223 SHA256 115107d4404a96abb122e5e4c06071adfe60bdd6bc7ff949dc537578f98e7f8b SHA512 e8152a10c8c51b0adff93ee476287e3c264ddae4de4b581a43009d8613e8cc2276ddd1ff5a53e84d74ff19901ec82433321d176e1335b4445dcbed04afe6f9f8 WHIRLPOOL 3daf2ac277f12360914c8cea0752a146d944ff8eaba01bfade5e8863b5e7d0da2163767b732b6f96120c4bfb2ab2f3eaa38fa700663b114684de12a311cd7411
+DIST guacamole-client-0.9.9.tar.gz 1725944 SHA256 f99f686aa49393160b7602048e78fb99886c4e367125d243eb3a741936833150 SHA512 109fe04fd9c072f6abfd31ba64c91b79dc6ef56562086bfb0db5d05feda436917eaf4d01b3b6e542bf2c6e1a56ab395a215fd0a1611cc0c2f87db925a14cf0e5 WHIRLPOOL 696d2595e96ebd0253879b8a6e376f634fe52baedc4d1496f97341415eb09bd20589ef4d7c6fdfb3ad8d6e68bec5cc96305ed1fa4199d0be38036cba307ec83b
+EBUILD guacamole-0.9.0.ebuild 4870 SHA256 1b9e4c778748f9b3c349ccc154aac14d8600af0250175da4eed0aba6d2885305 SHA512 4606c2ef307102dde46dd8fbe6f9d0f223b434eb2bd5030a3e2630b84c513e3ced06d51c2a1d8ec1842307d07db07e44d4a26f57400a446ccbcd071e05a66de5 WHIRLPOOL 09f2a7d502fb8814bbf6f2c5891aba70ca6ddd707402cca374e5f17e655ab2cfb698ecaa164d7dfc49c36227f58f13b47939de584c47d38611acaef04f3c4e73
+EBUILD guacamole-0.9.2.ebuild 4865 SHA256 a2d1fcca2f8eabe3a4ff8f07ac60f5853a69d97e28b4bd290781e86a34a1e092 SHA512 47714e1f6d183f8edd3124e64fb92372bed4219bc9470c04a4c65841b2870c327c8676bda8b37ad988349985be951841d4965d9e61492da8e4fb93d788de260a WHIRLPOOL 9109a586940389ff60fa3af0fdf80ec05db31ebd01591ee3450efdf77a36c4e68c095add6cd228136f135505535512238cf8b51d7e32b5f261f0d840fc21fa4a
+EBUILD guacamole-0.9.3.ebuild 4865 SHA256 d07f96498d1c3e8ff45a9b61ee00118ed65da545aae00fa06f312ea92d987907 SHA512 5c23f5294da2c664198c5bf9475556f52b5ebb6aebba1fff52f1294f9e3d3f2497fe17a63a2fe9df54c59506c36fec1ec6ef8a70b68117e48224351503d34c1d WHIRLPOOL 8b192fd58fec8611b9ee8ab6ab00762504d2a553599a38c857a72ac14b94c997e2c2c0b1a5309a51cfb1e013592be92f0de5dc099cceac78defe93157d4f74ab
+EBUILD guacamole-0.9.7.ebuild 7932 SHA256 e68794c6602481ff18905d33a0c429df140cacfbb09d077ffbcaaa2e30fe7146 SHA512 58e27d210ef895dc9876951daa87a5c8d0030a6744d9b1e39d9152e9ff2b7948833c4d5692e4ac4cfee5be6d4af2a82ba4fa8e9219718ee59d516d7bff1675b7 WHIRLPOOL 8120c3835d6ea43c66633835c9b3be2d5b01b7bb178d7486708b76dfc38d4e98b1defce0b5818bb0ca999ad7265ee3bb944cb9399ce2e2be8ea8e2312f27e904
+EBUILD guacamole-0.9.8.ebuild 7004 SHA256 4567f32e6832ed3a3b26ea7a1f4c093b4fa0a6886e2edb03b7d73daa0eacff21 SHA512 f40f02ea24c9f6cd9f79338afb8e1ccbd6c39bb767187dc766f1153bfe966ffa8031c74d238bec4666642ffafd818bb71c1b2d500798db5881df6216980e1112 WHIRLPOOL e31f7610751894a7709e837ce33aeb3fb9e1e3a78371dba500e944ab714d7fecbac4f0d153c8857d374290b3742340910663592f9204ef09c0304baf99d85ef0
+EBUILD guacamole-0.9.9.ebuild 7217 SHA256 376704f6ceded97dd609091fdedd76dfdff0d250d44655deea5bc9a67d1d13d8 SHA512 ca763668ec1a8d3783fb199eecceaa2114861b3762c3ff8206c01a54fb79e829b9d03d3bb42c31a9cc038f906f379ae6f8131a7dd3c1f18585150f074322fbf5 WHIRLPOOL 51feecaa33088122533537a4a39dfa7ecbdff2c168d662bc31c947444455a428720769fd5345c4e4e1ae4da7cd170648a7d81066768af867992cd15e917a48ad
+MISC ChangeLog 3245 SHA256 fe67d0b97b79407de9e10ab6290801e8a65274ac779ed4562b0cb4e8e850855d SHA512 439526aaf582e44aef891b0c9393826cdd8ccafa00f4671410bf76346c9cfb30dfe96624dbc93c40fc68b05ce68095d2da3f78c5d7f634507695bf7c38778aca WHIRLPOOL cce6659a704bfd372f18fa6d82baf7f68cb1d7f39c0b1ddf71c9e0809a57a67546b0d4c29d91a14f6cbf87e152ccb524a7197704ef64cf81adc937581cf4952a
+MISC ChangeLog-2015 2225 SHA256 fdb380880b18798a5ecfef1743912011a568c73dd2e04303ac464f23dc818f12 SHA512 b1f64a26a9ff45fb053f0a6c1867d596eb1b19ffbaee28e8f99bc943e3a6005f0ac014d6a5d36c5c3350393e3e6deeea53791ee3af429e999739fbd7955384ab WHIRLPOOL fa72c6c16bdffa1fc41dab20f8fd03e814b2ae623b2bd77953f2e13663bf7e326fdb786e7f5ab4014f0f27ce9913160ae84f429de53227d16197032cb3f7e20d
+MISC metadata.xml 857 SHA256 fb50c870c190e48dc4c4190cb9ecbf1c25529dc16ef81344cfaec50bb56795ff SHA512 9280c6a41cf349bbf2b40882d11d0cc35b101a89db029726ba987f0dd759264d7460b5147bd7cab58cd4f3877291136f693b0bcd3395d342bb8df844c8dc590e WHIRLPOOL 01ce8171460787a60f017151569126885e228c863d500e5d0a16ebf839b1c42d996b7526172cb0a41c94fe1f0dc8ce51a86d8f7524adddf6104bbb547e0cd698
diff --git a/www-apps/guacamole/guacamole-0.9.0.ebuild b/www-apps/guacamole/guacamole-0.9.0.ebuild
new file mode 100644
index 000000000000..fa765ea1ee92
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guacamole.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.0.tar.gz )
+	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.0.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="AGPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="ldap mysql"
+
+DEPEND="dev-java/maven-bin"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	if use mysql; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-ldap-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
+	insinto /etc/"${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	doins "${S}/${PN}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
+	elog "delete the old content first!"
+	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
+	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
+	elog "like this:"
+	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
+	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
+	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql is not used!"
+}
diff --git a/www-apps/guacamole/guacamole-0.9.2.ebuild b/www-apps/guacamole/guacamole-0.9.2.ebuild
new file mode 100644
index 000000000000..bbb158af9e3f
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.2.tar.gz )
+	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.2.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="AGPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="ldap mysql"
+
+DEPEND="dev-java/maven-bin"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	if use mysql; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-ldap-0.9.2/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-0.9.2/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.2/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
+	insinto /etc/"${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	doins "${S}/${PN}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
+	elog "delete the old content first!"
+	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
+	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
+	elog "like this:"
+	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
+	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
+	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql or ldap is not used!"
+}
diff --git a/www-apps/guacamole/guacamole-0.9.3.ebuild b/www-apps/guacamole/guacamole-0.9.3.ebuild
new file mode 100644
index 000000000000..4388582a470a
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.3.tar.gz )
+	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.3.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="AGPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="ldap mysql"
+
+DEPEND="dev-java/maven-bin"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	if use mysql; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-ldap-0.9.3/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-0.9.3/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.3/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
+	insinto /etc/"${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	doins "${S}/${PN}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
+	elog "delete the old content first!"
+	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
+	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
+	elog "like this:"
+	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
+	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
+	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql or ldap is not used!"
+}
diff --git a/www-apps/guacamole/guacamole-0.9.7.ebuild b/www-apps/guacamole/guacamole-0.9.7.ebuild
new file mode 100644
index 000000000000..95687d83bf21
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	postgres? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	noauth? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz )
+	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql postgres noauth"
+REQUIRED_USE="ldap? ( !mysql !postgres !noauth )
+	mysql? ( !ldap !postgres !noauth )
+	postgres? ( !ldap !mysql !noauth )
+	noauth? ( !ldap !mysql !noauth )"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat[websockets]
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
+	if use noauth; then
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec doins '{}' +
+		insinto "/etc/guacamole"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name '*.xml' -exec doins '{}' +
+		elog "Warning: Setting No Athentication is obviously very insecure! Only use it if you know what you are doing!"
+	elif use mysql; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	elif use postgres; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.postgresql.PostgreSQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
+		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
+		elog "-"
+	elif use ldap; then
+		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/var/lib/${PN}/classpath"
+		find "${WORKDIR}/${PN}-auth-ldap-${PV}/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	else
+		insinto "/etc/${PN}"
+		doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+	fi
+	insinto "/etc/${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	doins "${S}/${PN}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
+	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
+	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/ && mkdir /var/lib/tomcat-7/webapps/.${PN}"
+	elog "You will also need to create a configuration in /var/lib/tomcat-7/webapps/.${PN}/${PN}.properties"
+	elog "See http://guac-dev.org/doc/0.9.7/gug/configuring-guacamole.html#initial-setup for a basic setup"
+	elog "or http://guac-dev.org/doc/0.9.7/gug/jdbc-auth.html for a database for authentication and host definitions."
+}
diff --git a/www-apps/guacamole/guacamole-0.9.8.ebuild b/www-apps/guacamole/guacamole-0.9.8.ebuild
new file mode 100644
index 000000000000..9dd62ab6a653
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	postgres? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	noauth? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz )
+	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql postgres noauth"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat[websockets]
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
+	if use noauth; then
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec doins '{}' +
+		insinto "/etc/guacamole"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name '*.xml' -exec doins '{}' +
+		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
+	fi
+	if use mysql; then
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use postgres; then
+		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-ldap-${PV}" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	insinto "/etc/${PN}"
+	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+	insinto "/etc/${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
+	doenvd 98guacamole
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
+	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
+	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/"
+	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
+	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
+	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
+}
diff --git a/www-apps/guacamole/guacamole-0.9.9.ebuild b/www-apps/guacamole/guacamole-0.9.9.ebuild
new file mode 100644
index 000000000000..7d5b50959203
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.9.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql noauth postgres"
+
+REQUIRED_USE="|| ( ldap mysql noauth postgres )"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+	|| ( www-servers/tomcat:7[websockets] www-servers/tomcat )
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql dev-java/jdbc-mysql )
+	postgres? ( dev-db/postgresql dev-java/jdbc-postgresql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
+	if use mysql || use postgres; then
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-base/" -name '*.jar' -exec doins '{}' +
+	fi
+	if use noauth; then
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/" -name '*.jar' -exec doins '{}' +
+		insinto "/etc/guacamole"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/doc/example/" -name '*.xml' -exec doins '{}' +
+		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
+	fi
+	if use mysql; then
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/mysql"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/schema/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB properties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You also have to enable jdbc-mysql in tomcat!"
+		elog "For tomcat under openrc this can be done in /etc/conf.d/tomcat-7 with TOMCAT_EXTRA_JARS=jdbc-mysql"
+		elog "Another way is to add /usr/share/jdbc-mysql/lib/jdbc-mysql.jar to the classpath."
+		elog "-"
+	fi
+	if use postgres; then
+		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/postgres"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/schema/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB properties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You also have to enable jdbc-postgresql in tomcat!"
+		elog "For tomcat under openrc this can be done in /etc/conf.d/tomcat-7 with TOMCAT_EXTRA_JARS=jdbc-postgresql"
+		elog "Another way is to add /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar to the classpath."
+		elog "-"
+	fi
+	if use ldap; then
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	insinto "/etc/${PN}"
+	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+	insinto "/etc/${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
+	doenvd 98guacamole
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-8/webapps/ first!"
+	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
+	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-8/webapps/"
+	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
+	elog "With systemd make sure that the var GUACAMOLE_HOME is set to /etc/guacamole. for example via /etc/conf/tomcat."
+	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
+	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
+}
diff --git a/www-apps/guacamole/metadata.xml b/www-apps/guacamole/metadata.xml
new file mode 100644
index 000000000000..a86d47c73c59
--- /dev/null
+++ b/www-apps/guacamole/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nativemad@gentoo.org</email>
+    <name>Andreas Schuerch</name>
+  </maintainer>
+  <longdescription>
+	Guacamole is an HTML5 web application that provides access to desktop
+	environments using remote desktop protocols such as VNC or RDP. 
+	A centralized server acts as a tunnel and proxy, allowing access to 
+	multiple desktops through a web browser. No plugins are needed: 
+	the client requires nothing more than a web browser supporting 
+	HTML5 and AJAX.
+    </longdescription>
+  <use>
+    <flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">guacamole</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest
new file mode 100644
index 000000000000..6e35ad04b012
--- /dev/null
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -0,0 +1,5 @@
+DIST monitor-1.3.tar.gz 588836 SHA256 31c580f476f516b9de54d7fa6c57f0f7b4f58268c68a41a823c5a00129d8cdda SHA512 480ef2d2216a47a7b5758e2ceb089233b5f5b3174460a2b7b43f006c76ce9e12a592574d23b6661b7a5408333a40d6867eee3417ea4aa1a9a0c82772114a21b1 WHIRLPOOL b516e271141e245b5a6875f3fa706b83547211371544246ba275d6c045708454dd519acc111873ca3bb7efb267013b715515923e75b7e76002dbeff75f27ab58
+EBUILD hiawatha-monitor-1.3-r1.ebuild 604 SHA256 baa6a4c69bcb3cec015fd32db182afdc81f3d52a47f1350b41c8e0bffd607ab5 SHA512 dbfef4f0427d21e1d74988aca395013d32a3183e4bd6108266b443f429982f9951ffe9189f072b67b294959629491b3df8747ec2167f9631a03cdd27e11dc96f WHIRLPOOL 63c68259244022dcebca5b9d04b7d87902c4a208f9407e4bed36fde15313116540a06cdeb9309a3cedfccb5fcf43f51b82dc5445305194f14865fbac9fd7638a
+MISC ChangeLog 3486 SHA256 62a72f835769cddd45af4c1e4e3d893b641756ff954adbe17f0c26db2d4a7f4f SHA512 f407b641fc5024df15aa8df55bbac852103908575800c669cce88673b7c6120070588e741cbe7a2fa9f0560fca014f8a8676ba739920d26b25b218216e6cdd32 WHIRLPOOL 176935f27c1d0cb07f73eab66fbd3d2e10e7f17cc098f722c97fa4f24193f6ca4372c05f18c85e8fff44e0adbc20f37addde1d5fbbda976300f972b8683ce439
+MISC ChangeLog-2015 657 SHA256 2cd5ddb6e986b0d93d4631600ed4b466ee9b7b00847194afb7f153553c264837 SHA512 e72db6fc6a5cb16709a4ac5d6d0619d1c2408e2fa61fc2003f0f083c69c54906e12e236cd65a3359a1e6c52621a6b3bf0c8b27e129a14bd6b5603acc8b6e1f7f WHIRLPOOL 972e42f1e301f13d274e96059e12bca27155f0675eb6650360465f45e5a0045348b038063fac68026c7aaec07f64f83cbc24aee12e927cec190f3fea68466784
+MISC metadata.xml 249 SHA256 e1536afaaf15936b9f7d8fe1d15bc40074ac51935265f58afaf557bc5a5f4f2d SHA512 c6ce77692bce0084c97651da1c6ecbe2859ce92244618f128c0e74a3ff918b38a29563d40c5d1ddd8beacc17ea306d62f536dd4587f0538158b1e283172a3f74 WHIRLPOOL a7cb094a90889891170786c69403f0f7121dcb96074af7380ce119b45bd1564f2b7db933f5b2004a12f42baab1326d42cd1dacffb7c94d3591ece4776e39c02b
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
new file mode 100644
index 000000000000..5ba20143b6b2
--- /dev/null
+++ b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="monitor"
+
+DESCRIPTION="Monitoring application for www-servers/hiawatha"
+HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor"
+SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/php-5*[mysql,xslt]
+	virtual/cron
+	virtual/mysql
+	www-servers/hiawatha[xslt]"
+
+S=${WORKDIR}/${MY_P}
+
+src_install () {
+	default
+
+	rm -f ChangeLog README LICENSE
+
+	insinto /usr/share/${PN}
+	doins -r *
+}
diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml
new file mode 100644
index 000000000000..c69fcf398c82
--- /dev/null
+++ b/www-apps/hiawatha-monitor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">hsleisink/monitor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/icingaweb2-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
new file mode 100644
index 000000000000..661f02fb5056
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -0,0 +1,5 @@
+DIST icingaweb2-module-director-1.1.0.tar.gz 1287302 SHA256 525434cf8555bfa07aba351769006691fed2a570ec01b06576a901e89647d8df SHA512 a1253c1c803f05b238e12d86e7a367c56e10998293f99beb645ba3ca4d7165407a34dd4f53ef84ee1338464013201adb4fcee09cf3ca78d8850513c366a7a038 WHIRLPOOL 28c7a898c3a0f07bb69932d8d54a39a7f7b225ede32794500f3d75ad8fb0ef168e88c263996d3564603ab6c5a70ea5bf5ad00f4590269f086ae4c933008c62e7
+EBUILD icingaweb2-module-director-1.1.0.ebuild 805 SHA256 94e1ba394f0de42b2590c8336578a10d6b80b7af76ceac22e8fadf9df5534722 SHA512 782d14bc88f2959d18031b4f13e74b35841e94c9727961b7afdafdbf457ca6dd9a91dd9fe569fe30f882c1134b958da3537c75800d569d9d1e326253a9124ad6 WHIRLPOOL 2489e5f7c5350095e5ec4be62bb435d094be243c86125a1203a6293d48c2fbfa694b4b556302628716026650efc2cf533eea91fbc1da469d4e01436228330b15
+EBUILD icingaweb2-module-director-9999.ebuild 805 SHA256 94e1ba394f0de42b2590c8336578a10d6b80b7af76ceac22e8fadf9df5534722 SHA512 782d14bc88f2959d18031b4f13e74b35841e94c9727961b7afdafdbf457ca6dd9a91dd9fe569fe30f882c1134b958da3537c75800d569d9d1e326253a9124ad6 WHIRLPOOL 2489e5f7c5350095e5ec4be62bb435d094be243c86125a1203a6293d48c2fbfa694b4b556302628716026650efc2cf533eea91fbc1da469d4e01436228330b15
+MISC ChangeLog 470 SHA256 7de21a7be9abb59cbe99b21993f055f6bd32ec1d4508263cd039192dce9e7bab SHA512 c3a7e31ba0a18b46398468774e5289d6383e132709196dce6e6073a0e2cef25cccf2d862bfce2342188bc9ecdbe2df6813ea8fbce91ef4dd8a9f6a9dac1bbf16 WHIRLPOOL 0e46e55214cf9c1d3c8e738d8e9e8a110ae4b866b8bc3202dfe1fb09627038ecb2470fc8c7e1f8db487b8a8c9dddcd584426ab77c42f84ba52e950372c59817c
+MISC metadata.xml 254 SHA256 62db0182648c112408826ed42fe7024fc12356fea1efd5924fb7022e50ffcffc SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 WHIRLPOOL 43118ddb06bdece97e50b1ed5e3fab0ebc7f884fca7a2cb7cd719ff3f6b5dbf3b9ca6090d4a6e7d554dc7d354a4cf8c7837951cab8e15590015ff5aa7242f88c
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild
new file mode 100644
index 000000000000..bb2346eec3e3
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-director"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.3
+	>=www-apps/icingaweb2-2.2.0
+	|| (
+		dev-lang/php:5.6[curl]
+		dev-lang/php:7.0[curl]
+	)"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/director/"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
new file mode 100644
index 000000000000..bb2346eec3e3
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-director"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.3
+	>=www-apps/icingaweb2-2.2.0
+	|| (
+		dev-lang/php:5.6[curl]
+		dev-lang/php:7.0[curl]
+	)"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/director/"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-director/metadata.xml b/www-apps/icingaweb2-module-director/metadata.xml
new file mode 100644
index 000000000000..3ffdeb4af3b5
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
new file mode 100644
index 000000000000..252efb43144d
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -0,0 +1,4 @@
+AUX patch-unquote-service.patch 2566 SHA256 07c1cdbeafb5726b87632be05e3f73d3a5581fa942b6cb8d925605d6bbe19e7d SHA512 6365cc7886f3b5d1ceed9b7f46a90ecc80205a0f42aa31e75b53e9384a094503a82a6a86748170af07be021eb08c0bc2ce800b8fffc961401ee3a5290c2b4297 WHIRLPOOL 4f963d1ad18d77267ad49766c9f303611df93f3063f282448b2ae36bc6197b0f67a3cd4da8d5fc5b76c5f94c9fb8e70fc0644579953e4b0c2730a81db5c08786
+EBUILD icingaweb2-module-graphite-9999.ebuild 756 SHA256 7b0dc97c7e6ea036a25a7bcb51f2ea1587b2180c5d90fc2bf6b4d3068e9585d8 SHA512 717da1e4407afcde50eafb1ce60fc1a04bbc9da3f4406d679959b34f00e46637518342bd822420a447a4a5511a682dbd5ed895819589fd2ea0e4152dfa308ecc WHIRLPOOL a9a666e673d0fe0f4be3eb034df34112638b466119fa55af5ae4c43e520f490503134d2c717ca9dec57aadfc64f6c3021e6ab95ace415499aa306d455d2e9131
+MISC ChangeLog 735 SHA256 e65cca820c9adb47681ee631fc7b290394168f81b41517d2b9b4ce12bd1e4677 SHA512 daaaf5628b81a71bdda5f510b5b28b45ba1cbf47ced9893ec97d278030bfecd0ee737970dcee47fa78d428390385bad9d6d1ebe16533a5ffa01f53d3f7fa6634 WHIRLPOOL 5dbe4079040d154c8239559e2c7d23648a66f1c0f170fc11639c459beec832ce9eb879301c89d346559926fa67f74ae725466aa53fc29171d5fa4bb469fc3555
+MISC metadata.xml 254 SHA256 62db0182648c112408826ed42fe7024fc12356fea1efd5924fb7022e50ffcffc SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 WHIRLPOOL 43118ddb06bdece97e50b1ed5e3fab0ebc7f884fca7a2cb7cd719ff3f6b5dbf3b9ca6090d4a6e7d554dc7d354a4cf8c7837951cab8e15590015ff5aa7242f88c
diff --git a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
new file mode 100644
index 000000000000..3dde1f45a964
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
@@ -0,0 +1,54 @@
+From 3e5921b96b17ea4d0a5f32a39940a9b762e5c3a4 Mon Sep 17 00:00:00 2001
+From: Matthew Thode <mthode@mthode.org>
+Date: Tue, 12 Apr 2016 03:14:16 +0000
+Subject: [PATCH] remove quotes around $service variable
+
+This fixes https://dev.icinga.org/issues/11572
+
+This still leaves $hostname being quoted, I don't know if that needs to go as well.
+---
+ application/controllers/ShowController.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
+index f029b81..0457ce9 100644
+--- a/application/controllers/ShowController.php
++++ b/application/controllers/ShowController.php
+@@ -168,7 +168,7 @@ public function hostAction()
+             if (! array_key_exists('icingaHost', $patterns)) continue;
+ 
+             foreach ($set->loadTemplates() as $key => $template) {
+-                if (strpos($template->getFilterString(), '$service') !== false) continue;
++                if (strpos($template->getFilterString(), $service) !== false) continue;
+ 
+                 $imgParams = array(
+                     'template' => $key,
+@@ -228,7 +228,7 @@ public function serviceAction()
+             if (! array_key_exists('icingaHost', $patterns)) continue;
+ 
+             foreach ($set->loadTemplates() as $key => $template) {
+-                if (strpos($template->getFilterString(), '$service') === false) continue;
++                if (strpos($template->getFilterString(), $service) === false) continue;
+ 
+                 $imgParams = array(
+                     'template' => $key,
+@@ -289,7 +289,7 @@ public function XXXserviceAction()
+ 
+             foreach ($set->loadTemplates() as $key => $template) {
+ 
+-                if (strpos($template->getFilterString(), '$service') === false) continue;
++                if (strpos($template->getFilterString(), $service) === false) continue;
+ 
+                 $this->view->templates[$key] = $template;
+ 
+diff -Naur a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php
+--- a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:10:49.794640399 -0500
++++ b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:11:17.136401235 -0500
+@@ -16,6 +16,7 @@
+                 array(
+                     'host'    => $service->host_name,
+                     'service' => $service->service_description,
++                    'check_command' => $service->service_check_command,
+                 ))
+         );
+     }
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
new file mode 100644
index 000000000000..7e359c940e4c
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
+HOMEPAGE="http://www.icinga.org/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-pnp"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+	>=www-apps/icingaweb2-2.0.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/patch-unquote-service.patch" )
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/graphite/"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-graphite/metadata.xml b/www-apps/icingaweb2-module-graphite/metadata.xml
new file mode 100644
index 000000000000..3ffdeb4af3b5
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/icingaweb2-module-pnp4nagios/Manifest b/www-apps/icingaweb2-module-pnp4nagios/Manifest
new file mode 100644
index 000000000000..f20e03c9400a
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/Manifest
@@ -0,0 +1,5 @@
+DIST icingaweb2-module-pnp4nagios-1.0.1.tar.gz 5988 SHA256 956d2afe1dc3895994381baf40f3ac326ba1f771c84c86b54ba39c64b78483df SHA512 594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333 WHIRLPOOL 03d0b7c008d724055fd930e86a88e0e1ecaba9bd803882cab0acba1fa01d1784f9efdda4f2dad943af411fd0fedafd87563e7e1b179c6b7bea3baba9c5fe1684
+EBUILD icingaweb2-module-pnp4nagios-1.0.1.ebuild 688 SHA256 88c3351112697beb8bab13c0f9aac7ace0b36b18d4446f8eb4581e30fd17632d SHA512 aabf5d8a258c3836dfdc15ab5bf01d609aeacf5223c27d4ad059c842f5086eb2c72b40596c34ab7470fc3239d082ff7ba1c5a28f50c55c6e9b6568c658af6beb WHIRLPOOL aa84c9a146ce996a4d90a4ad6c6faae20664ff736eb4a688624b3686ab4c6dc46b8bd8115a21d4902eb040f750e870177edac3a306217d691cc5b4ba838f4e97
+EBUILD icingaweb2-module-pnp4nagios-9999.ebuild 690 SHA256 93f49d940fb5ffa7f960c08e0dbbe32a69deaa6d59412c787667f83bda1c1f14 SHA512 4c7f2684bafce8757c0250134df8619af830694288fb0a6b1cd1ba8b16aaec780904edc00a5c79427546c90cf99cecc9326858e772c6fd83a3e6dee5cf419c66 WHIRLPOOL 73a79b9ef85174cb4e047fec1ca7e0a5a2960974e13f14aad3f243318265aa465ee4d2bbc442fcccba9f09e5bb21fd3f79b8e9bfdc0d9d239d71c9488c92a209
+MISC ChangeLog 1877 SHA256 881b0375322c51d2363b5074b8511aaa791e0303f9266861007a37077b1e0af6 SHA512 2bb4034a17c6cc791f8d5112904c1dd92d1c1d12fb1831b5cc90d5266352de265bb6ecdfcf01ecef3c1e9e63065553969b12b83b7c58a8c62b1e883dc3bb6f98 WHIRLPOOL a9e464bca5a59e531c4e22a2252d91f8cf9716fbadc517bd464d89b56c8c91858312e599a807acaebe445a4be512f91066f5f5ab5016ddb1f68d3f8e8ecacf52
+MISC metadata.xml 254 SHA256 62db0182648c112408826ed42fe7024fc12356fea1efd5924fb7022e50ffcffc SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 WHIRLPOOL 43118ddb06bdece97e50b1ed5e3fab0ebc7f884fca7a2cb7cd719ff3f6b5dbf3b9ca6090d4a6e7d554dc7d354a4cf8c7837951cab8e15590015ff5aa7242f88c
diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild
new file mode 100644
index 000000000000..5baa7a2e1c90
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
+HOMEPAGE="http://www.icinga.org/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp.git"
+else
+	KEYWORDS="amd64 x86"
+	MY_PN="icingaweb2-module-pnp"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+	>=www-apps/icingaweb2-2.0.0"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/pnp"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild
new file mode 100644
index 000000000000..aff9792a698b
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
+HOMEPAGE="http://www.icinga.org/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-pnp"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+	>=www-apps/icingaweb2-2.0.0"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/pnp"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2-module-pnp4nagios/metadata.xml b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
new file mode 100644
index 000000000000..3ffdeb4af3b5
--- /dev/null
+++ b/www-apps/icingaweb2-module-pnp4nagios/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
new file mode 100644
index 000000000000..96d71b072381
--- /dev/null
+++ b/www-apps/icingaweb2/Manifest
@@ -0,0 +1,7 @@
+DIST icingaweb2-2.4.1.tar.gz 7176640 SHA256 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6 SHA512 21ac8faea3e339cfc668407cef826cf4a8f01c964ad102e2c9bc9716e20c3177cea10ec575b99a5a4bb0a9681032b83427c250c5288b037a70d27dc919d0f641 WHIRLPOOL 40c5e48f0c7b6b32cb1eb02c1a447512bdba397eda8c20110a1e4d0c0b794265fe413c2c3a1a56d3f009e4245e211322a5b97a16449af4a1ff90bb4831f781fb
+DIST icingaweb2-2.4.2.tar.gz 7180122 SHA256 8ce42b4f0fb3ddd93c56d70c642512af13db1d5db2ad0227ec7567a4413daa94 SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53 WHIRLPOOL 0f350e796e5b03c5d3e0c501cdae8c485c2eb745da87e308f57066cfe507d24482799ab9e6fe1ed621c19f14fcca3b97c7f57d67a28ac51e42c13aa7094afe83
+EBUILD icingaweb2-2.4.1-r1.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
+EBUILD icingaweb2-2.4.2.ebuild 2551 SHA256 f8eb44b0693890012405e741cb712ad0fd1547be90021414026bcabacfd39e89 SHA512 4b59c96f553f19d648c4444e94372f88bb69da38c8f1d9e8d5c57a4720f48ce81e1f72742a2db29f8c5e8f02b3323457abc96b80f7b737cee2418721034dce12 WHIRLPOOL 11c14cc483109b185946c70590f51be02503a6862e72b9238e7af5a07ea1ffee2f27883871d969b16388a203e6f8cce559612a7ace3996fbfc59a59aecdc7764
+EBUILD icingaweb2-9999.ebuild 2546 SHA256 cf85e05cdf795c6ccf373bb0d4e3d00a6c97a8acedd331dc72526854d1a44e4f SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc WHIRLPOOL 6e168c77c068b5cad0f9d1f9dda10b546501f802f0d6fedadb737f6b213757cad8500fd7e985cbed1d6cbf37eca6ba6686060865f4877f7eaa707e45e6b62cd4
+MISC ChangeLog 5943 SHA256 9eadd672b6c42d1fe6693377dd99ef67a692b7d4069e21a4e683700866e2d43b SHA512 f3726691410d5de8c4d3f3aef22903f4b418eb8b80adc4933f564e6a4179288bf9ea625d135129e6d309b810aa417fbef88426e1fe00ff360ccaafc626448225 WHIRLPOOL cfd9631fccd26df693305c2b26563577c8dc985a084cf11d2214ed3c601d6650daf72d60221373f6ff4c7e98222b1eadee818284f1f493ab55bffafaf03ce6c1
+MISC metadata.xml 407 SHA256 b9ad2e9df3e4db89dc3e44032cf06cec95938ec8c990b7abea53f2c0e8ae5e62 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961 WHIRLPOOL 15cb580f93914e0c73c25d3cc5e0c3d2fd24e0e5ae5c3c3c2369e85dcbb141828e4b5f0ce59efe01c0d8899339314695e701e9aeedd9f4c15560156598bbd74a
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..796ba177fbff
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		nginx? (
+			>=www-servers/nginx-1.7.0:*
+			|| (
+				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
new file mode 100644
index 000000000000..9c54138b2b4f
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		nginx? (
+			>=www-servers/nginx-1.7.0:*
+			|| (
+				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
new file mode 100644
index 000000000000..77eb59b174d2
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils git-r3 multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+EGIT_BRANCH="master"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS=""
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		nginx? (
+			>=www-servers/nginx-1.7.0:*
+			|| (
+				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
new file mode 100644
index 000000000000..1a95653552cb
--- /dev/null
+++ b/www-apps/icingaweb2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Icinga Web 2 - Frontend for icinga2
+	</longdescription>
+	<use>
+		<flag name="nginx">Adds support for nginx</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
new file mode 100644
index 000000000000..e15e09e3ea1b
--- /dev/null
+++ b/www-apps/ikiwiki/Manifest
@@ -0,0 +1,5 @@
+DIST ikiwiki_3.20170111.tar.xz 2614240 SHA256 5f0f99a4f4a5f17046e4601d628424cb2877766b4ef9bfe1c2db1941f6f7a701 SHA512 78c2a624684bb1c34878ff008558a3967f6e7f5648878e931961695e582a40e4351b6e467c64ca42ba99cb403fd275265bd5d96ecd860ad8263043514d207ad4 WHIRLPOOL 75611e804a5a6cb2e1c83f040ba791e15a152cc267c46ea0fab58719e02f48186aaaa1ca725611978f994317f9c5c71cce490dd68b384bf399c2a96b26fd3182
+EBUILD ikiwiki-3.20170111.ebuild 2086 SHA256 e174848d3f77617d22da5cffbab7ec3d1c096d84bbf6ec45278ecae12481fde3 SHA512 7efdda5c7beb52be7f3de65a0090be7295f97350e69091d1069908d36f3165293e1ae399dbaa25bea68f5b433d2aa7c48918d7f7f4c1559a303c7f8d71336b52 WHIRLPOOL e015fd2acd1c50de975e3c763618280817cdb0894672d50144804a7cc6df58731f5f2cd7d951a78cc7a97035205a573ad29a1fa3327c8700a5eb650475032b83
+MISC ChangeLog 3523 SHA256 bb0092142f43ed33e4acbc5b716ad4b4ca4cf6a1697fe7ab07af8aefbfe24425 SHA512 e5346eec5d9d9919c5f8d7a75a96d97df29afb484c14ed484c1567b8560c7f67288a332216c90aff169bbbf84855e18d4d89c228879d644dd1e14f62dce3c178 WHIRLPOOL 605befe8a09a30df0db6a7539f38474820fd031fad8598ede4ebdc344a5bdda7b42b417a4e5014e2049415a42b7bfdbe2a18a99d777a45f691f66fab9a8bcb69
+MISC ChangeLog-2015 3985 SHA256 c94fa7fff7679838d42ba57514f9000ec975d1f60f1539986c42cd3be8159683 SHA512 37547a37a042814214214cf144cf5de9512ee65492fb61e5211631b65b01c916d6c677056e7f1e0b02fca2db077ec73abce5f972273536413bb6c4ce9f031cb9 WHIRLPOOL 7b4759788c8b51f1244a1ebe1b740684357d02458003ad233b2847846d9980ecbc27bb7980cb1f6811505a4e0b378e18f07eefd5373ac94d69daf977b6a8bb08
+MISC metadata.xml 383 SHA256 1b22db006d208d7442fa99c690556d468b7c11745b2eca760cb747f7162999e7 SHA512 4f55512ca2a5ee443ca93902f93002f726634c7785440ed5c6a9517e39520b1b321f883a000e0365d752c7550f7d47dea0d3f866696cced92987b3d95d7c0b84 WHIRLPOOL d09269cba861c22bfa16291fb1928c346c3b0b8470eaa5a181336155f2c75c2d16e510e16c06ddcde6e78ea7d6bd79d2067fb43a58a7b7148780dc24690172de
diff --git a/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild b/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
new file mode 100644
index 000000000000..56db287375d9
--- /dev/null
+++ b/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A wiki compiler"
+HOMEPAGE="http://ikiwiki.info/"
+SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="extras minimal test"
+KEYWORDS="amd64 ~x86"
+
+S=${WORKDIR}/${PN}-${PV}
+
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPEND="
+	dev-python/docutils
+	dev-perl/Digest-SHA1
+	dev-perl/File-MimeInfo
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/LWPx-ParanoidAgent
+	dev-perl/Net-OpenID-Consumer
+"
+
+SUGGESTED_RDEPEND="
+	dev-perl/CGI
+	>=dev-perl/CGI-FormBuilder-3.0202
+	>=dev-perl/CGI-Session-4.14
+	dev-perl/Mail-Sendmail
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/XML-Simple
+	media-gfx/imagemagick[perl]
+"
+
+TEST_DEPEND="
+	dev-perl/File-chdir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-MimeInfo
+	dev-perl/HTML-LinkExtractor
+	dev-perl/HTML-Tree
+	dev-perl/Net-OpenID-Consumer
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/XML-Twig
+	dev-vcs/cvs[server]
+	dev-vcs/cvsps"
+
+DEPEND="
+	>=dev-lang/perl-5.10
+	app-text/po4a
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Scrubber
+	dev-perl/HTML-Template
+	dev-perl/URI
+	dev-perl/Text-Markdown
+	dev-perl/TimeDate
+	dev-perl/YAML-LibYAML
+"
+
+RDEPEND="${DEPEND}
+	!minimal? (
+		${SUGGESTED_RDEPEND}
+		extras? (
+			${EXTRA_RDEPEND}
+		)
+	)
+"
+
+DEPEND="${DEPEND}
+	test? ( ${TEST_DEPEND} )"
+
+SRC_TEST=do
+
+src_prepare() {
+	#bug 498444 /usr/lib/plan9/lib/fortunes.index
+	addpredict "/usr/lib/plan9/lib/fortunes"
+
+	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
+		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
+#	if use w3m ; then
+		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
+#	else
+#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
+#	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" pure_install
+	insinto /etc/ikiwiki
+	doins wikilist
+
+	#insinto /usr/share/doc/${PF}/examples
+	#doins -r doc/examples/*
+	dohtml -r -A setup html/*
+	dodoc debian/{NEWS,changelog}
+}
diff --git a/www-apps/ikiwiki/metadata.xml b/www-apps/ikiwiki/metadata.xml
new file mode 100644
index 000000000000..86a50d834cff
--- /dev/null
+++ b/www-apps/ikiwiki/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>alicef@gentoo.org</email>
+	<name>Alice Ferrazzi</name>
+	<description>Assign bugs to me.</description>
+</maintainer>
+<use>
+	<flag name="extras">Installs additional modules used by ikiwiki plugins</flag>
+</use>
+</pkgmetadata>
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
new file mode 100644
index 000000000000..06ebf5b8cd8a
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -0,0 +1,7 @@
+DIST jekyll-coffeescript-1.0.1.tar.gz 5206 SHA256 3d158308aabe670c1f58dc55dc8ce5eb7ff80cc83684e152c12816517303660a SHA512 88c73c2393dff2b9dc8aac2329f6e669f98c66c5d1b7ee2a4dc2236608197a3bfdc07bd4a67832c94f4059e4c82212b2b14c4f37b48957e4b40c9d2449c7c482 WHIRLPOOL 0a474eeac58c9e5fbb49aff067bfb26c26d8588b4e05aa03a656a4a72024e29cd09838c34d425fbc279ed2583818de409ab153a297b7bfd6a00e03fa844dd1f3
+DIST jekyll-coffeescript-1.0.2.tar.gz 5042 SHA256 80b69e7e5031670fee841682f9f1e3d81dbe2b2caa1f4807e0b38f7ca545dffc SHA512 cc8e3fc21d9ff0b4c0fb00652e8a8011fbb535f6c1b51c0c380637cb124524282f6ef5272e82976f964c5eae66a8340bd11f516f6625732d9ee51ef6c58b3a8f WHIRLPOOL 38b0650bb38b2ed316f4d830e6d96d1b726cfdddec6324ef66d9cd0f8b066e5488bc82b17b87504746b70e7734ac64effcdf6f82449189bef678cdee0c88430c
+EBUILD jekyll-coffeescript-1.0.1.ebuild 802 SHA256 f028c72d728f60116eb5571a3f80891014e9e50ff4332a182066ddbb529febc8 SHA512 a0d3dd6c935e0cd02ef8068291a93b97af00c4c8b37d8f013e443b3e72e10772a9ce7f8ac5b9a6111d3b4af6db45884ec7bb99adf1878a5da6b374a8a43c8997 WHIRLPOOL b349184f87ef6b4ea88fa624e3fa7ede6915ceed5717b13dcd645fd89af1bba4e2d6a0d070df32866954c4a41d807845b70eeea82021d25a005dbdab29bdd7ae
+EBUILD jekyll-coffeescript-1.0.2.ebuild 912 SHA256 1e22d528dce84b816b30b56a7cbebda65f12bc5b6092156285a3b48713912fd7 SHA512 f5e42137c2d89c91d865357066168c286286538b5bdb6589d0726de3cff637e970a8591e0ff0cda971a2f1db78063d87a53baa9cc3ec2201f8c671b24ea7bbfd WHIRLPOOL 91894e2b25ca7e4e9d66ab76ddcdb05d20e1ece31214c6e7f2026cf2046a676e7287bc34825215b160b98b405061f801934573193438cba9c30a2c122c0187ec
+MISC ChangeLog 2487 SHA256 85b934628830afb5c885be94a31567b85bb4fd325d87073310bafc86c54b08cd SHA512 6770ff871b0d53ddf5fb40b820301f07a74d3a295906aaa1231c8bbd4d12983e392eb6f91c63a95befa73d44756732e503cef8de84718624f03c43b35ed23e92 WHIRLPOOL 7d1d36a4323019ffe7df394e270846624dcfd371998ff0a515bd316b8524cf7db2cc2f104f17c64f07aded5aa354ac001aba9668863efbad202ef5062cf5fcda
+MISC ChangeLog-2015 702 SHA256 6d56a28a5f746ec60eaea115236778775628fcd7b844acf6c051bfd276d1f8d1 SHA512 56cca0d65cf3f50d530dad62881e81880643d9bf5720e6cf64283bf402dba103b001f7284e6d130c9a669678d24ace56e79aa6d78cb51551890ff6f5b5e52f4c WHIRLPOOL c5aeb1b5565c76fdd910989fe21cbcaf9ad4e74cfbce7b011fde3eda67abb4734deb4472e049ae4f49b18258c33c6eaef938db3bfbea81c01b5299bbadc01221
+MISC metadata.xml 258 SHA256 665c4b7ed8df7336aa445df49b91974820a6e018bb6a2ebea796b3e45fa4ac7e SHA512 8b1799e5aa23344c02ea25191a591a380ec32fb1e1c99557e128eaac9a28b7f2c5d2a0333e3128e00742cc784849424bb737127cfe9f27812656a3f61ab32d7b WHIRLPOOL 2671bfd17cbedb8136d07e9912367e60be10936af4c00806765bb9c1128cef84f09b49964bfbd80110afc1e892fe94deba5b19f37630798e0aeba1d4d5d07bf5
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
new file mode 100644
index 000000000000..1b1c70de2aa0
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A CoffeeScript Converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "/^RSpec/i \
+		require 'jekyll'"\
+		-e "/^RSpec/i \
+		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
+}
+
+ruby_add_rdepend "dev-ruby/coffee-script"
+ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2.ebuild
new file mode 100644
index 000000000000..94f08dc2f4df
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A CoffeeScript Converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "/^RSpec/i \
+		require 'jekyll'"\
+		-e "/^RSpec/i \
+		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
+}
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
+	<dev-ruby/coffee-script-3
+	>=dev-ruby/coffee-script-source-1.11.1
+	<dev-ruby/coffee-script-source-1.12"
+ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-coffeescript/metadata.xml b/www-apps/jekyll-coffeescript/metadata.xml
new file mode 100644
index 000000000000..e02a104f3be5
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-coffeescript</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest
new file mode 100644
index 000000000000..583ca3834956
--- /dev/null
+++ b/www-apps/jekyll-gist/Manifest
@@ -0,0 +1,5 @@
+DIST jekyll-gist-1.4.0.tar.gz 7474 SHA256 cedcfc4084d643c78864d13501d50df9ad350f8023f126ce5e3efa5751b01f88 SHA512 924d2b3175378ae32277717932556ec32035aa9ad229b2c0925809b02feaf657a16d84f81c9793e0c25d06f8c05a852c427a8f2bcd264a0a1dc7d030cb8adebe WHIRLPOOL 9b8c8e7aa910394863efc54e1c2dd67bb1b960e3a29fe4eb9307fd18193bafcd5646b5cfe08a510cd6d448009227165f5acbf30313f58512dbb98fef0e5925fd
+EBUILD jekyll-gist-1.4.0.ebuild 675 SHA256 8cfb676d3ec415f4e42d6a920a0c2390598ed51f861d1a57642c1aa683ca14d0 SHA512 bbdd0c08b6b08413913f8ef835fe98fdc77e431bd90b6f4d74312644d68283b28a10eed0a3b77f63ebc0727270aa7ee802df27c67ffab7d23d0adb18a24a7b05 WHIRLPOOL 932cd561c235ca75ffe05f6484d748008e14f5db84d694825bfc07a9fda3ae51633f8626ca8270ab80d813fbde47735592d74c8e67fec8e058b17072663c6232
+MISC ChangeLog 3537 SHA256 344d1f6348dfc3db0961c35e16eb4f584e23fffc7b92f884fee7b6d17b94903a SHA512 ed1567c634c3a61a6711ed8203fa61d21b62645e3631338613f2e9c7ebaf3d824e54f0ceb4fae7a7bd9fd5c0380bbfa8740abbf1890026718fc2ea893e9cf1bb WHIRLPOOL ca56774c7e546e7bd0423936b3609d6ad47b359b0959f94e9bdf1745509fa8e86ab9b930043984b13fe90d281b1b2a36acb75c5e6779c44e2e7a1975f60e4ebc
+MISC ChangeLog-2015 853 SHA256 f71d6029e7cdf5a6a5fc06d97afadb0a5322c95fec4efa88e3f2c1806d23f538 SHA512 b2a37f12f65e9d3ffd5bfffc89f1dc1707f2935cdce7ba144c4e49aa1be9712c14d1ec33e8352ae0498cb99c42607dfbad3be4a6db5e0af1eee4ad0c553764d8 WHIRLPOOL 78549c99537269a65892125ad4ea8f3fb5078d55f778bb716fccbdd59600994c5f271a4a626cf06c1440b7f989869972b16b98355e55ac70ef3489551ebb6b6f
+MISC metadata.xml 250 SHA256 104c17d0e12d7ced67999c43a7457b7540ba390b6e683b5a716b94f31ff4bfae SHA512 1edc8986885d38177545b065421e83c2f5c5ac8b527475e733cbdbbf5cda27fb2f79e71589b891039f53e63b3171d3264fa1dba133f2c93ad2f025890cd745c7 WHIRLPOOL 5171bbebfa727fcd0f20f4a06072d6c966e4b07db68e30288e13c38eb8fdeb5f59633b8f8421479672edd3d13ef77e372b350ed476d9967924aebe36331c572e
diff --git a/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
new file mode 100644
index 000000000000..14fa2d17819f
--- /dev/null
+++ b/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid tag for displaying GitHub Gists in Jekyll sites"
+HOMEPAGE="https://github.com/jekyll/jekyll-gist"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/octokit-4.2"
+ruby_add_bdepend "test? ( dev-ruby/webmock
+	>=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll-gist/metadata.xml b/www-apps/jekyll-gist/metadata.xml
new file mode 100644
index 000000000000..6503a3ea052e
--- /dev/null
+++ b/www-apps/jekyll-gist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-gist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
new file mode 100644
index 000000000000..88c809d538ee
--- /dev/null
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -0,0 +1,7 @@
+DIST jekyll-sass-converter-1.4.0.tar.gz 7986 SHA256 934891e329d8258d7968e9b604bc4cf811b640a2ff71f8aa640830132c99fe0e SHA512 2ba7a10b687aa1cdd193c85c70efc15b9ff97987e29b7c591382c706a7d6a588c376995858ab0b1aff38b118eef9fd71c2175a1e6f9a3bc396966fdf13949d1b WHIRLPOOL 44950a3379aae76dabd1fd7bde72f9d48e4a5c99cfed6453356274e06885530d2c10641934f7ddb5f6037f83f06a772b98f638f4aaa6eaf3d550975296d304c7
+DIST jekyll-sass-converter-1.5.0.tar.gz 8516 SHA256 b6e42e91c38e3340d8b10577297e9c1b9d9ee38e613246a48f6db4a046bb6a98 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52 WHIRLPOOL 44bdcc4737eced23f094b105464ca8fb4a586aa36468378fe4bcbcee5b25462f57b330ae16940652b3f36c3b0d99e304dacb324e459044316c92b5c58f74f66b
+EBUILD jekyll-sass-converter-1.4.0.ebuild 597 SHA256 a0453b5dfacdcd09b14ccde9a6f5971cebc87f9b82df565295337e981c24d2bc SHA512 e2380e6780cda0c7b49ce7a78fb4ba643bd6d22867ec5b7c93ad0cb4ce96e8e0cabe0794c30d4f9074456ebaffe4cf556bb0290d1888f6f3e54ecc08b99b10ec WHIRLPOOL 0b22b5e4ca1a02ae389e96d7bfd4a3b265f57f993a03f72366fddad6191c14ca68c8d926bc83999564fc7ee01109d6badcec2336ad99fb07b9bb53a6e0716edc
+EBUILD jekyll-sass-converter-1.5.0.ebuild 688 SHA256 3f39ea8cfe13e04574835391db26bea74295144978b4fbed391b0035fc0f647f SHA512 02ada2e99cb7f376e0aef344d5b7517c0bf9a871e41afaf71a11c1769b3fae5a586712d3ae8866d0fe23419f5bee78f28d2a8da3c71503f08982ddb2a494a4f4 WHIRLPOOL 690671890241e6272b8888873f4637f434ba213566d42d5082577d27f94f62caba1f197b81d19f09c8299f97d8e59b5fdada9adc662754ac560a438eb5818342
+MISC ChangeLog 2860 SHA256 0e46b21f440d60d93a9631a814e057598e8a11b5588ffdfd01ad8ca31c25d94b SHA512 4025a899a5c0cd864f02b13f5d8697dc91ef8eb12dc1aae9f7939d1043777ee5b1e8e54bb9b1a49f1cd829781cd201298f6a392664ea00ea9a1983e0952cee90 WHIRLPOOL 70b752742902d0712a6a3bc729d1151b4261ea188df2a5d595f046369369a0c997a9f66679f3651be847b5bd5a8a52b69984f3c63d00061fce8569648e133af5
+MISC ChangeLog-2015 918 SHA256 da1aea250e1ba130458001377f3104440ef3801f47813ea92f54a0b1fbe4e6dd SHA512 edca024739e57f7d2d27df46c5a6e67f17beab2c9e0f8948fea3dc1c2b0e52b7ee343ffb3b4bd94cb1d07aaefb84ffa18bd4d875784febfff55d7c28823db0da WHIRLPOOL 7279afee361f1a9204650f389c1064395b6c3ac9f68eedb6171ee3980a692ceb8bd768b97bb782f59cd3257b52e92a232c0209065a013859a675ea13b9f1f4c0
+MISC metadata.xml 260 SHA256 35d193d4cc6341eb8a2ea83921dfc9b7901df29b8a625fb39cbbe1307a897df8 SHA512 207b20296e3395252acb18e43ed66393d8ce6ed8e3f80a57ab783975556f55ce1d0b352a7b97266d717ca813e9ab9e8eb51be0e05e0d54346d4396b7e4bc6ecf WHIRLPOOL a439d205197888bd5db52009d05c636a5888152b4457c458255477da42c79390e10305ab10fff51c8790540976a32353b422c71707fd2a154b756c93ddd6594c
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
new file mode 100644
index 000000000000..b109b85567e7
--- /dev/null
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A basic Sass converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/sass:3.4"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
new file mode 100644
index 000000000000..742a16fda3de
--- /dev/null
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A basic Sass converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/sass:3.4"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
+}
diff --git a/www-apps/jekyll-sass-converter/metadata.xml b/www-apps/jekyll-sass-converter/metadata.xml
new file mode 100644
index 000000000000..ee34c5f8d2d3
--- /dev/null
+++ b/www-apps/jekyll-sass-converter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-sass-converter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
new file mode 100644
index 000000000000..c774b5348bf2
--- /dev/null
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -0,0 +1,5 @@
+DIST jekyll-sitemap-0.11.0.tar.gz 64238 SHA256 83bf53a58206eb2bf8b88dba07ee8f0e1d33f337f6d252f09191268456c92a00 SHA512 ba1bb162586b8383b1ede68e86cec73db023400586e373572aa8e7c3e26ef1024d313ce59aa1f7711b2b34ba08220be99d5bfeb0ea804e1a1091c0953f8de095 WHIRLPOOL ca86ce506708c60261e5ae2665afd334f51b8b169484086f081ef38ad98fc66f4ac9d4ce46575353b6707b89de3cbb3bbee0c6f227751f040bc95da21996b62c
+EBUILD jekyll-sitemap-0.11.0.ebuild 625 SHA256 827cf72fbb675f9bf93f03df1dcc1aa157b1f164ccdbbc4e112bdf02af232a7a SHA512 5835dcbb38496198e35fc20bf9e980f7e7f24701ce078f9fb6db00f2174ac2b90961732c5e078d2becdd3f390aaf635485a8ebb1621e98cfa3d71cd7665f5296 WHIRLPOOL 9366c8ca0d8e88fa1a3358df3de1cc1b25395f88a9eb836d13c70778be513e5ca95541887b3f6704eeb05b44ce3b979c06efb1401788cd900c40ac75d8037f59
+MISC ChangeLog 3351 SHA256 214cd9de740d6b05627a67a4632e5c9305fbb8d0e45dd5712256efce5034904c SHA512 40232416eb8a563ab3e3d24aa365facd5bf75b375c53045ccda0db4e10c3af4121e68766239ba060bc33da69091823bba1e066897ab9d1287ea4245176e7d9b0 WHIRLPOOL a4f6ceb66b2c5566cae506708a1ef79ed682cf1f3cb1c6c2c937ad0ea5f7c2fdc0de18c176670a4a5c6e20c808e372bdaf6d7b323f6421345199ca25d8243cd5
+MISC ChangeLog-2015 1581 SHA256 be5757f50af49bbd7b725ae34fd62fb5ceeede57dbaa2aac413f71b322ca3a80 SHA512 7e0c40f83d7b477237c3464a7373514b022391bb50c38415b43ff120cfe8619c4634709d17214b91251fadd2ddcde382cd1ee68b347a1e3bced9efbc58f75060 WHIRLPOOL 3e45ec08d27d71eb5674c9e45e57cf591f60e10e021442ca64bc46ebbee24cace49f9897120219c7c95b7db7995fb1eb778645f1bcf45500a5f1cc24e8a10707
+MISC metadata.xml 253 SHA256 79a42395fa120b2e52867cdd1417980a8d95c467084136ec60834c81747f8097 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712 WHIRLPOOL f153bd85411f2d45dce3853ab84b643f986cf1f0b4ee8028a9d87c6fd36808d6f5a5b4c255768812ce3c626652edf99ede19e6c68c4c7443d2ebe7bab5f11df8
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
new file mode 100644
index 000000000000..e9a53768800b
--- /dev/null
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
+HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+ruby_add_rdepend ">=dev-ruby/addressable-2.4.0"
diff --git a/www-apps/jekyll-sitemap/metadata.xml b/www-apps/jekyll-sitemap/metadata.xml
new file mode 100644
index 000000000000..3604c4cf448f
--- /dev/null
+++ b/www-apps/jekyll-sitemap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-sitemap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
new file mode 100644
index 000000000000..c2ab95722c6e
--- /dev/null
+++ b/www-apps/jekyll-watch/Manifest
@@ -0,0 +1,7 @@
+DIST jekyll-watch-1.3.1.tar.gz 14735 SHA256 6912621ac177c8ed09e4f79e15f7f378feddc5e14a500c82784c3da6704dc1cd SHA512 ce54f4367cd2c5a63ce823b234584a84798fe0234165cb038f3af301b7ddef39ef1a983aad41843e51d1af9366e495a83112f6b55bd58127d1c95eaf5600eee4 WHIRLPOOL c406990fd077c0cd46af8a36624d57c7dca91888d0305f25fb682fe4301c970b59fcc583aec637ec4bec13cca57b2a16891f1ec0b5336375a0dbd94732612f3f
+DIST jekyll-watch-1.5.0.tar.gz 15076 SHA256 b9fd28baf4b726d0a37f9e645901b7de06bf64ecf661e66a4dbe3024031cbd7a SHA512 98c9df7f92c214b0047cf266e06c48350615836af3b7ea69e1f77b10d26e4ed441fdbbdc16e557ef2293fe5ab1314ed71bb3e0e65e3f1ad4c4224f71e1255c95 WHIRLPOOL 32cf445ec618b121ade047688f622e33554260c76beaeae82a3a0b7f8a95fad7179267f0c911321dfc03c09a6ed308f6fd78170c0e7f528227ca0917d7968297
+EBUILD jekyll-watch-1.3.1.ebuild 671 SHA256 a6c1bcb555742bef2eb1de9f9a2ae623bf5b563fc4523dc8ab5e613576398d81 SHA512 1f09a81007da1bfd4c698a189fb04c5a421bd372b0c3381590cb21f09ce442cd8b401bc9e27081aa08343bb1069ad8e64ad118d68deef13c3fded4af6b9b7828 WHIRLPOOL 7b0ed8f3e85c96ce2b572ca14d63117ac696c040936d658110acfb8758e02faa3aa12dd7d21571940628a7fe56d10304ed274d120826cf127a9b041132f6d148
+EBUILD jekyll-watch-1.5.0.ebuild 664 SHA256 6aec7b1a8030253a9a5cdb2c21b50c5230c24e2869db480f596c6757410170a0 SHA512 b7d311ca5aefb1b9e6b4cbddea01d7de28b767f032dfdddd32f9a0a9c4079735cadda0b47c341e9b54ebf3a9aaa9ba9e1919c7776fb455870d747ed1bf82c41a WHIRLPOOL 324d909f839851f4065c3149b4bbcee318d516a60c0798ba27161323d9c4ab5f257d148b70eb45518ebad8ca3b40762108282d2f5c1068f6ab0bdef48896f342
+MISC ChangeLog 3048 SHA256 654d91569c52b3eda44eeeaa8a94c64b901fc98dbe97188e7064f52ffe9f4563 SHA512 3f9d025c8dee77fc6732a91b61c93dd34ce98523f60d5eb2437a8144e28765126847f5ee24bffdc9d009882e79000af76172a382afabeaee486dacbaae551603 WHIRLPOOL 80f7fbbad31496f4d9e19d516ac6285337f4361754ad9f7273b5d7a8e3b96cc4d76e3352da4a58075a8c9ed6309c2ba1c02bcf9cace78c5169011faf8ec322e7
+MISC ChangeLog-2015 1207 SHA256 b5e3b98e7352f722e9c5d510e7444dac0f5a8a306ff4adad086cc5bec223d93e SHA512 c4225b127030760ab5155b5b9ac84d791e1caec43e3685b6aa2a9e041384ee87956dc406d3a16fc9d91a48df68616a6889ca1927e05e932bf5159d228dd777a1 WHIRLPOOL 1d039bfe128ad230222921726ed6b8b45076544d8cd17fbeaad8caa42af170124e834a326930b4ab43bb949379b89d60085251b283cbcf35c44549ae60f77aa4
+MISC metadata.xml 251 SHA256 a05f42692b328505fb29ea965ddda651f5917a8d836065243162e374d1506ebb SHA512 c3ea03b0747ac329c1deab1a9115e53854b539a9bc46a7ee01071b1689f1a14d3dc9e59242e7abe5aac9d9e1816de9293711e85b127de5ca761bf7d1d8b4407d WHIRLPOOL 98b18e498a6abc8a9ba3771f821a830e3c6819e8e5c64958f784130f848522297262ac5e3864ecc64ee303cb8d24531cd1e6209b25032e58cf2b84db62cfb233
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
new file mode 100644
index 000000000000..ce293cf48f3a
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/listen-3.0"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild
new file mode 100644
index 000000000000..cad3b5631aee
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/listen-3.0"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll-watch/metadata.xml b/www-apps/jekyll-watch/metadata.xml
new file mode 100644
index 000000000000..26453c54750b
--- /dev/null
+++ b/www-apps/jekyll-watch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll-watch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
new file mode 100644
index 000000000000..7783399aa3b5
--- /dev/null
+++ b/www-apps/jekyll/Manifest
@@ -0,0 +1,5 @@
+DIST jekyll-3.2.1.tar.gz 1010949 SHA256 6c1eb0330a7dbbf6d874052c7a2b0108b0a0d4148dc888a82192f80d23796072 SHA512 36360e852b8438ae12a64320514204c7b0f8bc53d6cb04f6024a25d5294f562c37c1464fc0e632502814d8e2dd0900877b48c3ccb0046d7c6a145bb1dae37b48 WHIRLPOOL 5daa369ebd5066db37712ad0bea476c977d8c977ec8125a9c0bec11c3fb48f95bcebbc502f950ab025d90bd35b1f5d3c322c7434c132ca6da7aeba4ca9a1cf7d
+EBUILD jekyll-3.2.1-r2.ebuild 1591 SHA256 10bee0db3a8f37539c204f0ba286c20080866591ff3fa1b8862fccf5a767c2cf SHA512 0580069c7f6bc00525f62d38d7b6bf140aa9582f7a808569da8488f3b5649327594048486b86de6d6f752c720de5911ca6cef78376073b40689eba5c197b2f4e WHIRLPOOL 3cb538e06460a180992392e5712942e4018d4b1e726b61bd0dbb5ca788002410165e1b87e397ab5aa70fafd55af7d90720f16d09f0fb0126030d0a73011a3e86
+MISC ChangeLog 4723 SHA256 4cf56dbc44953a3830172549d796d490d2ffb9598d3c4e2dbd106a3cad26c845 SHA512 f60b0287816feaed983b2d93026bc6663340d2fbbcf803a5c71809defbfbe29ea0b2083ae42498c5b44753ab733d00312e937fd6e32f437c573975fdcb8e877e WHIRLPOOL ea03097ace5393722350b69bea673f7795d0e169301b8a7eab49e3555845752510bf8be059d93d1c18c906c44d67cdd5e42632e44bc89ddac81025b912d940ef
+MISC ChangeLog-2015 1955 SHA256 46b47940e60635ae8033ffed1a0a53b988cf3af2ce8116bda6a138a214ef0e9f SHA512 df6e836f110a4a82a6d4539751d07124b321389e818286949db4d16f865ccb706cdd21232a9a27f29864a122a4f3bbd608d0cb3d0ed7ae279c411347c43be2d3 WHIRLPOOL 73bae10204a1566bf3c14726512727715d33ba323ae9e77c201213339e83afea10382a9b02e851cf8c3e6c9c374a7e7fc6d1ffc3a2735fcd34c84a862238f581
+MISC metadata.xml 245 SHA256 210a596baa409c602cbde33323141676e4e43e9ceafca3ea151216102f643434 SHA512 c6ab9b44a9ce3ec0ccf0ed9e3dd1dc637fab6d0632f36bdefb71e1f32a456e0e6410e99f6eefeeb010856b46762c13a6ed086c7812858870e708d2c79ba073e6 WHIRLPOOL 61f96c7532a9912be8aaf3ded4f5cab8582e393d3cbe375f1265bc469ad061462adf4601a4e629635fe37a95838c3773ee4e859818358e4acb7167d9827b7e10
diff --git a/www-apps/jekyll/jekyll-3.2.1-r2.ebuild b/www-apps/jekyll/jekyll-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..9e1b4a117d46
--- /dev/null
+++ b/www-apps/jekyll/jekyll-3.2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features site"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="http://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/colorator-1.0
+	>=dev-ruby/kramdown-1.3
+	>=dev-ruby/liquid-3.0:3
+	>=dev-ruby/mercenary-0.3.3
+	>=dev-ruby/pathutil-0.9
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/rouge-1.7:0
+	>=www-apps/jekyll-sass-converter-1.0
+	>=www-apps/jekyll-watch-1.1"
+
+ruby_add_bdepend "test? (
+		dev-ruby/rspec-mocks
+		dev-ruby/launchy
+		dev-ruby/mime-types:0
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcloth-4.2.1
+		>=dev-ruby/rouge-1.7
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,+5d"\
+		-e "1igem 'test-unit'"\
+		-e "1igem 'minitest', '~> 5.0'"\
+		-e "/reporters/d"\
+		-e "/profile/d"\
+		-e "/Reporters/,+4d" test/helper.rb || die
+	# Drop bundler
+	sed -i -e "/self.class.require_from_bundler/d" lib/jekyll/plugin_manager.rb || die
+	# This test fails without bundler
+	rm test/test_plugin_manager.rb || die
+	rm test/test_theme.rb || die
+	# Replace git command in gemspec
+	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
+}
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
new file mode 100644
index 000000000000..6e9dbeb4e5c2
--- /dev/null
+++ b/www-apps/jekyll/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">jekyll/jekyll</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
new file mode 100644
index 000000000000..191345c96a2c
--- /dev/null
+++ b/www-apps/kibana-bin/Manifest
@@ -0,0 +1,12 @@
+AUX kibana.confd 72 SHA256 6cd3750a37a9d7f4f74efa0f2b6dd8f807878123c664b87fb40087e142791dc2 SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd WHIRLPOOL 445c0c36a2e8188332795780223b6d6b8f33a6901721a764b58cb1f1e5bbf1b9fea228e3f27153d2a0ae5562297d4a2cbc2454e50828ef1fdcc1f823ed9cbdb4
+AUX kibana.initd 1015 SHA256 aae0dd43a2b46a1248627c5766746c8d5ea6105a765bf250dbd93c2b05546442 SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e WHIRLPOOL 297a698bf314f6a927727451afb3c85d8342ba3e31193ff0aead6192d1ffe6a3431a5647bba703c43cc63c783c1fff9de8bf2a58625a95c35a9b364f713f22b6
+AUX kibana.logrotate 186 SHA256 ec0244a71f8504044b3aaf17980737dab86b9d4131981a646a5807ec39ca99ed SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e WHIRLPOOL 212169f48df9828af8feb63085f9bf3632cf39d16fd8ab086c1ddde98f81fc2cbd9b866e4055a68ad975d938232e978c4de6ca561449fe19cc2f8e43c7043500
+DIST kibana-5.5.2-linux-x86.tar.gz 50521894 SHA256 f74e16d73da0b31e8c04276b13f755c49f95e59209079adbefff40cd56e5a62a SHA512 30b2c75661b8d4632f5e063dc79261d01ed96c03ded64d9b05671489d9497339934284ea57ef079dfaab11031f59be8c38ae8338e6dd69b50ff36f0ba37b2315 WHIRLPOOL 65f788bcf26e3247c2604f0195c7dd5b5f2a5ea45bfa87f0ca0f46209080f4afbe2dbd61e8926550d2c299f1342dc32cc4e6fc0ba34390a9e5e9236b6b57d01b
+DIST kibana-5.5.2-linux-x86_64.tar.gz 51073441 SHA256 4b879a36899d886c1264c6c2e0c662d56ebefee703fa4c62bca793124d3ebd5a SHA512 eab223176ea2a92234cf074a245024f1612e66361811a481f2ae9199afd92b4d01e10048adf1cb5ca3a60ef4d671705b70dc39c76e90d5c1ab5d07851d0b0096 WHIRLPOOL 05d12811a929507b01ac1a48c3aa038cab0b944e85d2b95272a4ddacec5325da697033e4f063648f39debfc2a0fffb7e15c6bdc141e5cf7641ce9df66572b2dc
+DIST kibana-5.6.2-linux-x86.tar.gz 50262246 SHA256 de69314c6616ca9e467b67c9b3800ca1c1cc843a8709a4cb435ba017a3affcc8 SHA512 0d637a52c50edb1fdd4418802c1dd145806a36ce21fb34182485d046d1352156e6f8e4a26ef0b8c92bc09266fe95618c58ad1cd022bba4acf07c528ae5429a43 WHIRLPOOL bcacc1b2b312949626d0792d39382d7af1110089e569fcbf52330119ee67ae62cfadc7a87fd8bd6006ab2423f2067e406bbbf62f5988ad1950fd09ad5240515c
+DIST kibana-5.6.2-linux-x86_64.tar.gz 50813652 SHA256 d4fb6a736c367d8df563f405bdc3c6d6541e1a8fe0b22d29c8070c032ca97cd8 SHA512 e9ef4f8dee16b1274d4b0399c0df938a5c99d450f8b8f8b1e56b3410661696b67a100187aa719c270359bd22b000dc5002c664d33eb178fd657dc80ae8237830 WHIRLPOOL ce9f9eccf63573395bfd91afd922775acee616ef281d94ca279a0e5f0c4e2d85a88945489ad1fb67240d0339a9d8e30a9c2189883dfb973ac25adb656a08441e
+EBUILD kibana-bin-5.5.2.ebuild 1591 SHA256 e0135ab998be33e28df6bf275ecbe59d83ab9c4709b165d7a56678120bfdc0cf SHA512 48a553470b9763adc152894f17cd69a54a5948df78008c2cb45675d40b1e15eec484716f8f7ae2e3ba56618da2d292310045c4287294e6c07fb54ed9638df7e8 WHIRLPOOL 8b252b53f912b3814f395c3f81446e014b17aa7af5fb8169db7a659a8fa9cfa4d731bfa5528b232b18c260a7711d0c8176f530daae074ea00edf397c201e50ae
+EBUILD kibana-bin-5.6.2.ebuild 1591 SHA256 9fa1497d6699b97490575dd33ee030e00d73ff44bd9c607c9e0966a46560879a SHA512 92601e0a91427b6706a2c16ecc39d94d43645fdbdd3f01cb915ec0e3ebf5d8d3c773ee7e7efd52b9b3e17882117b78d0dd97392fc24d341582634fcb4e9f965c WHIRLPOOL 8ed8a142be2216b8d04d759ac86f37948484c93a4b48ece20f29e5a6e8630d0a4c36bf2c89822b03ea057c5cfa2c50cb6ab50435a5e5bac7e7ca864472723a0a
+MISC ChangeLog 8813 SHA256 281047623a0610e1e42c56609994a288d23c7af363bf89a7aa6250f0c283ff66 SHA512 029c4fe58c1cac21557b17a64adacb260cdea094e81043037149f41fa3ea6012f11e25a239ea79b97d46fc01dc68c1750ad0d3e1258cbf94261d4459ad976034 WHIRLPOOL 837c48c17218a45acb850020538d498efa94e81f362c285dbaf67d1ed20e797bcb3956eae0cadb721880f36fa39671dc522a43f7e0283347007025d1dfe1183f
+MISC ChangeLog-2015 944 SHA256 a590d67e562eacb4f2dfefbfc4b11f1d2c79ea90f00bf940072512e0cca51c3b SHA512 00745e148089d904304510d1f9e64208585e81562c7812ed8fe9ca80fa80e8207dc855e3cf818b9e86d5bc10a780836e052d80c766ee19fd1435ad3c38b874ff WHIRLPOOL 037f9bbc5aa54c7f73c22f6d598c5c5c16dd18b4e5f47255e1f8ba0ce04b7e56e282bd16b05a384a16f39c8e9d397ccd2d83f73e8af28c54b5cdfdabb5720c39
+MISC metadata.xml 379 SHA256 076db70c66a956ac9333a448963cc5580406731f1d4bebe29c26bb880fcc8649 SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975 WHIRLPOOL 1553f54462bcdedf8a2fe08fbab2c9d0df6d766c6be0b1aa3d93056b13d7124d1f591b7fac6d2d407a0a777cf12a2255873d5ba2b72357b500f9b3b32e99b69f
diff --git a/www-apps/kibana-bin/files/kibana.confd b/www-apps/kibana-bin/files/kibana.confd
new file mode 100644
index 000000000000..59877f3b656c
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.confd
@@ -0,0 +1,2 @@
+#elasticsearch instance to connect to
+ES_INSTANCE=http://localhost:9200
diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd
new file mode 100644
index 000000000000..84f38e9aeefa
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KIBANA_USER="${KIBANA_USER:-kibana}"
+KIBANA_CONFIG="${KIBANA_CONFIG:-/etc/kibana/kibana.yml}"
+KIBANA_CACHE_DIR="${KIBANA_CACHE_DIR:-/var/cache/kibana}"
+KIBANA_BABEL_CACHE_PATH="${KIBANA_CACHE_DIR}/.babelcache.json"
+KIBANA_DATA_DIR="${KIBANA_DATA_DIR:-/var/lib/kibana}"
+KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
+
+command="/opt/kibana/bin/kibana"
+command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
+
+pidfile="/run/kibana.pid"
+command_background="true"
+start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout ${KIBANA_LOG_DIR}/kibana.log --stderr ${KIBANA_LOG_DIR}/kibana.err --env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
+
+start_pre() {
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_CACHE_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_DATA_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_LOG_DIR}"
+}
diff --git a/www-apps/kibana-bin/files/kibana.logrotate b/www-apps/kibana-bin/files/kibana.logrotate
new file mode 100644
index 000000000000..378d65668b59
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.logrotate
@@ -0,0 +1,9 @@
+/var/log/kibana/kibana.log /var/log/kibana/kibana.err {
+        daily
+        rotate 7
+        copytruncate
+        compress
+        delaycompress
+        missingok
+        notifempty
+}
diff --git a/www-apps/kibana-bin/kibana-bin-5.5.2.ebuild b/www-apps/kibana-bin/kibana-bin-5.5.2.ebuild
new file mode 100644
index 000000000000..c6e280e46581
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-5.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="amd64? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	x86? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/nodejs"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_unpack() {
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-linux-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-linux-x86"
+	fi
+
+	default
+
+	# remove bundled nodejs
+	rm -rv "${S}"/node || die
+}
+
+src_install() {
+	keepdir /opt/${MY_PN}
+	keepdir /var/log/${MY_PN}
+	keepdir /etc/${MY_PN}
+
+	insinto /etc/${MY_PN}
+	doins config/*
+	rm -rv config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+
+	mv * "${ED%/}"/opt/${MY_PN} || die
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch 5.5"
+	elog
+	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
+	elog "in /etc/conf.d/${MY_PN}."
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.2.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.2.ebuild
new file mode 100644
index 000000000000..73a56f0ceb4d
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-5.6.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="amd64? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	x86? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/nodejs"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_unpack() {
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-linux-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-linux-x86"
+	fi
+
+	default
+
+	# remove bundled nodejs
+	rm -rv "${S}"/node || die
+}
+
+src_install() {
+	keepdir /opt/${MY_PN}
+	keepdir /var/log/${MY_PN}
+	keepdir /etc/${MY_PN}
+
+	insinto /etc/${MY_PN}
+	doins config/*
+	rm -rv config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+
+	mv * "${ED%/}"/opt/${MY_PN} || die
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch 5.6"
+	elog
+	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
+	elog "in /etc/conf.d/${MY_PN}."
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
new file mode 100644
index 000000000000..1b662aaef98c
--- /dev/null
+++ b/www-apps/kibana-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
new file mode 100644
index 000000000000..d27c851b2107
--- /dev/null
+++ b/www-apps/klaus/Manifest
@@ -0,0 +1,6 @@
+DIST klaus-1.1.0.tar.gz 34937 SHA256 b36f80d4ab031a0a6cf085ebb2981e61cab57d1533cc1a24d8063152b26b6cb8 SHA512 41c4af2ed4cbd0789b4c73e0b5a9b9e4da276b470c3dbf3a80020d27796e9469278586d0a1b6b99bdac2f26fd612749a772a0198744515683997d205ab69794f WHIRLPOOL f73968221c23fba8eccab916a3c5867a0276beea4cbed8000f15919a0f5e8c0cdd505ac3740df58ec26b67a67c19fd7509654706cb1badfa99627367c557a2af
+DIST klaus-1.2.1.tar.gz 35339 SHA256 c88c702930f777229445be8ae69d2b90c0eda4e9a9a818cb115218ba4115b6d7 SHA512 9126ba7cf2b1d64c333ab3d935c797a85997c11f036e6821dda1276c3c8ba7d66004050ac78e796b9fe1beeed8698107b91f77196c282a34bfcc01f945235ba8 WHIRLPOOL 2eb885d351db3c6ba45215a14eb6457774edb56cde6fe18c7f894725254b02c5feecad15843cecfae432347feef0c454f361eab4cdb91029585236ce7e26d51d
+EBUILD klaus-1.1.0.ebuild 743 SHA256 9d58726cb887f41a68841942187168a755c298f8373b2f2ff677b6bca45c6eb7 SHA512 e6c55e91a3fbe46f2eaae112eb571dd04da78453d6d4273802fac25a0e619376414d0b4e3e6960aa6f3703ae122992b2c23f72426d064079b437129851425f82 WHIRLPOOL af4b78286a89155d47a665655f5f6510ad0cabc55d207b018bad481805198d845a6e35ee4f1d3f6864e804eb2b64fec912235e465bac5d01a4ce4bbd179fdfdf
+EBUILD klaus-1.2.1.ebuild 853 SHA256 b738ce46781b2ed110df085622fe96c2b9c9cb8808387d4cf42b68ccee863b39 SHA512 6b405f5f1533cda8fe77ae794317baa2416ea650586d5d79da6a5001f2e82c9f5f48dc95646fa299f8878f1825ca2ce453fe46eca9fe64ef6acfcc4272a2809a WHIRLPOOL bc32b43426dfea2bc1dcd509aad49101fec46b486d7fc27f4d071a7b9c0a300f72572524c4f462e3809949aab26dc0e37f7003d79ae94079a0e83886c0f5ecfb
+MISC ChangeLog 1853 SHA256 16834d5fcb01633344e5df5f44c8017c176e81b0689ad42ad6c7d9f990661f56 SHA512 b80efb37aabd8d1018107deab9fbe2b13ca7e1826156117b56367ad51d8de88f8c1013b58b8d9602f564819b50819f3649946236f257635b710fc53f042e2013 WHIRLPOOL 1efaa2972b659d5e15c2ad67be71c50f61bd4085a13879975c9c596fb576a8567bde8fb432a6f9a52d1cdfada5b48fa940efb6ffb94beb58ba9b8b837f3f6118
+MISC metadata.xml 808 SHA256 64b2fd14c2d6ff846f5b464d417a2679a3ce9a7ebef1306afbfed13b10a73a3e SHA512 ff757368886404b9b47e000c408034887a8a2452a718e18788488f30f07c9e8120e687175bc37119ec3f3208a2561f77fa53c84c26c425ff7da8be58bfb537c4 WHIRLPOOL be5ade5f2ee29398f5ef07d236fc155116c2dc6ddbf3b69009b8394d9196f8c2664d547e56a464c95efcdd3760c0cc25d27f28e5dd1c287b42dccad0a442c47c
diff --git a/www-apps/klaus/klaus-1.1.0.ebuild b/www-apps/klaus/klaus-1.1.0.ebuild
new file mode 100644
index 000000000000..010c93f5d1d7
--- /dev/null
+++ b/www-apps/klaus/klaus-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, easy-to-set-up Git web viewer"
+HOMEPAGE="https://github.com/jonashaag/klaus/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ctags"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
+	dev-python/httpauth[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	ctags? (
+		dev-python/python-ctags[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/www-apps/klaus/klaus-1.2.1.ebuild b/www-apps/klaus/klaus-1.2.1.ebuild
new file mode 100644
index 000000000000..ed6095ec5a5f
--- /dev/null
+++ b/www-apps/klaus/klaus-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, easy-to-set-up Git web viewer"
+HOMEPAGE="https://github.com/jonashaag/klaus/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ctags"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
+	dev-python/httpauth[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	ctags? (
+		dev-python/python-ctags[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# The tests can only be run from a git repository
+# so they are not included in the source distributions
diff --git a/www-apps/klaus/metadata.xml b/www-apps/klaus/metadata.xml
new file mode 100644
index 000000000000..17745f46a983
--- /dev/null
+++ b/www-apps/klaus/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">klaus</remote-id>
+		<remote-id type="github">jonashaag/klaus</remote-id>
+		<bugs-to>https://github.com/jonashaag/klaus/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="ctags">Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/liquid_feedback_core/Manifest b/www-apps/liquid_feedback_core/Manifest
new file mode 100644
index 000000000000..1973e0790621
--- /dev/null
+++ b/www-apps/liquid_feedback_core/Manifest
@@ -0,0 +1,13 @@
+AUX liquid_feedback_core-2.2.3-gentoo.patch 681 SHA256 068ffb3ac24ecae864f7dd3f883ab39a4f91671cd6ec89b99a15b75fce4c8759 SHA512 2d4d8adbb624e7e9bdc531b69e94931e1e65309ba88e53c5cc09ffe9adb68d87b2288cb850512bc4527f24915a34b89658d96928791f8d94d409342edcc3a657 WHIRLPOOL f51685a9c9a98cd3f39c8b5e8eb14ea57aa957f55f3f73ec22b657f087f9b02514fbf19d83862b9067204ea81cb2aeff308b5c4e2bd68aa3e8c2749d83dcfb7b
+AUX liquid_feedback_core-2.2.6-gentoo.patch 681 SHA256 068ffb3ac24ecae864f7dd3f883ab39a4f91671cd6ec89b99a15b75fce4c8759 SHA512 2d4d8adbb624e7e9bdc531b69e94931e1e65309ba88e53c5cc09ffe9adb68d87b2288cb850512bc4527f24915a34b89658d96928791f8d94d409342edcc3a657 WHIRLPOOL f51685a9c9a98cd3f39c8b5e8eb14ea57aa957f55f3f73ec22b657f087f9b02514fbf19d83862b9067204ea81cb2aeff308b5c4e2bd68aa3e8c2749d83dcfb7b
+AUX liquid_feedback_core-3.0.4-gentoo.patch 915 SHA256 985b22af376e0805d1e336f19ff851838d2b86afc5bfbe154988a987fee519d1 SHA512 126ff6b3451e8877d2bd7e77c8408c445c4ad9db2a36f5774ceec8f8dd5efad081c0ecae6ec5304654e1488a3e8e40f29a9008c852cec2dd77ead650b53382ae WHIRLPOOL d7c116a2ed42211760b53e4def64adc802feb45edbf70e89311f1a7c2c6ee21fbaad91b2964f177867afad93be507508136a1be86781f503b06000555f52df7b
+AUX postinstall-en.txt 1498 SHA256 aeb950d964e9ebdbd91d510cb2967f7f4bcfa35495ce8daf68046e6506a0e66a SHA512 cd1488337b3faae08a1d7c326b4c1445863fb07b3d39b63460703467ad85524acf0fc14a19278a9cf995304e3a79c1b90ecdc0098f984d106d484f79d315b8e2 WHIRLPOOL 5dea5e716132d8d94d892a0f94347e4e93f42944bc1fd2ef82594d4b93bbc2144add84e3c59a2c645253a64602297457804e1cc0ce412dcda77a8e289fad2672
+DIST liquid_feedback_core-v2.2.3.tar.gz 124770 SHA256 51884d4aea59f7bde407aed5e75129fa63e6630cbddac9e4daa1937ea91eed9d SHA512 a87af2b4ba218289b679a1ffb5751d29eed0d368233e431123c8ce98c1eab5bf62f516e4beb3177ecb302c9062c86b6f908cff3155783dcfcb2d279804079a87 WHIRLPOOL 8d4733b853f0d61ddf5bae61ce02d29455bddd79bb08ca93b79e954b51a111ac59665d8e42ff4ddf8574564fb0d5f10c78b81cd1b0585bd959bdbf47dc90d9e3
+DIST liquid_feedback_core-v2.2.6.tar.gz 127440 SHA256 d57f797e8539d253859971fdcce9853c5db31ab3e6b6288a416e6590522f5dc8 SHA512 6f680398a7d2e529e642dc94ba16bc1b33d25459ddbf629c06387391ef13c0e212a108cc337cd2bc29505f4f6436b6e92994e63eaa09fe1c07733d2821d9b7f1 WHIRLPOOL 8e44997655b03182ab830e87122244339923972c16cdfc2f2958179cb57ea991b9a3e049d49380e2eaf4b5e20d7fc647cbcb5f4059450eb98ae32b27a201bc3b
+DIST liquid_feedback_core-v3.0.4.tar.gz 142983 SHA256 20b1840716980e7c5a0e6f959c4c26881bfe77a9fae9666542ee8d06a51fe637 SHA512 baea8a61c94e640557d0169b6171247ff0303ff1a9c8b587c6769e367cf56805c1a1e660aadf7178d984182be6dde326770240b3ffeda42139c4a94445a2bbf8 WHIRLPOOL 3b528eaeaee828dc5661844917af258cb89387cccb85f03eeb83d28f1ddd32ffe0a54655f099c719293c3b9bfb7b10b4dd84f598f1f4217a59e2dcdf829f77fa
+EBUILD liquid_feedback_core-2.2.3.ebuild 962 SHA256 4449c61a072d106e1d819aeced8ff251b227d6d6379bf22c7f3b6342c52a7e3e SHA512 13fa9ad204ae30a5c669c770332fcf7a9924616f2ce7c90c14a6508c2a18d8040c5f8e8f568707c341a2564f5bd6c78324cafd3e132a44a0a01a26360bba79d6 WHIRLPOOL ece5864c296ee9532e479d903306a1c144b0c171b3ee2b674510369244bb58b09f880f151ab0204510f7cf0fa897309f9f4235a2e5d1d3646709dc19ae891c65
+EBUILD liquid_feedback_core-2.2.6.ebuild 1099 SHA256 b3c914b428511c568ceb9f22d810f7ea4c378402ff8534e19776cbd4f293570b SHA512 a6a9fc6b59b81853c783b74b813c301b2cce4e1a60edda5872593801d0f869c0537fcadb8dabf1e7f2a50f386ddc8ebc68eceeff47780ca1ddd50c8bc8a3d972 WHIRLPOOL 910c576d4d27210bb775e412e8f3bf547385572e958b565bb6e5e322a5d969fa16568b90f1da18c3d0c71eeb7305b55d5f6c848e677a5cfc16dce32bc16c0cab
+EBUILD liquid_feedback_core-3.0.4.ebuild 962 SHA256 4449c61a072d106e1d819aeced8ff251b227d6d6379bf22c7f3b6342c52a7e3e SHA512 13fa9ad204ae30a5c669c770332fcf7a9924616f2ce7c90c14a6508c2a18d8040c5f8e8f568707c341a2564f5bd6c78324cafd3e132a44a0a01a26360bba79d6 WHIRLPOOL ece5864c296ee9532e479d903306a1c144b0c171b3ee2b674510369244bb58b09f880f151ab0204510f7cf0fa897309f9f4235a2e5d1d3646709dc19ae891c65
+MISC ChangeLog 2550 SHA256 41c186f70ff26180429fad865f94712a7c4ee20c26af0e6b3ee247c1d46f8c6b SHA512 38cf50c5a49d1e62d0ea488aee0712c78e486100b0942c4df5253578ebbec62408d3dc8bf30ca6e47e76cd1ee9c0b3193fd0e200b496d21431a8c7fd286d58e8 WHIRLPOOL 0eded702d65fad5e2a15daa2882b6db4d21cb0b5d751901873fda0427651c2ced0079d2214e91bb5494fc53e3b0b8fb78b4aa99dd21cffdcc0315bd6b0db0e9a
+MISC ChangeLog-2015 1477 SHA256 5590d0a0ec95c72bef584bd3ef8ddddbd1310833b4526137c76503e6c3359394 SHA512 623f14ebc122b39a48be01a4057fc1884e9e2d352fdf43d0735d0bb3ef6f6cfcfd240efd9023a9f21de117d112cb390a2f54a45430ac0509ed1fe941018f6e5b WHIRLPOOL 4d611344e71f2eac9ded1f69e09ddfceb1317c54d80cc52ba09d33c381f5fc7f7350f266a831231195729c3bc048787ba5375a2773cdd182277acd1462517217
+MISC metadata.xml 1099 SHA256 9814b7b706fbbc2dcda1f9ccd85cec507295807fefb7cf4955c021018d0112ba SHA512 1fbc5d0f4eff2085665038a48155b652d434ec42019a5343fe1c1ef34a7b863aa2f21636145d105cf9052ef0756400f29098f3017f948d3aa0fb854f89cd6ff0 WHIRLPOOL 81e3a33401fef841d5a0eaccc067392e8ac5ce935674380056160c9396b50ff90b4f356e416830697a0050bd259d8c25be2225f06008625a6574aeb3d2c616a7
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch
new file mode 100644
index 000000000000..f4d555121745
--- /dev/null
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch
@@ -0,0 +1,24 @@
+--- Makefile.old	2013-03-22 15:26:23.340764442 +0100
++++ Makefile	2013-03-22 15:36:50.838733773 +0100
+@@ -1,16 +1,10 @@
+ all:: lf_update lf_update_suggestion_order
+ 
+-lf_update: lf_update.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update lf_update.c -lpq
+-
+-lf_update_suggestion_order: lf_update_suggestion_order.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update_suggestion_order lf_update_suggestion_order.c -lpq
++CPPFLAGS=-I `pg_config --includedir`
++LDFLAGS=-L `pg_config --libdir`
++CFLAGS=-Wall -O2
++CC=cc
++LDLIBS=-lpq
+ 
+ clean::
+ 	rm -f lf_update lf_update_suggestion_order
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch
new file mode 100644
index 000000000000..f4d555121745
--- /dev/null
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch
@@ -0,0 +1,24 @@
+--- Makefile.old	2013-03-22 15:26:23.340764442 +0100
++++ Makefile	2013-03-22 15:36:50.838733773 +0100
+@@ -1,16 +1,10 @@
+ all:: lf_update lf_update_suggestion_order
+ 
+-lf_update: lf_update.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update lf_update.c -lpq
+-
+-lf_update_suggestion_order: lf_update_suggestion_order.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update_suggestion_order lf_update_suggestion_order.c -lpq
++CPPFLAGS=-I `pg_config --includedir`
++LDFLAGS=-L `pg_config --libdir`
++CFLAGS=-Wall -O2
++CC=cc
++LDLIBS=-lpq
+ 
+ clean::
+ 	rm -f lf_update lf_update_suggestion_order
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch
new file mode 100644
index 000000000000..fbc91eff2467
--- /dev/null
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch
@@ -0,0 +1,30 @@
+--- Makefile.old	2014-11-29 22:38:43.200509267 +0100
++++ Makefile	2014-11-29 22:39:16.392199651 +0100
+@@ -1,22 +1,10 @@
+ all:: lf_update lf_update_issue_order lf_update_suggestion_order
+ 
+-lf_update: lf_update.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update lf_update.c -lpq
+-
+-lf_update_issue_order: lf_update_issue_order.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update_issue_order lf_update_issue_order.c -lpq
+-
+-lf_update_suggestion_order: lf_update_suggestion_order.c
+-	cc	-Wall -O2 \
+-		-I "`pg_config --includedir`" \
+-		-L "`pg_config --libdir`" \
+-		-o lf_update_suggestion_order lf_update_suggestion_order.c -lpq
++CPPFLAGS=-I `pg_config --includedir`
++LDFLAGS=-L `pg_config --libdir`
++CFLAGS=-Wall -O2
++CC=cc
++LDLIBS=-lpq
+ 
+ clean::
+ 	rm -f lf_update lf_update_issue_order lf_update_suggestion_order
diff --git a/www-apps/liquid_feedback_core/files/postinstall-en.txt b/www-apps/liquid_feedback_core/files/postinstall-en.txt
new file mode 100644
index 000000000000..128c7b20ee7d
--- /dev/null
+++ b/www-apps/liquid_feedback_core/files/postinstall-en.txt
@@ -0,0 +1,25 @@
+Merge info from README file with these.
+
+To use Liquid Feedback you have to follow these
+simple steps, which have to be done as the postgres system user (or
+which ever is the database superuser):
+
+$ createuser liquid_feedback
+and answer the following
+Shall the new role be a superuser? (y/n) n
+Shall the new role be allowed to create databases? (y/n) y
+Shall the new role be allowed to create more new roles? (y/n) n
+
+$ psql 
+postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password';
+
+$ createdb -U liquid_feedback liquid_feedback
+$ psql -U liquid_feedback liquid_feedback
+liquid_feedback=# \i /usr/share/liquid_feedback_code/core.sql
+liquid_feedback=# \i /usr/share/liquid_feedback_code/init.sql
+INSERT INTO system_setting (member_ttl) VALUES ('1 year');
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 hour', 20, 6);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
+INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
new file mode 100644
index 000000000000..a40a1a7ca93a
--- /dev/null
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="-I $(pg_config --includedir)" \
+		LDFLAGS="${LDFLAGS} -L $(pg_config --libdir)"
+}
+
+src_install() {
+	dobin lf_update lf_update_suggestion_order lf_export
+	insinto /usr/share/${PN}
+	doins -r {core,init,demo,test}.sql update
+	dodoc README "${FILESDIR}"/postinstall-en.txt
+}
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
new file mode 100644
index 000000000000..6310c163ce09
--- /dev/null
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="-I $(pg_config --includedir)" \
+		LDFLAGS="${LDFLAGS} -L $(pg_config --libdir)"
+}
+
+src_install() {
+	dobin lf_update lf_update_suggestion_order lf_export
+	insinto /usr/share/${PN}
+	doins -r {core,init,demo,test}.sql update
+	dodoc README "${FILESDIR}"/postinstall-en.txt
+}
+
+pkg_postinst() {
+	elog "If you just upgraded, remember to update database schema"
+	elog "with the scripts in /usr/share/${PN}/update"
+}
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
new file mode 100644
index 000000000000..a40a1a7ca93a
--- /dev/null
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="-I $(pg_config --includedir)" \
+		LDFLAGS="${LDFLAGS} -L $(pg_config --libdir)"
+}
+
+src_install() {
+	dobin lf_update lf_update_suggestion_order lf_export
+	insinto /usr/share/${PN}
+	doins -r {core,init,demo,test}.sql update
+	dodoc README "${FILESDIR}"/postinstall-en.txt
+}
diff --git a/www-apps/liquid_feedback_core/metadata.xml b/www-apps/liquid_feedback_core/metadata.xml
new file mode 100644
index 000000000000..6caeedfd5a1e
--- /dev/null
+++ b/www-apps/liquid_feedback_core/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>tupone@gentoo.org</email>
+<name>Alfredo Tupone</name>
+</maintainer>
+<longdescription lang="en">
+LiquidFeedback is an open-source software, powering internet platforms for proposition development and decision making.
+LiquidFeedback is an independent open source project published under MIT license by the Public Software Group of Berlin, Germany.
+The developers of LiquidFeedback have joined together in the Interaktive Demokratie association to promote the use of electronic media for democratic processes.
+The core consists of a database scheme for the PostgreSQL database, including the algorithms for delegations, feedback and the voting procedure implemented as SQL views and database procedures written in PL/pgSQL. As it is licensed under the liberal MIT/X11-License you can include it in any software project you like, as long as there is PostgreSQL support for your programming language available. 
+</longdescription>
+</pkgmetadata>
diff --git a/www-apps/liquid_feedback_frontend/Manifest b/www-apps/liquid_feedback_frontend/Manifest
new file mode 100644
index 000000000000..83586ac939e8
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/Manifest
@@ -0,0 +1,15 @@
+AUX lqfb-apache.conf 1433 SHA256 62e66e40998a7c499f7ef81022c64f0773d1f55b4e522972794f96f63c906086 SHA512 732869250eedef711f5513090c2b756da8242929cbe027aa90abb015b4a0d473b995cc09d6ae5744a4933e7c8db717d76503ece410eee98e8357116c7c6ef9b5 WHIRLPOOL f3fe1bb56b4483109fc0ca1e30486a2177456c14d0cbe43461f4a4c69bbd1518061937a39abcba856b145e272a2cfc9dccf33fa34dfb33699a27c0131a7a2372
+AUX lqfb.example.com.conf 624 SHA256 5364ee5828189771987603d182410e7c72e7267d76a297b20ddf94c29f534265 SHA512 2e55fa22f7217aad6a83b15ceb723872e9b506b0199d224ff8a08592ce884341354a40c9b2ae6d4f9fb62d6fff80d6c77954b0d1056f18b44831c3d5bb705d4c WHIRLPOOL 045c52fa68f237b432c2851cb336845410e828785ed83cf1e7faa20b621c47053927cedccaea85fd7ef63b68458274e4a4abf1116dde3a1004047514546ac5aa
+AUX myconfig.lua 904 SHA256 a6d530e28847c016c7a2d00dd4b9940d1d0a5f6a1b6536fc899ab8338dc6e676 SHA512 acd21b4e4ae5a43ed8d31fdb13a7531f43df78897792987cf1eeb6b0f85fae30dd61ce96ac6fcc383f857093739ecfe92de84cdf21a8210218cd4cc4801769c6 WHIRLPOOL e4c88fba9007f8d220e0bce6989027121491c13c0cf2d1bdd9dc0962cb9c932727240a28c80efcc72a6a880e2a1500341f3583a55d9e427bb87d0dc070f46e62
+AUX postinstall-en.txt 2550 SHA256 ec6d0b48d8569a8f4fd268d1e97be030fc683a637166042dc9192d457781c37c SHA512 a0c2ebcffffde5e15645efa753d567b75622f65481837a9c3613cad586166e4ba7e2a5d988e7ca2735b3a5e4de971ef68a7f0f73626c4d813ff58e8ef726efe8 WHIRLPOOL b21408a52299d203fd5313942857b2b854bdb002342069563d2332cea5b1e1ca64430b9dd814f2dd429d6c0dc721faba86487e7cd093eadae7ee334624f7dd91
+DIST liquid_feedback_frontend-italian-2.2.2.tar.gz 7496 SHA256 c894a8c9ca2d628e50ff9836ded017e37e68a87be50032ebb298e55556815a62 SHA512 e58e8efa1c68d35dd23e286eb5720516e2f9ccf21be9697376e3c263eea50bfc80d68497959d07c26482317d6787d53ac19be68c21d0a3b5b65cbe457fbbb322 WHIRLPOOL 0e85294ffa3de77fb6179aebf806aaa03ae505c60d8a6932ee391b3bfff30bed7ba9978c6143ff1a9de9a20413ecfee8eba150a97cbe781536cfee1d2812acd3
+DIST liquid_feedback_frontend-italian-2.2.7.tar.gz 7670 SHA256 ca2b2b9197f5102bc8f4cb3ecc4fa5fa7ea994d7c43f12169efbedfa4ec95899 SHA512 63cfcb4a565fa570777c2f3d2dcec2e98f16415ad9f8a6d62076f4e2cdf0ddae95610688b6b7751a865344acb7b65f78e7cb1ae4103b24dacf63e3e346405918 WHIRLPOOL 985b39b11832860737a388ff0eef1393474c95fac56e3f85ab8107df7cca2988c6fd08ba861b0f8bb92563f764798b0ae3e123803c730c5b21f46db5ec923de2
+DIST liquid_feedback_frontend-v2.2.2.tar.gz 356003 SHA256 83ca1f019078ddde8e034521545b95182a500d0c8a49cf6de4706eab81f29643 SHA512 0b145130814b9e6969189733ce9ccd523672e605f1cd8d4b2a8b931607ffe6b0110b142197ca50ec81326f381fdd4479c929b9eac0e92a5713749df72518962b WHIRLPOOL f08a9906d872dd322befeab769436d0a6387fa3676b698ea5736e8ea01633569fc46cfd97edae3e22c25e8caeab9599cc6594d106a73870c633e76d55c3b6892
+DIST liquid_feedback_frontend-v2.2.7.tar.gz 362509 SHA256 7b0012defc0d1e8c57029e0bce152ee880078dabd39d8ef9a1979c8046c1d15f SHA512 aa8c99e53c329dbf4659dabe617938d63b2aa42bab99ff4e200d4e15be8ed8ef5f64a71293fa796adde47525d1a76ece3b04cff982474eb2307a3fcd4f269d78 WHIRLPOOL 0c76603b09c9034e4ecfa333c62ecae58cb7405790718a31dd1cfea982b707537f42e4864590a56727c7b08a6eb6d26410d17903276d30c63af66a2c62476450
+DIST liquid_feedback_frontend-v3.0.6.tar.gz 497521 SHA256 0d1e78e3280f861247a63d4bed297a0319d8f209df2f3684248ca10d101a0f84 SHA512 d283d277cf6836c53398480c566158481fc65400e128bc4817975fd39c41e6e56b17f7f789a74b1b2a89f84aaf315101e9aa86a474c1817362443d03610fe6e9 WHIRLPOOL f4f27c730a49ac1fb73c66747f901085bae5c4770fc0f0459ff7690633cfbe525dd028c9998f3918d40203cd633ea0c3b6e505122956ec9ce46514eb92c58476
+EBUILD liquid_feedback_frontend-2.2.2.ebuild 1523 SHA256 41800687e235bff42b6b2db482961442aca3da6a71a4cc5528db764df3804ef0 SHA512 d54e7ba11740200ae4fb30559db39c80975bc39e20e0af2ba0b6437e9d14c41c4d35288a36fd257d8c64d393ea166046c3d25be1e809c19b88b39cefa76dc7c4 WHIRLPOOL 6c408c633431ef128071bdb82598dc471e5f0378ec4d1496c744959a9d3d9b80bc410f4a2b324923fa28a73432b8e8cd476c48ba4d59f1097a79826e79fd850f
+EBUILD liquid_feedback_frontend-2.2.7.ebuild 1560 SHA256 7120502799de95672bd0a37473c84e52ade44edb809e8788811df8e0a2bc6e5d SHA512 70691035f6a1d8b81c008a71d2905d6c90ef2d0fe2f9ddaa235095678a77b15d450de896e378552bcc771f60b94e2c1854062883f4fdae3a42620573c86cbcde WHIRLPOOL 286d1ff9f428b1539252e35301c1ce1ec8d610bce400c413b78f8a48680dbc5483b1427ce3333d4ea69a6822e8ce9c7c2e87ea203dab49cc5bbbead1dd7e44a8
+EBUILD liquid_feedback_frontend-3.0.6.ebuild 1093 SHA256 8886fd7928c3ceb6c86851aa9e8f509d604b9e095fc98e06d2bff8b92acc5c46 SHA512 e37d9681c02b4cbcfa7e485abacff654a3de1a35b142449e2d7c0dc432f2479e22cdb54c943c9cf24a34639b4a0a1231af18cf056a32afe984cf7242fe90104f WHIRLPOOL f0e386ef57cb76d026145cd7d26adeb45eda4860f16f996bc32bd665435cd09261ba5830df2310c0ec34dda655369121d2ec37b2f8cb8283652ddc7eee706e96
+MISC ChangeLog 2704 SHA256 50fc9c17ae270452e60e35753fd73f471698d4538cf2a3ac232f810b9b7cde8e SHA512 21b88a624973987037b17fa2fa6be3e35d8a90e42db13d634bb1407a95c126af0a4b0eb57df92ef50c2e695ca2f57eab2e48b64df3fdd52ec5b6db7cc90a760d WHIRLPOOL ef1deaeced20803548fd5e203c93ecb0146964ceea3ce298e6457bdd66e045c9728ebaea74b4b3d9729b15fd0cd2b3ad6e4c17019f63b8394bcb9ff4c9e9f13c
+MISC ChangeLog-2015 1318 SHA256 abaefcc38cae1a73ba8423ad144b7e30809221b5226c936e35fb5497bb7b860a SHA512 b0ffceffa5c1580979bdb44c04bf7f9f9c7240d4349599b64d7967f223ca288377ed1198fa1d29eff17be52cc645e8d9a3c7f555b5d6086d52a416890f111066 WHIRLPOOL 0d060c19d0f9e83d0c4a9220425173f331364aa76397bc273e2844726349ca45181f19e6f3888ef2e1820fa3b537e180f13ea43391f93bc342763193b859fe50
+MISC metadata.xml 699 SHA256 aaa6aaae9462f60702e0e48a0d2d4f6e784523cf37c5f470554d4c3834b5ffd8 SHA512 5a9961a632ba7d64fa23d2e6d43cff15cdd4b0fae14681cf7a0c809cdaa527cc6a1e5dcde7d7d9f26cf824cd18599f39345e5592064c4ebbfa29406256117038 WHIRLPOOL 34e50822276a264d348d5b883f46fa24a35c67919cd18cd4c4e3f1a1382b68156972369d2a04fe81f822392480e739b9fff3967de83b92250300c77cb64d80bf
diff --git a/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf b/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf
new file mode 100644
index 000000000000..3f1924b6ae3a
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf
@@ -0,0 +1,41 @@
+RewriteEngine on
+
+RewriteRule ^/$ /lf/ [R]
+
+RewriteRule ^/lf/static/(.*)$ /lf/static/$1 [L,PT]
+
+RewriteCond %{QUERY_STRING} (.*)?
+RewriteRule ^/lf/$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=0&_webmcp_module=index&_webmcp_view=index&%1 [PT]
+
+RewriteCond %{QUERY_STRING} (.*)?
+RewriteRule ^/lf/([^/]+)/$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_view=index&%1 [PT]
+
+RewriteCond %{QUERY_STRING} (.*)?
+RewriteRule ^/lf/([^/]+)/([^/\.]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_action=$2&%1 [PT]
+
+RewriteCond %{QUERY_STRING} (.*)?
+RewriteRule ^/lf/([^/]+)/([^/\.]+)\.([^/]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_view=$2&_webmcp_suffix=$3&%1 [PT]
+
+RewriteCond %{QUERY_STRING} (.*)?
+RewriteRule ^/lf/([^/]+)/([^/]+)/([^/\.]+)\.([^/]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=2&_webmcp_module=$1&_webmcp_view=$2&_webmcp_id=$3&_webmcp_suffix=$4&%1 [PT]
+
+Alias /lf/static /var/lib/liquid_feedback_frontend/static
+
+ScriptAlias /lf/ /usr/lib/webmcp/framework/cgi-bin/
+
+<Directory "/var/lib/liquid_feedback_frontend/static">
+  AllowOverride None
+  Order allow,deny
+  Allow from all
+</Directory>
+
+<Directory "/usr/lib/webmcp/framework/cgi-bin">
+  AllowOverride None
+  Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+  Order allow,deny
+  Allow from all
+</Directory>
+
+<Location /lf>
+  SetEnv WEBMCP_APP_BASEPATH '/var/lib/liquid_feedback_frontend'
+</Location>
diff --git a/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf b/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf
new file mode 100644
index 000000000000..149084138683
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf
@@ -0,0 +1,24 @@
+<VirtualHost *:80>
+  ServerName lqfb.example.com
+
+  RewriteEngine On
+  RewriteRule (.*) https://lqfb.example.com%{REQUEST_URI}
+</VirtualHost>
+
+<VirtualHost *:443>
+  ServerName lqfb.example.com
+
+  SSLEngine on
+  SSLProtocol all -SSLv2
+  SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM
+  SSLCertificateFile /etc/ssl/apache2/wildcard/server.crt
+  SSLCertificateKeyFile /etc/ssl/apache2/wildcard/server.key
+
+  include /usr/share/liquid_feedback_frontend/lqfb-apache.conf
+
+  <Location /lf>
+    SetEnv WEBMCP_CONFIG_NAME 'myconfig'
+  </Location>
+
+  ErrorLog /var/log/apache2/lqfb.example.com-error.log
+</VirtualHost>
diff --git a/www-apps/liquid_feedback_frontend/files/myconfig.lua b/www-apps/liquid_feedback_frontend/files/myconfig.lua
new file mode 100644
index 000000000000..19c259cd7cbd
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/myconfig.lua
@@ -0,0 +1,29 @@
+config.absolute_base_url = "https://lqfb.example.com/lf"
+config.instance_name = "lf"
+config.database = { engine='postgresql', dbname='liquid_feedback', user='liquid_feedback', password='xxx'}
+config.enable_debug_trace = true
+
+execute.config("init")
+
+config.formatting_engine_executeables = {
+  rocketwiki= "rocketwiki-lqfb",
+  compat = "rocketwiki-lqfb-compat"
+}
+
+-- Checkbox(es) the user has to accept while registering
+--
+--
+----
+--------------------------------------------------------------------------
+config.use_terms_checkboxes = {
+  {
+    name = "terms_of_use_v1",
+    html = "I accept the terms of use.",
+    not_accepted_error = "You have to accept the terms of use to be able to regi ster."
+  },
+-- {
+--    name = "extra_terms_of_use_v1",
+--    html = "I accept the extra terms of use.",
+--    not_accepted_error = "You have to accept the extra terms of use to be able  to register."
+--  }
+} 
diff --git a/www-apps/liquid_feedback_frontend/files/postinstall-en.txt b/www-apps/liquid_feedback_frontend/files/postinstall-en.txt
new file mode 100644
index 000000000000..80758792d817
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/postinstall-en.txt
@@ -0,0 +1,52 @@
+0. DATABASE SETUP
+
+To use Liquid Feedback you have to follow these
+simple steps, which have to be done as the postgres system user (or
+which ever is the database superuser):
+
+$ createuser liquid_feedback
+and answer the following
+Shall the new role be a superuser? (y/n) n
+Shall the new role be allowed to create databases? (y/n) y
+Shall the new role be allowed to create more new roles? (y/n) n
+
+$ psql 
+postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password';
+
+$ createdb -U liquid_feedback liquid_feedback
+$ psql -U liquid_feedback liquid_feedback
+liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/core.sql
+liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/init.sql
+INSERT INTO system_setting (member_ttl) VALUES ('1 year');
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 hour', 20, 6);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
+INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
+INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
+
+cd /var/lib/liquid_feedback_frontend
+/usr/lib/webmcp/framework/bin/webmcp_shell myconfig
+Lua 5.1.5  Copyright (C) 1994-2012 Lua.org, PUC-Rio
+> member = Member:by_id(1)
+> member:set_password("type-password-here")
+> member:save()
+> os.exit()
+
+Ensure that "lf_update dbname=liquid_feedback" and
+"lf_update_suggestion_order dbname=liquid_feedback" are called
+regularly! It is required to run these commands regularly
+(i.e. every 5 minutes via cron) to update cached supporter counts,
+to change the state of issues when neccessary, to calculate the
+result of votings, etc.  If you wish, copy the created lf_update
+and lf_update_suggestion_order files to /usr/local/bin or a
+similar directory.
+
+It is possible to run these two commands in parallel, if a setup
+requires splitting the load to multiple processor cores. In other
+cases it is recommended to run "lf_update" first, and then
+"lf_update_suggestion_order".
+
+To create an export file, which is containing all but private data,
+you may use the lf_export shell-script:
+$ lf_export liquid_feedback export.sql.gz
+
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild
new file mode 100644
index 000000000000..82f9bb1350bd
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+PN_F=${PN}
+PV_F=v${PV}
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
+l10n_it? ( mirror://gentoo/${PN}-italian-${PV}.tar.gz )"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l10n_de l10n_el l10n_en l10n_eo l10n_it"
+
+RDEPEND=""
+DEPEND="www-apps/rocketwiki-lqfb
+	www-servers/apache
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare () {
+	for lang in zh-Hans zh-TW ; do
+		rm -f locale/help/*.${lang}.txt
+	done
+	for lang in de el en eo it ; do
+		if ! use l10n_${lang}; then
+			rm -f locale/help/*.${lang}.txt
+		fi
+	done
+}
+
+src_compile() {
+	emake -C locale
+}
+
+src_install() {
+	dodoc README
+	dodoc "${FILESDIR}"/lqfb.example.com.conf
+	dodoc "${FILESDIR}"/postinstall-en.txt
+
+	insinto /var/lib/${PN}
+	doins -r app db env model static tmp utils
+	insinto /var/lib/${PN}/locale
+	doins locale/*.lua
+	insinto /var/lib/${PN}/locale/help
+	eshopts_push -s nullglob
+	for helpFile in locale/help/*.html ; do
+		doins $helpFile
+	done
+	eshopts_pop
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/myconfig.lua config/*
+	dosym /etc/${PN} /var/lib/${PN}/config
+
+	insinto /usr/share/${PN}
+	doins "${FILESDIR}"/lqfb-apache.conf
+
+	fowners apache:apache /var/lib/${PN}/tmp
+}
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
new file mode 100644
index 000000000000..58d27488ccea
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+PN_F=${PN}
+PV_F=v${PV}
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
+l10n_it? ( mirror://gentoo/${PN}-italian-${PV}.tar.gz )"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l10n_de l10n_el l10n_en l10n_eo l10n_it"
+
+RDEPEND=">=www-apps/liquid_feedback_core-2.2.6"
+DEPEND="www-apps/rocketwiki-lqfb
+	www-servers/apache
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare () {
+	for lang in zh-Hans zh-TW ; do
+		rm -f locale/help/*.${lang}.txt
+	done
+	for lang in de el en eo it ; do
+		if ! use l10n_${lang}; then
+			rm -f locale/help/*.${lang}.txt
+		fi
+	done
+}
+
+src_compile() {
+	emake -C locale
+}
+
+src_install() {
+	dodoc README
+	dodoc "${FILESDIR}"/lqfb.example.com.conf
+	dodoc "${FILESDIR}"/postinstall-en.txt
+
+	insinto /var/lib/${PN}
+	doins -r app db env model static tmp utils
+	insinto /var/lib/${PN}/locale
+	doins locale/*.lua
+	insinto /var/lib/${PN}/locale/help
+	eshopts_push -s nullglob
+	for helpFile in locale/help/*.html ; do
+		doins $helpFile
+	done
+	eshopts_pop
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/myconfig.lua config/*
+	dosym /etc/${PN} /var/lib/${PN}/config
+
+	insinto /usr/share/${PN}
+	doins "${FILESDIR}"/lqfb-apache.conf
+
+	fowners apache:apache /var/lib/${PN}/tmp
+}
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
new file mode 100644
index 000000000000..79a779ceea4f
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+PN_F=${PN}
+PV_F=v${PV}
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Internet platforms for proposition development and decision making"
+HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
+SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=www-apps/liquid_feedback_core-3.0.4"
+DEPEND="www-apps/rocketwiki-lqfb
+	www-servers/apache
+	>=www-apps/webmcp-1.2.6
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	dodoc "${FILESDIR}"/lqfb.example.com.conf
+	dodoc "${FILESDIR}"/postinstall-en.txt
+
+	insinto /var/lib/${PN}
+	doins -r app db env model static tmp
+	insinto /var/lib/${PN}/locale
+	doins locale/*.lua
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/myconfig.lua config/*
+	dosym /etc/${PN} /var/lib/${PN}/config
+
+	insinto /usr/share/${PN}
+	doins "${FILESDIR}"/lqfb-apache.conf
+
+	fowners apache:apache /var/lib/${PN}/tmp
+}
diff --git a/www-apps/liquid_feedback_frontend/metadata.xml b/www-apps/liquid_feedback_frontend/metadata.xml
new file mode 100644
index 000000000000..e022d4b7ea8d
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>tupone@gentoo.org</email>
+<name>Alfredo Tupone</name>
+</maintainer>
+<longdescription lang="en">
+LiquidFeedback is an open-source software, powering internet platforms for proposition development and decision making.
+LiquidFeedback is an independent open source project published under MIT license by the Public Software Group of Berlin, Germany.
+The developers of LiquidFeedback have joined together in the Interaktive Demokratie association to promote the use of electronic media for democratic processes.
+</longdescription>
+</pkgmetadata>
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
new file mode 100644
index 000000000000..7d33d9b0055b
--- /dev/null
+++ b/www-apps/lxr/Manifest
@@ -0,0 +1,8 @@
+AUX lxr-0.9.8-initdb-mysql.patch 484 SHA256 2ebeaaa9c10f2953b159fe99206a7eabf618cdc350e27d8ed52d56a4bc8d9241 SHA512 616a819fdd899bbac114dcebe42864f16e7b17e81f07be915ae36c9dfac4d621e960d5901a253d6e13d4e16440eb84702784b66ba1922a0cba72afea1f896da4 WHIRLPOOL bf6360342dc499178979f85d0dcbbb852a4d08a8d06e50f602ffacee49eea0f35dfa50350151d2db9730d2d976d02862ecb4e408042b1dac2146a62619375faa
+AUX postinstall-en.txt 1351 SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2 SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006 WHIRLPOOL 10b571d9605cd9b927ecfcc0383ae080b9604f6b1e59ce89deaa5331568a4b58380fb67d7b8391d967acc82e457701bf5e43706186d3e94fa8b2211895eb3e0a
+AUX reconfig 357 SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9f96b78a7 SHA512 b218ddf830fc1412ab95bd53377f07b76209b2dd7640654618e937355efd716f2374a0a18f97e8f92c06619f8aed6bbc311eb93541ebf088437e40250288f8cd WHIRLPOOL 0365b1faa0c266d8c3369eaaf2808ffd6ee55ef9dcc303a425a5a661b3eba239e2f807bbeecdf33a4ab35c26d87eea536e87f7c31ebc72f2f5ac15b68c228b2d
+DIST lxr-0.9.8.tgz 104246 SHA256 2caff9447cc2ef1f82d96ce5a2fc4a0358f2d12de52d73a91f29ae5119db4bf5 SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318 WHIRLPOOL e25bc692b08666402e8ef09b9f464811b7d49bbe7ca2597d35e3d9f3dbe2b4bb285ae52e748b86b11327f92a491863ede9030ba914f6f8e3a2251ea3f1b8859c
+EBUILD lxr-0.9.8-r1.ebuild 2076 SHA256 4fa9119a2675b53809c42b1faa260dbb375464b96de9b863ba45babefae288c1 SHA512 98affe97bfeddef0ae122190926595098f153bf1e669a42880b884f8c69452dde444143fc22996d42ef99ebc7ad7e32a859ee9071e6060274a38308acbd5e54c WHIRLPOOL 7d2fbe929606b3eb8c989ffc9ed8509dc552804b9eba34bc2637de0b7281f4bb923c5fc53f9da2dd025a16aeaa9221afd25d4e5c21b39513a38f645981d0076d
+MISC ChangeLog 2615 SHA256 26e41f38ca9c8b83b4dc3b8071a9fafb24ba8794f9cf6c6dd84ec6a4ffa90e47 SHA512 8040fa4a1ebcd34bd13f1058f8193d7a2b47a4feda1d36fa4ae4349e84beb9cbc2a3f2ae1cf75865ff442bad604a99ee7802b4389131ed888aa2aed97b342199 WHIRLPOOL 3813cd74c892c11940c69c0c7a2446c3aae96239d3c3abef9f413940afa5cf0ece66698f4d5da09a9c6e8c25cc69a276d24e5b568aedbcf6c5d8618c3e6d31c7
+MISC ChangeLog-2015 4430 SHA256 47049a2a339a6a3c89a6d7b7638bf122eafefa14bcc05cdb067cac07e60ad615 SHA512 eee027a241ed1634f874110d35dc9abb073d187dbb4c15ee1f234d81a3e47a618f811f017fbd7c1692358b1fbb4e4e6a7228c7f20f95e92821240e7c2683130b WHIRLPOOL f4e9a835548fb04a3b5ad19beadadc51c7ab5a41a8c182a0095e3cfcb7136fd935a062c6b2956de9d1cc0f8009b8afddfb5b1125ff86d2a9ad769a01eed18e9e
+MISC metadata.xml 323 SHA256 507b6903d5c7f71fd214c781a9699d545c2b17380389c343b4beb0925b01a47b SHA512 2010845b78056b6e51326ad0a3c8bd88152f20a2799ba14c4cbffb52374e5d81135a6972b6a16446f3c8ee456169dea9dc717d5aee452636d7012152991666c0 WHIRLPOOL 11fab9dfab5b56601cd9ceb6c753f030db7fe3cc767ac92538eb660413d7fadcd7f657cc50b8fc783e5d8c92670251a76bada87ecc32afcd28ef8603f1b7d47b
diff --git a/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch b/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
new file mode 100644
index 000000000000..f28604683781
--- /dev/null
+++ b/www-apps/lxr/files/lxr-0.9.8-initdb-mysql.patch
@@ -0,0 +1,13 @@
+--- initdb-mysql	2004-07-20 11:31:24.000000000 -0400
++++ initdb-mysql.patched	2006-01-26 15:41:43.000000000 -0500
+@@ -34,8 +34,8 @@ create table lxr_indexes (
+
+ create table lxr_releases
+         (fileid         int not null references lxr_files,
+-        releaseid             char(255) binary not null,
+-        primary key     (fileid,releaseid)
++        `releaseid`             char(255) binary not null,
++        primary key     (fileid,`releaseid`)
+ );
+
+ create table lxr_usage
diff --git a/www-apps/lxr/files/postinstall-en.txt b/www-apps/lxr/files/postinstall-en.txt
new file mode 100644
index 000000000000..07412c4da554
--- /dev/null
+++ b/www-apps/lxr/files/postinstall-en.txt
@@ -0,0 +1,44 @@
+0. Create a db for lxr:
+
+ MySQL: run mysql and read in the initdb file using:
+   \. ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+
+ PostgreSQL:
+   createuser lxr
+   createdb -U lxr lxr
+   psql -U lxr lxr
+   \i ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql
+
+1. Edit ${MY_INSTALLDIR}/lxr.conf and set:
+ - db settings
+ - 'v'
+ - 'sourceroot'
+ - 'graphicfile'
+ - 'filetype'
+ - 'incprefix'
+
+2. If you want to use CVS, also set:
+  'range' => sub { return
+	($files->allreleases($LXR::Common::pathname),
+	$files->allrevisions($LXR::Common::pathname))
+	}, # deferred function call.
+
+	You should also set the default version retrieved to a version that really
+	does exist otherwise you will receive errors when generating your index.
+
+	A good value for the default version is head.
+	  'default' => 'head'
+	Set 'sourceroot' and 'sourcerootname'.
+
+3. If you want to use swish-e:
+	Create a directory for the swish index files to go in, and put the
+	path of this directory in the 'swishdir' variable.
+
+4. An .htaccess file has been installed into ${MY_INSTALLDIR}. Please note that
+you must take special care not to make lxr.conf visible to the world. If you
+are not using mod_perl, use .htaccess_cgi instead.
+
+5. Create the index:
+ ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}${VHOST_APPDIR}
+
+6. Browse to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/source
diff --git a/www-apps/lxr/files/reconfig b/www-apps/lxr/files/reconfig
new file mode 100644
index 000000000000..e9e2f47b3f69
--- /dev/null
+++ b/www-apps/lxr/files/reconfig
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo "$@"
+	echo "#####"
+	exit 1
+}
+
+if [[ $1 == "install" ]] ; then
+	cd "${MY_INSTALLDIR}" || die
+	files="lxr.conf $(ls ._cfg*lxr.conf 2>/dev/null)"
+	sed -i \
+		-e "s|/lxr|${VHOST_APPDIR}|" \
+		-e "s|192.168.1.3/lxr|${VHOST_HOSTNAME}${VHOST_APPDIR}|" \
+		${files} || die
+elif [[ $1 = "clean" ]] ; then
+	echo $1
+fi
+
+exit 0
diff --git a/www-apps/lxr/lxr-0.9.8-r1.ebuild b/www-apps/lxr/lxr-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..69967becba38
--- /dev/null
+++ b/www-apps/lxr/lxr-0.9.8-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module webapp multilib eutils depend.apache
+
+DESCRIPTION="general purpose source code indexer and cross-referener with a web-based frontend"
+HOMEPAGE="https://sourceforge.net/projects/lxr"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc ~x86"
+IUSE="cvs mysql postgres"
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+RDEPEND="dev-util/ctags
+	dev-lang/perl
+	dev-perl/DBI
+	dev-perl/File-MMagic
+	cvs? ( dev-vcs/rcs )
+	postgres? ( dev-perl/DBD-Pg )
+	mysql? ( dev-perl/DBD-mysql )"
+
+need_apache2
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${PN}-0.9.8-initdb-mysql.patch"
+
+	sed -i \
+		-e 's|/usr/local/bin/swish-e|/usr/bin/swish-e|' \
+		-e 's|/usr/bin/ctags|/usr/bin/exuberant-ctags|' \
+		-e "s|'glimpse|#'glimpse|g" \
+		-e "s:/path/to/lib:${VENDOR_LIB}:" \
+		templates/lxr.conf || die "sed failed"
+	sed -i \
+		-e 's|Apache::Registry|ModPerl::PerlRun|' \
+		.htaccess-apache1 || die "sed failed"
+	sed -i \
+		-e 's|require Local;|require LXR::Local;|' \
+		-e 's|use Local;|use LXR::Local;|' \
+		-e 's|package Local;|package LXR::Local;|' \
+		Local.pm lib/LXR/Common.pm diff find ident search source || die "sed failed"
+}
+
+# prevent eclasses from overriding this
+src_compile() { :; }
+
+src_install() {
+	perl_set_version
+	webapp_src_preinst
+
+	insinto "${VENDOR_LIB}"
+	doins -r lib/LXR
+	insinto "${VENDOR_LIB}"/LXR
+	doins Local.pm
+
+	dodoc BUGS CREDITS.txt ChangeLog HACKING INSTALL notes .htaccess* swish-e.conf
+
+	exeinto "${MY_HTDOCSDIR}"
+	doexe diff find genxref ident search source
+	insinto "${MY_HTDOCSDIR}"
+	doins .htaccess* templates/*
+
+	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess-apache1
+	webapp_sqlscript mysql initdb-mysql
+	webapp_sqlscript postgresql initdb-postgres
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}
diff --git a/www-apps/lxr/metadata.xml b/www-apps/lxr/metadata.xml
new file mode 100644
index 000000000000..b1a40455a1f2
--- /dev/null
+++ b/www-apps/lxr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lxr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
new file mode 100644
index 000000000000..5a24ef217e01
--- /dev/null
+++ b/www-apps/mediawiki/Manifest
@@ -0,0 +1,7 @@
+AUX postinstall-1.18-en.txt 2611 SHA256 8388d74e84d63c40cbc697e25639be5f07108ecc13497346fccf9d89ab0484eb SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b WHIRLPOOL 254b014ac9a7cf431958ade7827afadbf7e48ec255e1ea39e7ac3fa091f7d321376b760dad39d0be3af3a6cb342aaeac9d4e2329816bf3c6b3e4e55e1ac05d4b
+AUX postupgrade-1.16-en.txt 1514 SHA256 5d7aedb456fbff83adf0335ca5e1c99062e694e178bc93d749615ff63dc883f4 SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5 WHIRLPOOL f17f927bfedfdc502c752276c0876bebe771918242be98de32d5fc51003a054132f4f6b4a16caeca293c1ebb44c12bc322eee5efcefda228ea97136b00c6e1ee
+DIST mediawiki-1.27.3.tar.gz 31509270 SHA256 11d470582b52a471b4e99735b36a44b230681847a97ef032c2fc050fd8aea823 SHA512 bc6228342b589a3acb0f5623b9ef45982d7aab032ff322aaf7bda7ac3ee16a7732b8013698d8f509da4310bbb65c12a73b7bbe4612d5e0e3d93965199efdc8eb WHIRLPOOL 23fd4432a52c454a8354fcd325d9081b888f14f199020e43798eaa3cb904c8b7fff70e5c38ee77fcf982d755deeaea2071cfcb2133b1b88a92a7afdab56577a9
+EBUILD mediawiki-1.27.3.ebuild 2364 SHA256 66e6bb62c33a6f5ef5009b279ac5c55e3f1df679bd0b09a35bc2eea25d1652fc SHA512 0adfcc39cfcb96f80e33d3d428e3d2cd243a36caf51a4505aed59456fde85c677b38252a383eff32d0d5946b19cd7a57516e0691961aaeab2fdcce701f204056 WHIRLPOOL 41ce11513758432314d33cc181479f5c1511e442ef942a2c83cbebfed2c156b1d182e8330b3bdd7a0d7fe34bde61192d72fdf0ce57083ff2f988052ab698b075
+MISC ChangeLog 5151 SHA256 a7c346cb02a8151ac1bdda0ea43cc8df8258e4e047024bc7d5215dda5a2a2719 SHA512 31b96eeb49f4e899cc62e29fd406bf4fa54c8c8810fc56aec1d76b5bbb0f5819202174634ac36845c0d87d981ce8164077e45b9b04fc88cb4255e510536dfa54 WHIRLPOOL fd4894448d6b27625b0876c4020155a90b378284ec50253e1fbd09e80a0e8e62b747b7e5c7dd934fd2e2111d3dc07c836c864dc36c565baec0e19120c7d5f00e
+MISC ChangeLog-2015 48622 SHA256 47f0b0f7fe6213cbf5f5b0291158772413be515571e50fe38739eba16131609e SHA512 78861ff39da3d7d2862e59d8e9ced02df10de1d24d1601d33895b9af32381052c26eff0ba90e0990c08346d54b9bc85a0db25023ef6133817d6fadf653a21301 WHIRLPOOL 4c94dfb8852c60aa16f74775b12b62a57ca2de20cbbb3f64186b083dceb49f0faf0b20f31ee7c12ebdf5038bd7d30a796e930c4a706f038aa21064931b62ba30
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/mediawiki/files/postinstall-1.18-en.txt b/www-apps/mediawiki/files/postinstall-1.18-en.txt
new file mode 100644
index 000000000000..bfed0d9215cd
--- /dev/null
+++ b/www-apps/mediawiki/files/postinstall-1.18-en.txt
@@ -0,0 +1,85 @@
+To complete installation you need to proceed the following steps:
+=================================================================
+
+1. Temporarily make the "mw-config" directory writable to the user the web
+server is running as. The quickest way is to make the directory world
+writable. For example:
+
+$ cd ${MY_INSTALLDIR}
+$ chmod a+w mw-config
+
+
+2. Configure database.
+a.) If you know the root password on your database, the MediaWiki installation
+script can create a new database for you.
+
+b.) If you don't know the root password, MediaWiki still needs database to
+work with. So, please, read the following link and find solution which suits
+your needs best:
+
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#Create_a_database
+
+
+3. Now continue the installation through web browser by accessing the
+following page:
+
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/mw-config/
+ 
+
+4. After the setup script has finished running successfully, a file called
+LocalSettings.php is created in the "mw-config" directory. Move this file to the
+root wiki directory (${MY_INSTALLDIR}):
+
+$ mv mw-config/LocalSettings.php .
+
+Set stringent permissions on the LocalSettings.php file:
+
+$ chown <webserver-user>:root LocalSettings.php
+$ chmod 600 LocalSettings.php
+
+And delete the "mw-config" directory:
+
+$ rm -rf mw-config
+
+
+5. Once you have done the above, your wiki should be ready to use!
+
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/
+ 
+
+Enabling Optional Features and other configuration
+==================================================
+
+Allow images and other files to be uploaded through the wiki
+------------------------------------------------------------
+
+If you wish to enable images and other files to be uploaded through wiki then
+edit the LocalSettings.php file and set \$wgEnableUploads to 'true':
+
+\$wgEnableUploads       = true;
+
+Now if MediaWiki was built with the imagemagick USE-flag the directory
+permissions are correct, otherwise install ImageMagick and adjust permissions
+on the images directory to allow the web server to write. For example:
+ 
+$ chown <webserver-user>:<webserver-group> ${MY_INSTALLDIR}/images
+
+IMPORTANT: Uploads need to be set up properly in order to be secure! For more
+details take a look at the following page:
+
+http://www.mediawiki.org/wiki/Manual:$wgEnableUploads
+
+
+Math Support
+------------
+
+Math support has been removed from the core mediawiki package from 1.18.0
+onwards. See http://www.mediawiki.org/wiki/Extension:Math to enable math
+support.
+
+
+Other
+-----
+
+For other tweaks, continue with the following:
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#See_also
diff --git a/www-apps/mediawiki/files/postupgrade-1.16-en.txt b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
new file mode 100644
index 000000000000..e26939c36e3d
--- /dev/null
+++ b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
@@ -0,0 +1,44 @@
+These instructions help you to upgrade your mediawiki installation.
+
+Please NOTE: at this point it is supposed that you've already read
+RELEASE-NOTES and done full wiki backup, as described here:
+http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki
+
+
+Run the update script
+=====================
+
+Note: Make sure \$wgDBadminusr and \$wgDBadminpassword is set in your
+LocalSettings.php file in your wiki root. The user needs full permissions
+(shell access) on the database.
+
+The preferred method of performing the update is using the command-line
+maintenance script, although it is also possible to re-run the web-based
+installer. To run command-line maintenance script, change to the maintenance
+directory and execute the update script:
+
+$ cd ${MY_INSTALLDIR}/maintenance
+$ php update.php
+
+MediaWiki will inspect the existing schema and update it to work with the new
+code, adding tables and columns as needed.
+
+For alternative ways to upgrade your wiki, please, take a look at:
+http://www.mediawiki.org/wiki/Manual:Upgrading
+
+
+Upgrade extensions
+==================
+
+Certain extensions have been updated in order to work with MediaWiki 1.13. Be
+sure to upgrade to the latest versions of such extensions. You might need to
+perform manual updates to custom extensions.
+
+
+Test the update
+===============
+
+Once the upgrade has completed, browse to the wiki and check basics such as
+viewing and editing pages to ensure things still work as expected.
+
+Visit Special:Version and check that the version shown is correct.
diff --git a/www-apps/mediawiki/mediawiki-1.27.3.ebuild b/www-apps/mediawiki/mediawiki-1.27.3.ebuild
new file mode 100644
index 000000000000..ce9c6e247e96
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.27.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit webapp versionator
+
+MY_BRANCH=$(get_version_component_range 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-5.5.9[json,mysql?,postgres?,session,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite:3[fts3(+)]
+		>=dev-lang/php-5.5.9[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/mediawiki/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/metadata.xml b/www-apps/metadata.xml
new file mode 100644
index 000000000000..b776a8dbb48a
--- /dev/null
+++ b/www-apps/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The www-apps category contains various world wide web applications.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría www-apps contiene paquetes relacionados con la world wide
+		web (WWW).
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie www-apps enthält verschiedene WWW-Applikationen wie
+		beispielsweise Wikis, CMS- oder Blogging-Software.
+	</longdescription>
+	<longdescription lang="ja">
+		www-appsカテゴリーには様々なワールド・ワイド・ウェブの
+		アプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De www-apps categorie bevat verschillende WWW-applicaties zoals bijvoorbeeld
+		wiki's, CMS- en blogging-software.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm www-apps chứa các ứng dụng web.
+	</longdescription>
+	<longdescription lang="sk">
+		Táto kategória obsahuje rôzne WWW aplikácie.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria www-apps contiene applicazioni per il world wide
+		web (WWW) come software per wiki, CMS e blog.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria www-apps contém várias aplicações relacionadas a
+		world wide web (WWW).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria www-apps zawiera programy związane z przeglądaniem WWW.
+	</longdescription>
+</catmetadata>
+
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
new file mode 100644
index 000000000000..f5188d4b3a60
--- /dev/null
+++ b/www-apps/metadot/Manifest
@@ -0,0 +1,12 @@
+AUX metadot.conf 445 SHA256 e992b4f22f84b449da1be0a93c790a43a0a106b575c62e2727c1e069b4d73ae0 SHA512 90f9b1db9614cd6053b16c3adcc37071f1c4309078601c5154d79e3ed1ac65268cfe05b0e7d9f32f9c66a1b2779bb71d4b3b1d6d9cf2da0ddbc82cd42c93ef32 WHIRLPOOL 7f6e6a14652a8a553c3fb645c808206e1ff26f589328b35bcc4221fec1841379892577632f36fcf1e41b438ca2ab2c24dcf9f98ac7e0cbd8466e5fc5b81635a6
+AUX postinstall-en-6.1.6.txt 1567 SHA256 0120a85fcc503e8a7063cf27cc89876b6b190adef1d4859b0a6710059f5eecb5 SHA512 155f2743cf4e4f4bb2ec8b01f434240dd968a1c6868e4def846b0cbd84946ac0ecd5f961c8c0099ee0769094f2b6b2336f36316139ff98d1d34cd506053cb393 WHIRLPOOL 836b2b88923470e5cbf3ebea15292d4ce58ec3eaa5b448388fdfd259bbf99035d7fce333bec73c6ff10d990cc860579574a2249b87a0713771bea162179bd03a
+AUX postinstall-en-6.4_p3.txt 1174 SHA256 2e034e959190db851c8865b0dd7ecb2a9c64b24b3ab2b2e30f6d8f75d046affc SHA512 7b18a538f41323cdb548ed5d813b0dd209b82d24e27582c2c66bda987557be470f72d18958d043d3417bafa5d665dd573f6a3d0f014c634347ec417cacf6b880 WHIRLPOOL f531898dc3a40df285e2b36decabbca8b9dacf3ecbf7e865fd252cf2fbdc227545c803e14b4c26c23837c75ad3d1e105700c86e780d7c01abea08d8286a15af6
+AUX reconfig-6.1.6 337 SHA256 d43f96c32b99cc52b5f00a642fde9f3539b114510ae5fd3b59a7df9bb8c3827a SHA512 dc12afbef749e2306cb5fac0d40892399c05ab2416b6451cd84ea44192506130f5d73987eb8922a934c6072ea20e0e4098c776fdfb2216b0c4c8628feffe88ba WHIRLPOOL b600b4a8c27c7aae9b70d4641d1085f6fe5a10811f832388cc314ea9c9effc189b602dccf1b8524f21fbad9938a11277e3572d8c74bb92b81aa20ac78ff56ee8
+AUX reconfig-6.4_p3 361 SHA256 76291fa277b4b32486bb550b533851b2da10afca0eb79203305742b8acc78f28 SHA512 c3fd94bd96de791da23799054b474b392e761c056acd664947d2e66551ddf85e14436b4390b92d3c6ebe80d2f590b84e0b74031d4cf0de943d72d214c4dc8c59 WHIRLPOOL 8b7fcf59c00fe54878d0f49d848d0157d729678edee3f482a3a0aeb021b49c07332c10f183151290b409ce5dec7bae831e6a5a0db3b0e0c97b35613ea1c9bd99
+DIST Metadot6.4.5.4.tar.gz 4055040 SHA256 d125b61d59563d25b2feac8ae692225478130e88f5f9165cf1de34c7985cc785 SHA512 a7982e604b1f0f8db393bb16c6ecb7ca0562b8b1a620bc9db268e4be4c73de827b8a0cf0c5156822c3c63d4f8ef19a37a37d2c39037bf9d6d00df0a310e04cc1 WHIRLPOOL e96ce975c4bf19827fbd3d9e18ecf11d52cd0a2e138a91ce3dcc3dffa40cc16e04f9c687e717efccf19bb68aeba64a85fff4375ed91d1caa3295c2b583f3e332
+DIST metadot6.1.6.tar.gz 3754969 SHA256 d7033b8ad561914714ea3d4d32d745566b291494fd3cfc46f66c496e37c48339 SHA512 0b7f4bd99fcc909b3f3428591193fecadfe6542b5a541c351e69323efe06e38fdb4a507d83ceec61105ddeae6b95433f67d3d12778c4acf4b9189b169f03fd7e WHIRLPOOL 1ebe465989931256dcb5bf784e6c0d1cbfae6fffe1feff32326cf6ec71f04b01d35ceb69a359f8b5e50152ccaf7f2c93492d3f0f9fd8955d78e0c7074f001ad5
+EBUILD metadot-6.1.6-r1.ebuild 1266 SHA256 7a888bb5f0090ac925abc8aac02865ba4f309bcb24da1cbc8083ff640a082cf1 SHA512 f3a10d000b44343373a63e50388f0119dc43fe675395c58fcdd3d987b56f88ad4b105c757d28747a7a64836c7a3a31d842b7e426bb497999197b0dbab0027848 WHIRLPOOL 1db7fdf980698c5e020eb90442b755ca7b57d499b59852f4de8d3bf3592931d7a86bad8c689be7893a516615f943cbc1e7dd3743bea57fa27b14aa9f2ac2fa4f
+EBUILD metadot-6.4.5.4-r1.ebuild 1748 SHA256 bc2fa5dc904893f18f940617f3800b42a47e1206ac9b6961c3051b4bce63b23e SHA512 74396c35982f891135fe5dcf948d6a690cdee3e9819acf3c36b6c9d313291e82fd43c419f99977452e681e7cfc1a002703cb167c785fb823c1a61896236ae7be WHIRLPOOL a037bfd05eb1ceea99c11ff76ebdf45aeee4ae159346aa1c9493a0b0e815b7258cf1285be45045a0c152ec10a477fdd8b1e0a6c021cc5138be0721729de29176
+MISC ChangeLog 3271 SHA256 6fd4d61cf127b527585978da532cbdefb248822c16c13b8deb80e15adb92c75f SHA512 b2380ed27ce6032b386462916dc8fa65ef9238b5465daa0419a925e716c0482acc076578169e20947bc962a2c1cec88f67af46df2832ebbefd8ab3923574ab86 WHIRLPOOL 2ac7feb83528faba1caa59c82c10169f1b61f6da9ada566f6a8207aa0b80aa40d03167b87e1321ec6bcf9e9a9713477beea42701ec9a721014a6e9eee1844e0b
+MISC ChangeLog-2015 4740 SHA256 27047d3e4f9f03c30481c672c53c08e9fba616f61673d2b0b93930cac6793a48 SHA512 d9b6a516051373d7e27a690c0a908df1c865f43e80ea0c4ac6bfe7b4f59f4b7b4c9084dc66f98fe77d2a284bfb231733509be1fb6896fcb8003d8f4ab3a6e47b WHIRLPOOL 75a872e12f87b1f50f0e72d7212e2c9a4be2d89eec2546f05f6418647b04e9552aa187c70b7ba86f3b6c0f6d32ceccf05af0cd3e734c1091579dcb72f8d9d2c0
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/metadot/files/metadot.conf b/www-apps/metadot/files/metadot.conf
new file mode 100644
index 000000000000..8dc1e5036944
--- /dev/null
+++ b/www-apps/metadot/files/metadot.conf
@@ -0,0 +1,20 @@
+<VirtualHost VHOST:80>
+	DocumentRoot "ROOTDIR/html"
+
+	<Directory "ROOTDIR/html">
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	Alias /images/  ROOTDIR/html/images/
+	Alias /js/  	ROOTDIR/html/js/
+	Alias /metadot/ ROOTDIR/metadot/
+	Alias /public/  ROOTDIR/sitedata/public/
+	Alias /skins/   ROOTDIR/sitedata/skins/
+
+	<Location "/metadot">
+		SetHandler perl-script
+		PerlHandler Apache::Registry
+		Options +ExecCGI
+	</Location>
+</VirtualHost>
diff --git a/www-apps/metadot/files/postinstall-en-6.1.6.txt b/www-apps/metadot/files/postinstall-en-6.1.6.txt
new file mode 100644
index 000000000000..5a25713e1b02
--- /dev/null
+++ b/www-apps/metadot/files/postinstall-en-6.1.6.txt
@@ -0,0 +1,48 @@
+
+1. Set up your database:
+cd ${MY_INSTALLDIR}/default_data
+If using MySQL-3*: mysql -uroot -p mysql < createdbanduser.sql
+If using MySQL-4*: mysql -uroot -p mysql < createdbanduser4x.sql
+
+Then change the default password:
+mysql -uroot -p mysql
+mysql> update user set password = password('<newpassword>') where user = 'metadot';
+mysql> flush privileges;
+mysql> quit
+
+Now,
+mysql -umetadot -p<newpassword> metadotdb < sampledata.sql
+
+2. Edit the Metadot configuration file:
+edit ${MY_INSTALLDIR}/etc/metadot.conf
+Set your database password from step 1.
+Read the online docs! Especially if you want to use virtual servers.
+
+3. Configure Apache:
+Add the follwing to you apache.conf or .htaccess:
+
+Alias /images/ ${MY_INSTALLDIR}/html/images/
+Alias /js/ ${MY_INSTALLDIR}/html/js/
+Alias /metadot/ ${MY_INSTALLDIR}/metadot/
+Alias /public/ ${MY_INSTALLDIR}/sitedata/public/
+Alias /skins/ ${MY_INSTALLDIR}/sitedata/skins/
+Alias /htmlarea3/ ${MY_INSTALLDIR}/html/htmlarea3/
+
+<Location "/metadot/">
+	SetHandler perl-script
+	PerlHandler Apache::Registry
+	Options +ExecCGI
+</Location>
+
+To quote the docs:
+"Make sure that this directory is owned by apache:apache"
+Read the section about configuring your MIME types.
+Now restart Apache.
+
+4. Configure cronjobs.
+Read the relevant section in the docs, and be sure to specify the right paths.
+HINT: /home/metadot is not used, everything is in ${MY_INSTALLDIR}/${PN}
+
+5. Now go to http://${VHOST_HOSTNAME}/metadot/index.pl
+Hopefully everything worked. Now go read the docs and set up your Metadot, and
+change the default Admin password.
diff --git a/www-apps/metadot/files/postinstall-en-6.4_p3.txt b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
new file mode 100644
index 000000000000..9888bd3509e1
--- /dev/null
+++ b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
@@ -0,0 +1,34 @@
+
+1. Set up your database:
+cd ${MY_INSTALLDIR}/default_data
+If using MySQL-3*: mysql -uroot -p mysql < createdbanduser.sql
+If using MySQL-4*: mysql -uroot -p mysql < createdbanduser4x.sql
+
+Then change the default password:
+mysql -uroot -p mysql
+mysql> update user set password = password('<newpassword>') where user = 'metadot';
+mysql> flush privileges;
+mysql> quit
+
+Now,
+mysql -umetadot -p<newpassword> metadotdb < sampledata.sql
+
+2. Edit the Metadot configuration file:
+edit ${MY_INSTALLDIR}/etc/metadot.conf
+Set your database password from step 1.
+Read the online docs! Especially if you want to use virtual servers.
+
+3. Configure Apache:
+The ebuild installed an Apache configfile: ${VHOST_ROOT}/${PN}.conf
+Copy it into /etc/{apache,apache2}/vhosts.d and edit it to
+suit your needs.
+
+4. Configure cronjobs.
+Read the relevant section in the docs, and be sure to specify the right paths.
+HINT: /home/metadot is not used, everything is in ${MY_INSTALLDIR}
+
+5. Now go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/index.pl
+Hopefully everything worked. Now go read the docs and set up your Metadot, and
+change the default Admin password.
+
+Don't forget to read the online docs!!!
diff --git a/www-apps/metadot/files/reconfig-6.1.6 b/www-apps/metadot/files/reconfig-6.1.6
new file mode 100644
index 000000000000..c70721fcbe27
--- /dev/null
+++ b/www-apps/metadot/files/reconfig-6.1.6
@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ $1 = "start" -o $1 = "install" ]; then
+	sed -e "s|skin_template_dir = /home/metadot/metadot/sitedata/skins|skin_template_dir = ${MY_INSTALLDIR}/sitedata/skins|
+		s|public_uploads_dir = /home/metadot/metadot/sitedata/public|public_uploads_dir = ${MY_INSTALLDIR}/sitedata/public|" -i  ${MY_INSTALLDIR}/etc/metadot.conf
+fi
diff --git a/www-apps/metadot/files/reconfig-6.4_p3 b/www-apps/metadot/files/reconfig-6.4_p3
new file mode 100644
index 000000000000..f37752ba4a94
--- /dev/null
+++ b/www-apps/metadot/files/reconfig-6.4_p3
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|/home/metadot/metadot|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/etc/metadot.conf || die
+	# fix Apache configs
+	sed -e "s|ROOTDIR|${MY_INSTALLDIR}|g
+	s|VHOST|${VHOST_HOSTNAME}|" -i ${VHOST_ROOT}/metadot.conf || die
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/metadot/metadata.xml b/www-apps/metadot/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/metadot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/metadot/metadot-6.1.6-r1.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild
new file mode 100644
index 000000000000..fbef34d5c613
--- /dev/null
+++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+MY_P=${P/-/}
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="~x86 ppc"
+
+RDEPEND="
+	>=dev-lang/perl-5.005
+	>=www-apache/mod_perl-2.0
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	dev-perl/Apache-DBI
+	dev-perl/XML-RSS
+	virtual/perl-Storable
+	dev-perl/perl-ldap
+	dev-perl/Log-Agent
+	dev-perl/Mail-POP3Client
+	dev-perl/IO-stringy
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Unicode-String
+	dev-perl/Spreadsheet-WriteExcel
+	dev-perl/Date-Calc
+	dev-perl/AppConfig
+	dev-perl/Image-Size
+	dev-perl/Template-Toolkit
+	virtual/perl-Time-HiRes
+	dev-perl/Lingua-EN-NameParse
+	dev-perl/Number-Format
+	dev-perl/XML-Simple
+	dev-perl/Text-CSV_XS
+	dev-perl/Archive-Zip
+	dev-perl/Date-Manip
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_HOSTROOTDIR}/${PN}
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-${PVR}.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-${PVR}
+	webapp_src_install
+}
diff --git a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
new file mode 100644
index 000000000000..90501a51226e
--- /dev/null
+++ b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+MY_P="Metadot${PV}"
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="ppc ~x86"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/perl-5.6
+	=www-apache/mod_perl-2*
+	dev-perl/DBI
+	>=dev-perl/DBD-mysql-2.1027
+	dev-perl/Apache-DBI
+	>=dev-perl/AppConfig-1.55
+	>=dev-perl/XML-RSS-1.02
+	dev-perl/perl-ldap
+	>=dev-perl/Log-Agent-0.304
+	dev-perl/Mail-POP3Client
+	>=dev-perl/IO-stringy-2.108
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	>=dev-perl/Unicode-String-2.07
+	>=dev-perl/Spreadsheet-WriteExcel-0.41
+	>=dev-perl/Date-Calc-5.3
+	>=dev-perl/Image-Size-2.991.0
+	>=dev-perl/Template-Toolkit-2.09
+	>=virtual/perl-Time-HiRes-1.48
+	>=virtual/perl-Test-Harness-2.28
+	>=dev-perl/Test-Manifest-0.91
+	>=virtual/perl-Test-Simple-0.47
+	>=dev-perl/Lingua-EN-NameParse-1.18
+	>=dev-perl/Number-Format-1.45
+	>=dev-perl/XML-Simple-2.08
+	dev-perl/XML-Dumper
+	dev-perl/Archive-Zip
+	dev-perl/Date-Manip
+	dev-perl/Text-CSV_XS
+	dev-perl/HTML-Tree
+	dev-perl/HTML-Format
+	dev-perl/Data-ShowTable
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+
+	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
+	sed -i "s|Apache::Registry|Modperl::Registry|" \
+		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
+
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
+	webapp_src_install
+}
diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
new file mode 100644
index 000000000000..0a43d5313949
--- /dev/null
+++ b/www-apps/mirmon/Manifest
@@ -0,0 +1,9 @@
+AUX 0001-Add-rsync-monitoring-support-to-mirmon.patch 2534 SHA256 57a821c9194d416802024246d2bb3ae8c100b46dcf5a17450ed43a01804c3ff9 SHA512 36bee0706ba782a8706ee88d52e913f10d3f1b84a5979f252aa947b44ed30c7f9c5db5b17dbe0b5bf6dae7fd899c926f2a79349081731d00f4160808d32a5844 WHIRLPOOL 0edd693d40d0e8adbf663736c2c22c383fdeecca12e4991154f7a93648c8219596773a7792cc7d37dc708b9a6b64aa2f24f640fd25d82aae03444270709e08c6
+AUX 0002-Add-ipv6-monitor-support-to-mirmon.patch 970 SHA256 d5ad1d7189791237996bab0f2f46582981cefc1bb9fb0d5374b09a2001b69821 SHA512 ea6f7f51e516b944f69b6c76ecb48e36a1127867fdbaf558c9b81253ee47793bb017dfb0df830343c21dc8c8023390c6b53ef9f16e798731ab0c3f4b201dc9ad WHIRLPOOL 464d5fa91b60cdf6d89c4b1d480f0a33af68081a5238883f597eef59fcddcfce20bfaf8b7931e66a21e9324a3f03a443e73ddc580c9b4a7f0437c62cca8a3eac
+DIST mirmon-1.38.tar.gz 33021 SHA256 5defb2c0890d3461a2b8dd8cc3efc4c63c0814c043cb227a69b4a457a38b0ce3 SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08 WHIRLPOOL 69a061b459a4456dfcb5742f1bd17a81843ad97f90ecb3f0849f5dc78618aab55fae4d771b3d4552eb90f9f1b1ec0d70464e5f7e94565fa8097b7c39c3d4a9d2
+DIST mirmon-2.10.tar.gz 72212 SHA256 384d0bd14d71b87797d2a1fa66a0fcb9af11307a9de20f2c5544344b3710fa33 SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d WHIRLPOOL 1aef8dfbd9b045407a9f5ad12f95fd92e0482a95aa487ecb54de54a94d611320e295dc03b639988c81496292f7b668e132873480061b9a1758fff47e2542e06f
+EBUILD mirmon-1.38-r4.ebuild 1058 SHA256 2004e29a1ce7181a27d2bc9a85e5990bcf683fefce7026731dd97fb78fb4aad1 SHA512 3f048753db716ddc339299b0fd3f3cf4c1f802de4237716ccef7f6f5219f323637c43599f25e0a0c3cf005209157be58d76bd113a60a01ee6cef679d052e97af WHIRLPOOL 75a0089eb6b9d2fba1740779e35fd29abf9fce214b340fc52eb68c44b72da933e53bda3d5eeee8d362cd4051113e76a684d39e85241f0c6f518ecfd0b5d036e9
+EBUILD mirmon-2.10.ebuild 905 SHA256 d3200836fc7eb6fde70a156d23a67764e89a3fdab1493a7bd7348794e5d5b8a2 SHA512 c64a6d5121e7208667c4eebab50c6219ff40a62fe7764b067cfcce81504d2686980a5de91f0b52b7a9788987448fd1098b95ab6959c92894891a1db6aa174319 WHIRLPOOL c0d8d1e8580218c0783d02ffcacb1116a8c918de7fcd832d096146b08ef8c38a92043c491e46b8d4dd0f38d1e5761b32a4bf6b74c6c1b5a45d820e55b40bafc2
+MISC ChangeLog 2909 SHA256 2482af85a9326edde965456af652d10ba788534866576b9efb3d33ad0b3f4dde SHA512 d8b05eed24c630cc02ba40ae7a8b601b7d8b223d2630b02f095c771dd8dec4674b638d820bce5afc4dc130925d477d665a7cb441f096b3354248a36cbda10cb6 WHIRLPOOL 2a2a77a27a9498c7dbe1df6a3659cc5917ce76012ad05f03af2a8cffc2185548efe6ca666041c823a2e1268bd1b63b243b131c727cf2e5e15cdd6493d77ab403
+MISC ChangeLog-2015 2646 SHA256 204b24bbd1c754071c7b2c2ee30e36ac65c434498a064d3e293b75e145970148 SHA512 0bdef1345023edc0d168ed17b63f38bdec068e619ba11e5031fb17a13d1f2fd54a0709d538a9317ed0f55e571ba0600c950c7baec1b188702ad9e725337a553f WHIRLPOOL be9d639f665417ff44982b7d6786397f862a267d836634bddc83b54f26b848c6e82adf5539e2e1ef145485a8567825545aa84bd3b8c285014720900dbaa6e040
+MISC metadata.xml 301 SHA256 1644efc2070eff4ad5ce425fd73568549da157758b5bda1cf8e12246a1d41f78 SHA512 7e3589110474bd73e8ce39b9056dd426d5d68eed8f6babaf90357e629feda96e4ec03e568a8042ff7dfe8521696150d794c3344f7773b4df060c0ee77d7dfb8e WHIRLPOOL 1ba727ccfdd9d01dc0524ab33850edfd0d914c73b197d7753cc23dbf01d3641e320661fef67f614da12c902ace3faf8d9072455621042cd17f641c3379b1a241
diff --git a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch b/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
new file mode 100644
index 000000000000..0c8c69d7795f
--- /dev/null
+++ b/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
@@ -0,0 +1,87 @@
+https://bugs.gentoo.org/show_bug.cgi?id=289942
+
+From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Wed, 28 Oct 2009 20:58:45 -0500
+Subject: [PATCH 1/2] Add rsync monitoring support to mirmon.
+
+You will also need to modify mirmon.conf to use probe-mirmon instead
+Original patch located at: http://www.tug.org/texlive/mirmon/probe-mirmon
+---
+ mirmon       |    2 +-
+ probe-mirmon |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+), 1 deletions(-)
+ create mode 100644 probe-mirmon
+
+diff --git a/mirmon b/mirmon
+index a1261f5..6c0aaa8 100755
+--- a/mirmon
++++ b/mirmon
+@@ -384,7 +384,7 @@ sub get_ccs
+ sub type_site
+   { my $url = shift ;
+     my ( $type, $site, $home ) ;
+-    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
++    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
+       { $type = $1 ; $site = $2 ; $home = $& ; }
+     return $type, $site, $home ;
+   }
+diff --git a/probe-mirmon b/probe-mirmon
+new file mode 100644
+index 0000000..a7fe513
+--- /dev/null
++++ b/probe-mirmon
+@@ -0,0 +1,50 @@
++#!/usr/bin/env perl
++# $Id$
++# public domain.  Originally written by Karl Berry, 2009.
++# 
++# Probe rsync url's for mirmon; use wget for anything else.
++# From description at http://people.cs.uu.nl/henkp/mirmon.
++# 
++# Also requires a patch to mirmon itself to accept rsync urls
++# (and I wanted https too):
++# --- /usr/local/share/mirmon/ORIG/mirmon	2007-08-18 18:05:47.000000000 +0200
++# +++ /usr/local/share/mirmon/mirmon	2009-07-03 22:38:00.000000000 +0200
++# @@ -386,3 +386,3 @@
++#      my ( $type, $site, $home ) ;
++# -    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
++# +    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
++#        { $type = $1 ; $site = $2 ; $home = $& ; }
++
++exit (&main ());
++
++sub main
++{
++  my ($timeout,$url) = @ARGV;
++  my $ret;
++
++  if ($url =~ m,^rsync://,) {
++    $ret = &handle_rsync ($timeout, $url);
++  } else {
++    $ret = system qq(wget -q -O - -t 1 -T $timeout $url);
++  }
++  return $ret;
++}
++
++
++sub handle_rsync
++{
++  my ($timeout,$url) = @_;
++  
++  my $tmpdir = "rsync-tmp";
++  -d $tmpdir || mkdir ($tmpdir, 0700);
++  
++  (my $file = $url) =~ s/\W/_/g;  # translate all non-letters to _
++  my $local = "$tmpdir/$file";
++  my $ret = system
++             qq(/usr/local/bin/rsync --no-motd --timeout $timeout $url $local);
++
++  @ARGV = ($local);  # don't care about our args any more.
++  print <>;          # let perl autoprint
++
++  return $ret;
++}
+-- 
+1.6.4.4
+
diff --git a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
new file mode 100644
index 000000000000..3742d30825b7
--- /dev/null
+++ b/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/show_bug.cgi?id=289943
+
+From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Wed, 28 Oct 2009 21:04:39 -0500
+Subject: [PATCH 2/2] Add ipv6 monitor support to mirmon
+
+This patch will overload the gethost() function provided by perl in such a way
+that it uses gethostbyname2() from Socket6, which is a new dependency.
+
+Original patch by: Kent Fredric
+---
+ mirmon |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/mirmon b/mirmon
+index 6c0aaa8..50d40ca 100755
+--- a/mirmon
++++ b/mirmon
+@@ -30,7 +30,17 @@ my $VER = '# $Id$
+ use strict ;
+ use IO::Pipe ;
+ use IO::Select ;
+-use Net::hostent ;
++
++use Socket;
++use Socket6;
++use Data::Dumper qw( Dumper );
++
++sub gethost($){
++  my $url = shift;
++  return 1 if gethostbyname2 $url, AF_INET;
++  return 1 if gethostbyname2 $url, AF_INET6;
++  return 0;
++}
+ 
+ my $DEF_CNF = "/etc/$PRG.conf" ;
+ 
+-- 
+1.6.4.4
+
diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml
new file mode 100644
index 000000000000..d9b32066e754
--- /dev/null
+++ b/www-apps/mirmon/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
+</pkgmetadata>
diff --git a/www-apps/mirmon/mirmon-1.38-r4.ebuild b/www-apps/mirmon/mirmon-1.38-r4.ebuild
new file mode 100644
index 000000000000..ede9c4ac7ee2
--- /dev/null
+++ b/www-apps/mirmon/mirmon-1.38-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp eutils
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="Simple webapp to monitor the status of mirrors"
+HOMEPAGE="http://people.cs.uu.nl/henkp/mirmon/"
+SRC_URI="http://people.cs.uu.nl/henkp/mirmon/src/$PN/src/$P.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.5-r2"
+RDEPEND="${DEPEND}
+	dev-perl/File-Tempdir
+	dev-perl/Socket6"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0001-Add-rsync-monitoring-support-to-mirmon.patch" \
+		"${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
+	# set the proper interpreter
+	sed -i -e 's:/sw/bin/perl:/usr/bin/perl:' mirmon || die
+}
+
+src_install() {
+	# Don't install empty dirs
+	MY_CGIBINDIR=""
+	MY_ICONSDIR=""
+	MY_ERRORSDIR=""
+
+	webapp_src_preinst
+
+	for file in mirmon.html mirmon.txt; do
+		dodoc ${file}
+		rm -f ${file}
+	done
+	cp -R icons "${D}"/${MY_HTDOCSDIR}
+	rm -rf icons
+	cp -R . "${D}"/${MY_HOSTROOTDIR}
+
+	webapp_src_install
+}
diff --git a/www-apps/mirmon/mirmon-2.10.ebuild b/www-apps/mirmon/mirmon-2.10.ebuild
new file mode 100644
index 000000000000..63863466bdfc
--- /dev/null
+++ b/www-apps/mirmon/mirmon-2.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="Simple webapp to monitor the status of mirrors"
+HOMEPAGE="https://www.staff.science.uu.nl/~penni101/mirmon/"
+SRC_URI="https://www.staff.science.uu.nl/~penni101/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.5-r2:0"
+RDEPEND="${DEPEND}
+	dev-perl/File-Tempdir
+	dev-perl/Socket6"
+
+src_prepare() {
+	epatch "${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
+}
+
+src_install() {
+	# Don't install empty dirs
+	MY_CGIBINDIR=""
+	MY_ICONSDIR=""
+	MY_ERRORSDIR=""
+
+	webapp_src_preinst
+
+	for file in mirmon.html mirmon.txt; do
+		dodoc ${file}
+		rm -f ${file}
+	done
+	cp -R icons "${D}"/${MY_HTDOCSDIR}
+	rm -rf icons
+	cp -R . "${D}"/${MY_HOSTROOTDIR}
+
+	webapp_src_install
+}
diff --git a/www-apps/mod_survey/Manifest b/www-apps/mod_survey/Manifest
new file mode 100644
index 000000000000..e35cb0a69b6a
--- /dev/null
+++ b/www-apps/mod_survey/Manifest
@@ -0,0 +1,7 @@
+AUX 98_mod_survey.conf 4327 SHA256 b55acb2bec39e3875d68e2e30b02720a72889fef26e20d7a17ad89a5780a64f2 SHA512 37c6b7eb96eafa32ea3eb67d1c74f9139d81f2a9b8bc08ccbd40b7f1c94479e9a6f7ac1bff593238567be352fe1b39f8da8bdac40ea45e56bd6ca931c478b689 WHIRLPOOL 18279f90d1aa1313ee939dea574811d8085dc204392e9277691c45af3d240796136ff28e5ded142eb5f98824ba50e552e24ae072bd817024959d8cbf1463eed3
+DIST modsurvey-3.2.5.tgz 508271 SHA256 5ad6f0de509e09a6842e3a56372f40122800397befed10dd78b37c4c0676e47b SHA512 627b976e3f5bae180456daae2f4544d74abf1d0dafc3b3b43332ef055f4e3a9b66e4f5dfe7b997008237206963c203d518372106cb27073d29966e19271b0149 WHIRLPOOL 9180fd9e37a70ecbb5256b6e4fb699ca83fd3bd3d19991ec35ae625aa70a62ca2d14f83395e72f1673a6b67d9b9451052a0056012cf872d2f205212e5480e872
+DIST modsurvey-docs-3.2.5.tgz 678356 SHA256 53c0e0d4335ded221c30fa52c4202793b86aef370d7b92341fb4fcaac12c1fd6 SHA512 3511720922668a2d55f675366c9b7e3e9a67fea8abafa39018475ec5734b496e8d6c8ba313e5d2182028ae324aaff84702c09380a1ffb1cbcc14b5cbfbfb4403 WHIRLPOOL 73d917698b514823fe1f4e6010a6296d3dafd5c771357459cceac36c716aacad84838a58e1b9843b4a4ce898cb5a80304356c5f0b61f0bbcf3f6010a1dccee3b
+EBUILD mod_survey-3.2.5.ebuild 2333 SHA256 988fbc14821c9a767b41fe40db46a57cf43f29dd2966b9a41e6e23d005eff0e6 SHA512 67ba8fa78d297c6f6489731b8cd55c70af63405788f5c19786ccaeca28a3ba55fac5b14a5e09dab77783e7b2406ed5340e9da3ae3d7ecb46a90a6c481e574dfd WHIRLPOOL af7a04c2d13919ae54a0a2d27a485c1d8cf423077ae478128417592e72455748f42593f9196d5d636c05a8e8e7255f3b1ecda5c22d4dc7ca2599d34319c227f5
+MISC ChangeLog 2537 SHA256 a0147b003459d91a0fdf3494d04cbbca2ccefcb252d218382776b5f15e11ef86 SHA512 565cd126446ad4cb9d35e5f93944159242ba3c4c174e49891850f8476a691868a45b746a97403ec091f503e930f4f407aa877565bda09bfee1819b9c0e3e5762 WHIRLPOOL b15cc8749661b3a25cf8a00986a5ac2f5d4d46e254d73f8e0b2fc72e1629e2d76456a94d0f9f5b1a126d20045937d2e53f8c863b7f3fe04fe268cf90ee0432d9
+MISC ChangeLog-2015 4228 SHA256 0308898a3bb80aad2eae8caac673eb3a3fc3a059cf692f62cfd9162c2012f884 SHA512 f353b704e2672817575bd07931fd5852e55a3e59d033166d556966986ef0ba3d603b953538267bdb80a37c904dfdd48416bddece3d92591e01efc255e6cbe679 WHIRLPOOL 8d2047e46efb63e52b5ef540abf36ff0700f6cdc454e93f092beff57d8daf1d7f54d3911604bc2c83345e528784f7e9c999138b1ab9d9eb6a4ce78d2ff35a072
+MISC metadata.xml 250 SHA256 d9fcac0092614f226b371c1819fe3a264758bfd9fedc2874c35a7b3dd6d77291 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 WHIRLPOOL 113cbaecb7ee19172633b0ee77ecfa10f6742848fd0f5f0797b95865f291e063ce3916719af48a81a72adfdaf40a4b18815e2434f0de91e2baa63822951470f0
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/metadata.xml b/www-apps/mod_survey/metadata.xml
new file mode 100644
index 000000000000..2b9b44f73497
--- /dev/null
+++ b/www-apps/mod_survey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
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..130996dca760
--- /dev/null
+++ b/www-apps/mod_survey/mod_survey-3.2.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 )
+	>=dev-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 "${APACHE_MODULES_CONFDIR}/98_${PN}.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
+}
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
new file mode 100644
index 000000000000..d20ca60befb8
--- /dev/null
+++ b/www-apps/moinmoin/Manifest
@@ -0,0 +1,7 @@
+AUX postinstall-en-1.9.4.txt 548 SHA256 ca92d8231b3bf6859e7d9ab4c6a605d12d3ee617eb244b8265f4c5e51857070c SHA512 a007244d5807ca89ad515f738cdcf739d3f4ba0a6c2ee35f05435856c4ccc9c993d44ed08a06b5d8555450b6b34013d3254628480900e515bb19ba80719a05ba WHIRLPOOL d6b0766b23f99bd32c4849be2d4aa2ae984363f1a6cf0a89becdc66d1bb942c9962efce68c22a47e127704628ddc07792481b06be5c5018c0c0d5814898de275
+AUX reconfig-1.9.4 457 SHA256 d23601f95da8a9abc02a439b5b3f257dda31ff8f20f1e42b4492fef461fe6e1e SHA512 c5b493354e44e0a81e540eb80469b6787e2b898dbb2737ea8b6a52c95e92ba79af78bb0fc67b406a23ef2ca5d3df9a88c7e89c688e2d139abd2a3f480b30299c WHIRLPOOL eb8a8e871f64896722e9a3b4d61b282300eb5db106036e484b7cf8e5e2b7e7f13ed6bd99be86ee20b06bc91967a1c7575fb66e2fb594f18c300c7a3f65769af4
+DIST moin-1.9.7.tar.gz 36911772 SHA256 f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5 SHA512 5cb6c205fb0c18b83fe7cee83bf88098bfbbc357c89004f8b7cf484bd7efd35af4ace78d0e80df71b01f70861e8bbb63aeefdd831768989d5b7f511ca24fb60c WHIRLPOOL 8f7919e1672a9a192249221864b1ac8cda47eb75e6f328485ef54ae45d344beeaac8070b281f7612f59795e359ad93bdf060e4930411ee7509ec77aa5396c30a
+EBUILD moinmoin-1.9.7-r1.ebuild 2610 SHA256 86fe2ff5627ac870cc3476776853198f005d0288528f37049f91c253e9329e2f SHA512 db65218b12b4a645b3bbceeb78d630c7c096c0dbba317f1b2c38fc76d0c8006ff28cae42b6b36fe26fcdd96d1643c7c4b9acc35802d8377913c096bc981d23ef WHIRLPOOL 4b4f12565a66429238254dff9286279a9476e58eb12dc96f7bb67d2e7c68934337cb9c7698bb804211b5d0f7a0856d65f6cbd869726ade575d27f8a6409a0638
+MISC ChangeLog 2631 SHA256 2f362083d04a4a1bc62d0a1a40dc99e129fd08e58d00aa0bc57c829a9a876fcf SHA512 0c10597e2ebaa4ab5c625d9d8213bea0ed6d70252a4b9c9dbf228a8b2b702dedd5e1e6fcfc09ca896952c8239bee6a57efefc9b970d7b1e98b15f41771b1a8bc WHIRLPOOL d2028d530ade45e52c3ce9aadab3adb8bc586fc5620de08f369fe91e631985651e7a428a3bf3109c683127e02d61bed1c2b81d1a3e3676696f42b8fb225fc6ce
+MISC ChangeLog-2015 14593 SHA256 e4a8402fe6f95bed4c17262b469c7354311982710d9ad5af4b7050f7d1b444a6 SHA512 161fcf63afd9d773923644a681bd7a23ff3519ca7718c7bf2b47ffd9c85de728abdb0cf0b94d6c985e3e8f97fbcd83a8f5713efc46b91c0908b49895587cfdd6 WHIRLPOOL ac9d76b4de0e2285e4b99f28121d6e5fccfc73bbcd3e4cb2d7462995f15d01be49fed5294afbd5cc8c5e162e22a917fca195829f0508f0226328d4387948b0e4
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/moinmoin/files/postinstall-en-1.9.4.txt b/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
new file mode 100644
index 000000000000..6a6baf764ead
--- /dev/null
+++ b/www-apps/moinmoin/files/postinstall-en-1.9.4.txt
@@ -0,0 +1,16 @@
+Now please read the installation manual at
+/usr/share/doc/${PF}/html
+
+MoinMoin can work with a variety of webservers. Simple Apache instructions
+are given below:
+
+1. ExecCGI needs to be enabled in your Moinmoin directory by doing:
+# echo "Options ExecCGI" > ${MY_INSTALLDIR}/.htaccess
+# echo "AddHandler cgi-script .cgi" >> ${MY_INSTALLDIR}/.htaccess
+
+2. Add the following lines to your Apache configs:
+ScriptAlias /mywiki "${MY_INSTALLDIR}/moin.cgi"
+
+3. Restart Apache
+
+4. Go to http://${VHOST_HOSTNAME}/mywiki/ and follow the instructions there.
diff --git a/www-apps/moinmoin/files/reconfig-1.9.4 b/www-apps/moinmoin/files/reconfig-1.9.4
new file mode 100644
index 000000000000..698da419fdb5
--- /dev/null
+++ b/www-apps/moinmoin/files/reconfig-1.9.4
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|^#\(.*\)/path/to/wikiconfigdir|\1${VHOST_ROOT}/${PN}-${PVR}|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
+	sed -e "s|#url_prefix_static|url_prefix_static|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+	sed -e "s|//|/|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/moinmoin/metadata.xml b/www-apps/moinmoin/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/moinmoin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
new file mode 100644
index 000000000000..27ad731eec99
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.9.7-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit eutils distutils-r1 webapp
+
+MY_PN="moin"
+
+DESCRIPTION="Python WikiClone"
+HOMEPAGE="http://moinmo.in/"
+SRC_URI="http://static.moinmo.in/files/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+
+RDEPEND=">=dev-python/docutils-0.4[${PYTHON_USEDEP}]
+	>=dev-python/flup-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7.0[${PYTHON_USEDEP}]"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	if has_version "<www-apps/moinmoin-1.9" ; then
+		ewarn
+		ewarn "You already have a version of moinmoin prior to 1.9 installed."
+		ewarn "moinmoin-1.9 has a very different configuration than 1.8 (among"
+		ewarn "other changes, static content is no longer installed under the"
+		ewarn "htdocs directory)."
+		ewarn
+		ewarn "Please read http://moinmo.in/MoinMoinRelease1.9 and"
+		ewarn "README.migration in /usr/share/doc/${PF}"
+		ewarn
+	fi
+
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove bundled -- parsedatetime and xappy not packaged yet
+	rm -r MoinMoin/support/{pygments,werkzeug,flup} || die
+	sed -i "/\(flup\|pygments\|werkzeug\)/d" setup.py || die
+
+	# needed for python_fix_shebang
+	edos2unix MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/py/*.py
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	dodoc README docs/CHANGES* docs/README.migration
+	dohtml docs/INSTALL.html
+	rm -rf README docs/
+
+	cd "${D}"/usr/share/moin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r server/moin.cgi
+	fperms +x "${MY_HTDOCSDIR}/moin.cgi"
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}
+	doins -r data underlay config/wikiconfig.py
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altconfigs
+	doins -r config
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altserver
+	doins -r server
+
+	# data needs to be server owned per moin devs
+	cd "${D}/${MY_HOSTROOTDIR}"/${PF}
+	for file in $(find data underlay); do
+		webapp_serverowned "${MY_HOSTROOTDIR}/${PF}/${file}"
+	done
+
+	webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/wikiconfig.py
+	webapp_hook_script "${FILESDIR}"/reconfig-1.9.4
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-1.9.4.txt
+
+	webapp_src_install
+
+	# bug 466390
+	python_fix_shebang "${D}"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from an older version, please read"
+	ewarn "README.migration in /usr/share/doc/${PF}"
+	ewarn
+	webapp_pkg_postinst
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
new file mode 100644
index 000000000000..70df4d868470
--- /dev/null
+++ b/www-apps/moodle/Manifest
@@ -0,0 +1,13 @@
+AUX config-r1.php 1780 SHA256 b97d05c5701dda71fd8edd62b38c9f0d2c9d8b35fb8700d3b021968fc4c448db SHA512 9929df2b4b0db7ab759f35d919ffd65b06a7063ad0908368aa5bd027f52f1992f0b46ec121d90076f664eb00b8e9386d8ae286acfe95b475ce1e9b2e1c5e1700 WHIRLPOOL d4cfd1d82b5d7cf8413f311495dbb8aca9453ea5d26e9ac92e2ed303cb2f2e9b9ceec3f4658dc1b58e09c1af71d0778d90c51904244a98378016fa0c02284a0a
+AUX config.php 718 SHA256 c62a37c0d81043ee4ca7fc4d7610d19dc2df426d556eb3285d7b1fe367a44a8d SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479 WHIRLPOOL 51daeca50711e6cda7ef3703be71fd59bd7abeb2bfa4b0c7b42924dea5d0cbb9d4fac478aeb13bc655d097bbed3ddb99e35e43c6b2f800cabcf916142996bbb8
+AUX postinstall-en.txt 6524 SHA256 dad8831abc23179ebcd2c2431f11d83346c142175c59da47cf5f913c928de667 SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf WHIRLPOOL 6ed4f9db76238db6e0a2afd98b8877a1de4e06311d77a6153bb9d8bbc559fd226190c7bf4a8053e35000fcb24babf154021a42d1b58ba92c3ee86bb5dfae1894
+AUX postinstall-nodb-en.txt 171 SHA256 f39ff660a1cafbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e WHIRLPOOL 3f91b917e8c92866d570c0af2dabbb11eb6bdf7d4cf3e9e8984649b5c147736f267156c490ab51fcd7fda9e7b3ac2ead8259231b20e74e349fb143ed44b08616
+DIST moodle-3.1.8.tgz 38015937 SHA256 5209cdda1eaf3f88eb7e9eb852217ad5918607077251dab7fe29f088c76db35d SHA512 e35912f10fa98bdb0e392f2020fa48c21d077608a6877f4a35c019c34963cc14522664f6bf88a7e98f01e42d0c171c9dbd2f4403d330baab321645fdb1d60fe2 WHIRLPOOL f31973f6845203bad40d6cad6ab560263fa972a38d697d4bd8fae85d10ab63474472055365d90f1566c97cf299efcfeb07d7913af8b5e9660e2e8689c8689d41
+DIST moodle-3.2.5.tgz 39902419 SHA256 53a381988fc0aa0169c4e2af2364406614bc3cf0948631a1f3008df3ccbfa3c4 SHA512 f1773d0c118c4e0952ce2606d6982af2641d13d4a4d6630d8a4cb4d5ccaee6c8ecd8fb9d596e7b0947c3ca893efdd5ea4baf35b52832f71c021703b9cbfe2f4c WHIRLPOOL 7c9d48d6c0a28a47e6dd6f848cf07cf36efcc0b7ca2c5bd5e566213ac7928567afbec4e222ac01e56eb496acb6cd665c235ff84ce551d569f4f5a2114848bfb8
+DIST moodle-3.3.2.tgz 44171663 SHA256 1a34c8e85d05bb693a1f4f5e70b63f527cac655101236ab1e474aa295843fbf1 SHA512 58b97f3e8f9f5c8956acce77be1e75dcc49ca27bb7032bdc70e386d6dc39dfc843b450ade27061a547f766073ec21564767af50140ac18915ab6cf92a0250973 WHIRLPOOL b69714dae5305f140a6beb441414b79ee5040e58fd8e60e2c958314b5758dd352fdbfaf3e3df38dc2e3185494474eaabee83ad7e51e4fb19eda35996b696e9e5
+EBUILD moodle-3.1.8.ebuild 2938 SHA256 8d3c9fb81b567167c73879b281dd7aae053c20d18c349c040373e7cd7f5485bb SHA512 23ecf21df367beff9762d4c5c68b405b80093c39803aeced955a0e8b57e721b1dd130bc61a79e60c684aba03ab0e93c119e1556e91aaeac68a12c48dfe82d1ab WHIRLPOOL 4c58da7fcf33ec298c719865ed1f9c3f6f2c6004440f82a1f1a6347a091954d4b1b2fce2a03228202c913940971c1ed80caf77a684a1aded75e1d0046594d02f
+EBUILD moodle-3.2.5.ebuild 2938 SHA256 b56a953c19cba3208774fe3d0fac7ad972022ada1da09bdf7673838ae67090b9 SHA512 3fafaef718e9069a1487643e2ba3f2274755d1463b11b13bcf35fdaebcce0eddad6267d1c097af983dec514845fcb4d924ba35fda6a824745b9c86aa83d0a3d4 WHIRLPOOL 849b3ccab219c56c6dbbcba719a6517aa7507bd33d9b997367efc6fee418f5d2d22dd4d7cac857bc720b18801e53a029c8a41ef80acc5dd5ed62a8a0dca92f1c
+EBUILD moodle-3.3.2.ebuild 2952 SHA256 de68154143d4a6f1cbfab0a47424ced8bbf438bb2b03ff82d7661631086d0747 SHA512 21597a42153160cef4a7e5c1ae7cc59ad319a5b61afaf5f2bd372d8ef4848f0d1d57e3f729246f3f03266278c437b757255697dcbc1dad90be35203f0874aa2d WHIRLPOOL 767ddbe80771941052bb4fce8858b17e446b6d2c3e43ab053a6ae81c9220335b7831af574383498c861ed9ef57f22631eb0eadf086b4db557aad90138179becd
+MISC ChangeLog 7896 SHA256 6183f3a0804cc92846de2339dd60ff161ca606fa7be90da9313d3fb4c4fddc42 SHA512 222887f0493de055e1c8e49dc03bc69f30b555dfce2045a9f63f1269c11dafbe76482132e69716cf1caef2a9837159b462934dd29c29e5c169782c6a1e97319a WHIRLPOOL 9a85ab66a99824f3f7c03f71ad70bb2deff922f50abf3d4a83d135cd18e556db25f06ade0792e1512ee666632f85bf0c2fd90369d51083c71ab2bc0f1536b330
+MISC ChangeLog-2015 15602 SHA256 45d1f3f87b701e5d375ada783942fc71d9177e4a556529c26023a46ca854f3d4 SHA512 e8015060bac7193532bf3e07838d98343aa4cbc16ac17aaa4ee8ea14ea523e1a13a314de9fbbd8387c6b5efe3e30f61801d88a67fe2c0f32b816bd60bed523d4 WHIRLPOOL be463e538a949e84f839e6914a6a85910cb67238bc05c6f6e591c2bebc1dd967f610c1edec541938a53138d2218588072eae1c4b6829f9e2bae3ccadc38bd88c
+MISC metadata.xml 355 SHA256 c08ccdedfceddf97da2e834f710935dd59f46048c9d7fb825dea53fcbe8c7a8d SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278 WHIRLPOOL a641aebe6ebee8f61064622cc7caf8e2d75c2df10426b6c3a49d3a379f7e8ec5fc99a57bd6856ecbb9966e49101b3d55725ae6328871621d6fd4f4dc4ced7135
diff --git a/www-apps/moodle/files/config-r1.php b/www-apps/moodle/files/config-r1.php
new file mode 100644
index 000000000000..7eef454b7dfc
--- /dev/null
+++ b/www-apps/moodle/files/config-r1.php
@@ -0,0 +1,36 @@
+<?php
+unset($CFG);  // Ignore this line
+global $CFG;  // This is necessary here for PHPUnit execution
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';       // 'pgsql', 'mariadb', 'mysqli', 'mssql', 'sqlsrv' or 'oci'
+$CFG->dblibrary = 'native';     // 'native' only at the moment
+$CFG->dbhost    = 'localhost';  // eg 'localhost' or 'db.isp.com' or IP
+$CFG->dbname    = 'moodle';     // database name, eg moodle
+$CFG->dbuser    = 'username';   // your database username
+$CFG->dbpass    = 'password';   // your database password
+$CFG->prefix    = 'mdl_';       // prefix to use for all table names
+$CFG->dboptions = array(
+    'dbpersist' => false,       // should persistent database connections be
+                                //  used? set to 'false' for the most stable
+                                //  setting, 'true' can improve performance
+                                //  sometimes
+    'dbsocket'  => false,       // should connection via UNIX socket be used?
+                                //  if you set it to 'true' or custom path
+                                //  here set dbhost to 'localhost',
+                                //  (please note mysql is always using socket
+                                //  if dbhost is 'localhost' - if you need
+                                //  local port connection use '127.0.0.1')
+    'dbport'    => '',          // the TCP port number to use when connecting
+                                //  to the server. keep empty string for the
+                                //  default port
+);
+
+$CFG->wwwroot   = 'http://example.com/moodle';
+$CFG->dataroot  = '/home/example/moodledata';
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+require_once(dirname(__FILE__) . '/lib/setup.php'); // Do not edit
+?>
diff --git a/www-apps/moodle/files/config.php b/www-apps/moodle/files/config.php
new file mode 100644
index 000000000000..c959b4aa457e
--- /dev/null
+++ b/www-apps/moodle/files/config.php
@@ -0,0 +1,29 @@
+<?PHP
+unset($CFG);
+$CFG = new stdClass();
+
+$CFG->dbtype    = 'mydb';
+$CFG->dbhost    = 'localhost';
+$CFG->dbname    = 'moodle_db';
+$CFG->dbuser    = 'moodle_user';
+$CFG->dbpass    = 'moodle_pass';
+$CFG->prefix    = 'mdl_';
+
+$CFG->dbpersist = false;
+
+$CFG->wwwroot   = 'http://localhost/moodle';
+$CFG->dirroot   = '/var/www/localhost/htdocs/moodle';
+$CFG->dataroot  = '/var/www/localhost/moodle' ;
+
+$CFG->directorypermissions = 02777;
+
+$CFG->admin = 'admin';
+
+if (file_exists("$CFG->dirroot/lib/setup.php"))  {
+    include_once("$CFG->dirroot/lib/setup.php");
+} else {
+    echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+    echo "<p>Please supply this file or reinstall moodle</p>";
+    die;
+}
+?>
diff --git a/www-apps/moodle/files/postinstall-en.txt b/www-apps/moodle/files/postinstall-en.txt
new file mode 100644
index 000000000000..6a5b44bac93d
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-en.txt
@@ -0,0 +1,220 @@
+NEW INSTALLS
+
+0  Check to see if webapp-config automatically installed
+   moodle for you in /var/www/localhost/htdocs. You should
+   see a directory in there called moodle.  If it didn't
+   install it manually:
+
+	webapp-config -d moodle -I moodle X.Y.Z
+
+   Replace X.Y.Z with whatever version you just emerged.
+
+1  Edit the config.php file found at
+
+	/var/www/localhost/htdocs/moodle/config.php
+
+   You should probably change the database password,
+   $CFG->dbpass = 'moodle_pass' to something more
+   obscure.  Also, if your system has a FQDN, change
+   the $CFG->wwwroot = 'http://localhost/moodle'
+   to match the URL of your moodle installation.
+   
+   
+   IF YOU ARE USING MYSQL,      do step 2a
+   IF YOU ARE USING POSTGRESQL, do step 2b
+
+
+2a Create a new mysql database and account with the
+   appropriate privileges.  Make sure the username,
+   password and database match their values in
+   config.php from step 1.
+   
+   Connect to your mysql server using
+   
+	mysql -p -u root
+
+   and at the mysql> prompt issue the following commands
+
+	CREATE DATABASE moodle_db;
+	GRANT ALL ON moodle_db.*
+		TO moodle_user@localhost
+		IDENTIFIED BY 'moodle_pass';
+	flush privileges;
+
+2b Issue the following commands at a shell, making sure
+   the username, password and database match their values
+   in config.php from step 1.
+
+   su - postgres
+   psql -c "create user moodle_user createdb;" template1
+   psql -c "alter user moodle_user with encrypted password 'moodle_pass';" template1
+   psql -c "create database moodle_db with encoding 'unicode';" -U moodle_user template1
+   psql -c "alter user moodle_user nocreatedb;" template1
+   su - root
+   /etc/init.d/postgresql-X.Y reload
+
+   Replace X.Y with your version postgresql.
+
+   NOTE: Moodle docs say that moodle only works with
+   postgresql-7, but I've used it with 8 no problems.
+
+3  Direct your browser to the URL in step 1.  You should see
+   the license agreement.  Click "Yes" to continue.
+
+4  You are now about to install.  Click the checkbox for
+   "Unattended operation" and "Continue" to start.  Follow
+   the wizard as you "Setup administrator account" and configure
+   the "Front Page settings".
+
+5  You now have a working installation.  Before putting it
+   into production, you'll probably want to check that
+   everything is sane.  In the "Site Administration" block,
+   click on
+
+   	Server -> Environment
+
+   Make sure that you've got the green okay on all the
+   Server Checks.  If you don't, click on the ? icons for
+   popup help.
+
+6  Add a cron-job to root's crontab.
+
+   	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   then add the line
+
+	*/30 * * * *  root  php -q /var/www/localhost/htdocs/moodle/admin/cron.php  > /dev/null
+
+7  For more information on installing moodle, see
+
+   	http://docs.moodle.org/en/Installing_Moodle
+
+   For information on working with moodle, see
+
+	http://moodle.org/support/
+
+=================================================================
+
+UPGRADES
+
+0  Before any upgade you should backup your database in case you have
+   to roll back.  The moodle dirroot directory ($CFG->dirroot in the
+   config.php file) isn't as critical since you can always reinstall
+   that with web-apps.  The moodle data root ($CFG->dataroot in config.php),
+   where files are uploaded, will not be touched.  But the upgrade will
+   probably change your db schema, and the new format may not be backward
+   compatible.  For mysql use
+
+	mysqldump -u moodle_user -p -C -Q -e --create-options moodle_db > moodle-backup.sql
+
+   or for postgresql use
+
+	su - postgres
+	pg_dump moodle_db > moodle-backup.sql
+
+   If you have to fall back, you can do so using
+
+	mysql -p -u moodle_user moodle_db < moodle-backup.sql
+
+   or
+
+	su - postgres
+	psql moodle_db < moodle-backup.sql
+
+   TEST THIS!  PRACTICE THIS!  Make sure it will work for you if you
+   have to fall back.
+
+1  Emerge the new moodle ebuild.  Be prepared to add USE flags for
+   php and re-emerge it since upgrades may require new functionality
+   from php.  Remember to restart apache after re-emerging php!
+
+2  If the ebuild didn't do it for you, update using
+
+	webapp-config -d moodle -U moodle X.Y.Z
+
+3  Aim your browser to the URL in the config.php file defined
+   by $CFG->wwwroot.  You will get a message that you are about
+   to automatically upgrade your server and cannot go back.
+   This is why you backed up your db in step 1.  You can go back
+   if you use webapp-config to install the older version AND
+   drop the new db and restart the old one.  You did practice
+   restoring, right?
+
+4  Click "Continue" and follow through with the upgrade.
+
+
+=================================================================
+
+UNINSTALL
+
+1  Make sure you really want to do this.  I mean REALLY!
+   After step 3 you will be past the point of no return.
+
+2  If you just want to uninstall the webapp, do the following
+   and no more!
+
+	emerge --unmerge moodle
+
+   Your data is still in the db and in the moodledata dir.
+
+
+   !!!!!!!!! POINT OF NO RETURN !!!!!!!!!
+
+3  Uninstall the uploaded files
+
+	rm -rf /var/lib/moodledata
+
+
+   IF YOU ARE USING MYSQL,      do step 4a
+   IF YOU ARE USING POSTGRESQL, do step 4b
+
+
+4a Connect to your mysql server using 'mysql -p -u root' and
+   at the mysql> prompt issue the following commands:
+
+	DROP DATABASE moodle_db;
+	DROP USER moodle_user@localhost ;
+
+4b Issue the following commands
+
+	su - postgres
+	psql -c "drop database moodle_db;" template1
+	psql -c "drop user moodle_user;" template1
+
+5  Remove the root cron-job
+
+	su - root
+	crontab -e  # fcrontab -e if you use fcron
+
+   and delete the line added above.
+
+=================================================================
+
+ADDITIONAL PHP REQUIREMENTS
+
+   Moodle allows for many method of authentication.  To see
+   what these are, in the "Site Administration" block, click
+   on
+
+	Users -> Authentication -> Manage Authentication
+
+   Moodle will try to authenticate by each method in order
+   until it either succeeds or exhausts the list and fails.
+
+   In order to use some of these methods, you need to make
+   sure PHP was compiled with the correct support.  You will
+   know that you do not have the correct support compiled in
+   if authentication by all previous methods fails, and you
+   encounter a method for which PHP does not have support.
+   An error will be thrown and reported in the web page.
+   
+   Currently, the ebuild has support for the following
+
+   	Auth Method		USE flag
+
+	IMAP(S) or POP3(S)	imap
+   	LDAP or CAS		ldap
+	External database	odbc
+	RADIUS			radius
+
diff --git a/www-apps/moodle/files/postinstall-nodb-en.txt b/www-apps/moodle/files/postinstall-nodb-en.txt
new file mode 100644
index 000000000000..91269941d185
--- /dev/null
+++ b/www-apps/moodle/files/postinstall-nodb-en.txt
@@ -0,0 +1,6 @@
+You have not specified which database you are going to use.
+You are on your own!  Go to
+
+		http://docs.moodle.org/en/Installing_Moodle
+
+and follow the instructions there.
diff --git a/www-apps/moodle/metadata.xml b/www-apps/moodle/metadata.xml
new file mode 100644
index 000000000000..b42479a73f31
--- /dev/null
+++ b/www-apps/moodle/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/moodle/moodle-3.1.8.ebuild b/www-apps/moodle/moodle-3.1.8.ebuild
new file mode 100644
index 000000000000..c64ab1ffbc71
--- /dev/null
+++ b/www-apps/moodle/moodle-3.1.8.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,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="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	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
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	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
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.2.5.ebuild b/www-apps/moodle/moodle-3.2.5.ebuild
new file mode 100644
index 000000000000..37b176d93c22
--- /dev/null
+++ b/www-apps/moodle/moodle-3.2.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,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="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	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
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	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
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.3.2.ebuild b/www-apps/moodle/moodle-3.3.2.ebuild
new file mode 100644
index 000000000000..4c2d978ef8a6
--- /dev/null
+++ b/www-apps/moodle/moodle-3.3.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,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="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	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
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+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
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/mypictures/Manifest b/www-apps/mypictures/Manifest
new file mode 100644
index 000000000000..bf76b0d3b2ae
--- /dev/null
+++ b/www-apps/mypictures/Manifest
@@ -0,0 +1,8 @@
+AUX mypictures.diff 482 SHA256 cd638d3a528813d411c3dd3e1093cc62caa4cbba753ed45628d8bab1ca6635cb SHA512 5db22a96deda3d0114a21a95c4cad8840b153742ac4a590e03af4af9d8b0fd4a6ec3482af1f06abfe82e4343839ac6e9ea9307af97131b55023b3e04c46fae8e WHIRLPOOL 05e3198d4a514bedaaf3d7c4527b2112eaae982d2f259a6c6fcc3c68cfe48414bbd0c6e270e52d0471b85e98e02f0cf7fb58b25ec197619664a2b1fb702278d6
+AUX postinstall-en.txt 124 SHA256 50c1da491deb29b91822ca4fe17d6921a7422913725946472053aa65fd29fdd0 SHA512 fe159224fd872037e3c1ce8cdb86595a427908332c1f0a4938d0639e28cfdaa86de2c606fd95ff23e823bb8f8b569e57bd04102d2c1c72834d4bb3816bb52fb2 WHIRLPOOL 2937f6f0c820887f45b2432756242ffbf0f9ee6b28086d19529c96071207290243b76f44cb21c7af8e6f728a8faa94c4a8d0f6e15eae00df53b0289132c87e4d
+DIST mypictures.tgz 43783 SHA256 d466258dd49aaf59830d9dd8f840da78c2cdd0ce80259299ca24aef9d27d8cd9 SHA512 aebe637ca4ecbcd41b8aedb1afacaf7e58a2984660b2ee125e96a846c674d36ccab1f27cc8f6b5edc5f1166e982e77a51fc4ead33baffb0f7e08928e1366d1f0 WHIRLPOOL 24a8f297cb934bb8da267298bff89c54cd9b770539d2c4b2f3f765fafa7dcbc6372d7abe3013cb04915bdaf8a35cec044b15e4bb52e1a73a0d845d0ec31e4430
+EBUILD mypictures-20040202-r1.ebuild 904 SHA256 83efafe851fee7cca0f53a46c18a558116f834a1540cd60e767f701dd6e4326f SHA512 38364caaabf6a67669429b8cc3b091f34128fdd1e8e04e70c079d8f338911ebbfe4c29350912853a43465c6321451cbbf8c0d363b0413e4cd03a2ff547561556 WHIRLPOOL e69fe3ac54a09f59dea8d3c816552e142a2c27a001f68e3a9dc167efe48a5fcc51051ff195375bab829921dbc3fb1021ad2464857f47fe978323d19ee53ba3a5
+EBUILD mypictures-20040202.ebuild 966 SHA256 c215c7b33baa12d2574aecb8f2e7abd26aed4cac4bdb082e83c03ec3d48d2edc SHA512 2c313c574bbd8b2b9215152074b88beb6527a1eb3e185f15f2029f5d1450b0eceb431a1b47fa1bad6fbbbd2deba4b90a4c8009559586ef1d556895a82602c993 WHIRLPOOL 6406e41c33c20e87d01b727637c52ac6b79560639b684c9560e6ab49f566fcb9309868eeaaffc82bfd631dcd23479d324368f83f271a2a44783f3f5a6b1e1cf3
+MISC ChangeLog 2565 SHA256 9a0de99fad495de5a0e93e2778d5513583b6e6c224674ef26d058111a6e7695e SHA512 a2e0ab5366b82221ff71d12dfdf37af70d8656194d43f8934c698911330d906ca8210e055c6d7fc8e2aa8445782a7fafba5d7a037ece9b18285e6a24955aaf4c WHIRLPOOL ba1b552d31df1724fbcefddd61d08444dbdfe18853c1e753eed513a442a21753191463b584a7e27da92e38cccc9f66768c27a5ad2ebaaeb071982dc0eb221d5e
+MISC ChangeLog-2015 1481 SHA256 8b0e2031b2c717bdc1260062fae8ddca5962955a8a8494ee404112f50cd54214 SHA512 ad6e21ee68eff6eaf3c010f0983745b636d40bedbd6521fa2d0dca6183123057f255b3f2610b45dd2ad855dd1e181b4ac4a5dd46839fad7b2d1ec954f9d70d96 WHIRLPOOL 5c5be51b71f9d1b3522239175cd67a0dab9afb0c135e29ad438eaca37891087d7b8809b1368493fc6324d7d9c348f5fe27eb98d5a0784f058750518f2fd9f257
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/mypictures/files/mypictures.diff b/www-apps/mypictures/files/mypictures.diff
new file mode 100644
index 000000000000..88c4048ab669
--- /dev/null
+++ b/www-apps/mypictures/files/mypictures.diff
@@ -0,0 +1,14 @@
+diff -u --recursive mypictures.orig/index.php mypictures/index.php
+--- mypictures.orig/index.php	2004-05-03 01:45:58.523174520 +0100
++++ mypictures/index.php	2004-05-03 01:47:16.713287816 +0100
+@@ -471,8 +471,8 @@
+   }
+   
+   $cmd  = $config['convert'];
+-  $cmd .= ' -geometry 120x120 ';
+-  $cmd .= '"'.$img.'" "'.$thumb.'"';
++  $cmd .= ' -size 120x120 ';
++  $cmd .= '"'.$img.'" -resize 120x120 +profile "*" "'.$thumb.'"';
+   system($cmd);
+   
+   header("Content-type: image/png");
diff --git a/www-apps/mypictures/files/postinstall-en.txt b/www-apps/mypictures/files/postinstall-en.txt
new file mode 100644
index 000000000000..378d4b34b2f8
--- /dev/null
+++ b/www-apps/mypictures/files/postinstall-en.txt
@@ -0,0 +1,4 @@
+From the author:
+
+Please note that MyPictures is intended for personal use only and should never
+be run on a public server.
diff --git a/www-apps/mypictures/metadata.xml b/www-apps/mypictures/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/mypictures/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/mypictures/mypictures-20040202-r1.ebuild b/www-apps/mypictures/mypictures-20040202-r1.ebuild
new file mode 100644
index 000000000000..1000dd3a5401
--- /dev/null
+++ b/www-apps/mypictures/mypictures-20040202-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp eutils
+
+DESCRIPTION="Simple photo-gallery for websites"
+HOMEPAGE="http://www.splitbrain.org/Programming/PHP/mypictures/index.php"
+SRC_URI="http://www.splitbrain.org/Programming/PHP/${PN}/${PN}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+RDEPEND="media-gfx/imagemagick"
+
+S=${WORKDIR}/${PN}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# we have to patch the path to imagemagick's convert tool
+
+	epatch "${FILESDIR}"/mypictures.diff
+	sed -i "s|/usr/bin/X11/convert|/usr/bin/convert|g;" index.php
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -R [[:lower:]]* .img "${D}/${MY_HTDOCSDIR}"
+
+	dodoc CHANGES README
+
+	webapp_configfile "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/.img
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/mypictures/mypictures-20040202.ebuild b/www-apps/mypictures/mypictures-20040202.ebuild
new file mode 100644
index 000000000000..87893521a344
--- /dev/null
+++ b/www-apps/mypictures/mypictures-20040202.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp eutils
+
+DESCRIPTION="Simple photo-gallery for websites"
+HOMEPAGE="http://www.splitbrain.org/Programming/PHP/mypictures/index.php"
+SRC_URI="http://www.splitbrain.org/Programming/PHP/mypictures/mypictures.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ppc"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="media-gfx/imagemagick"
+
+S=${WORKDIR}/${PN}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# we have to patch the path to imagemagick's convert tool
+
+	epatch "${FILESDIR}"/mypictures.diff
+	sed -i "s|/usr/bin/X11/convert|/usr/bin/convert|g;" index.php
+}
+
+src_compile() {
+	# do nothing
+	echo > /dev/null
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp index.php exifReader.inc exifWriter.inc "${D}${MY_HTDOCSDIR}"
+	mkdir "${D}${MY_HTDOCSDIR}"/.img
+	cp .img/* "${D}${MY_HTDOCSDIR}"/.img
+
+	dodoc CHANGES README
+
+	webapp_configfile "${MY_HTDOCSDIR}"
+	webapp_src_install
+}
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
new file mode 100644
index 000000000000..ec49dc518047
--- /dev/null
+++ b/www-apps/mythweb/Manifest
@@ -0,0 +1,8 @@
+AUX 0.25-postinstall-en.txt 329 SHA256 cbcf8a938bcf6029dae9b17864aeb0e144324409dc6bcd3bd613154296b9687a SHA512 2fc1df9f9876d2f9247f881a8e27bf38eff22c1caa1307deb241dacb80a4d5f6ff64798f8b4634ba302c412daeb137dabc3a6385febbbb2c0d16f52879c4178c WHIRLPOOL 4b3f15646350e2fb1677e93a98521cc9854d78c916b3c2b98cb34bcd9a54cb6f3ef19008579193793d0259b1eaa53c205b287135e513afe7c051ea8dd1520941
+AUX mythweb.conf.nginx 1085 SHA256 f97cb07647b282be6d8fe3e41bbb07f942fd0d121bbbe5dc63ccf3b34004d296 SHA512 06f9202821abcc4737cbab912e4f2610433e59a430cdfd1582b086b27a85a0d2ac42296bf4f6eac582c507fd768b89f1b21510406a7f007c79dfda596fcd3a60 WHIRLPOOL b99dd45082e02be3e4d3559ff6c0eee078a5cbf4c9870701a0c7aae84806b918b36e6d7a2633ace10f4a8d36172afa0bf63abaf755e0c53da3882fba824544fb
+AUX reconfig 1209 SHA256 b83a30d0ad6f173396dff7bb46bb382a190c3e8a1817655513415f303e1e3176 SHA512 ee4b8e38638c77639208c083643d5844c7af374dcffef7e3a17bb263168f33d7463cebbb0e7457347d91f36838a42020bfba6b3d2b6672bcef15974c8fefcfaf WHIRLPOOL 5c6ed9b5409c8dfc1613d905ac0793481362a120e71e3bb58e659276835c413b374f45dd1ed965da38f7397be806406e9b62ebbd0a815c7a80c7a930732597bb
+DIST mythweb-0.28.1.tar.gz 1705490 SHA256 bbd82992230d3571eba55a26a91cc3f2dcddfa631d1822ce58e1bf99f2537244 SHA512 0ce9e2c7138d35ef59859a8a8980b01d90d9b616e55653fb28dd5a473199446508e525171687383ce83051b434f5e7618f509a9e75cd84296446ee450733e963 WHIRLPOOL b36f3226a9984d4c7ea383e1344ddb630b06972fd3170cdcbd0521f9bad3b7acf24f94c7e7099812f8fe5eeea17ab115a36a38ea0b07617998011c7f7c545e00
+EBUILD mythweb-0.28.1.ebuild 1632 SHA256 9526524bc5b0d19b3cc73c98fb7538073c79738b0ddb9bb56488c96a3c855aae SHA512 918e4e199e27199ae75c7da181d4279c0115b4b6bf9e87c52c754bce7a76461fe3f86b2c93301ca9f28c5526fd164cd91d2a5abc2bb9004d52cd8bfbfd2d60cd WHIRLPOOL ca5c04d657aa3c02bbb4bbd377843a85e6abeb3db6a85a8363d06a82704cf53477ca59e9fe23529fcc9b15ac4608d8787222ee2bf26bfc193c143578a2dbb62f
+MISC ChangeLog 3372 SHA256 5d7571368e6a9af5f5e8cf0a5e751951e5fe9d818cf3f8d78fc675d48693c228 SHA512 08e133a5201fa177fef8ab1e983614952e234f416c98777b9faf70ce802ed00bf4cd7932d0e11e1d23363c03ce451afe47f28edaaf1e07c3cc61bf2b0a209982 WHIRLPOOL 6888f3679647657f805e500e452f643622f4160bcd6f0592929ecdda3611df20aae20228d51376dd8d76c09fafacfc16cc7fa4ddc232b33125178e3dd2f917ad
+MISC ChangeLog-2015 18961 SHA256 4b9dce56a6227accb608342ad466e61d8dd09d669c73ef480de595bc29c52e42 SHA512 4ee2674a28fe526a8aa2751c7339d3276e1ab438c7d2e908a9e2e5d921977e61b7bbf75fdea558153902aa1a78aed6073c9bc0667cf2c9bd81081bb1c5365e7c WHIRLPOOL 27b173bda75e770a6d5cef25a5bba92553071d3864a7b64fcb448b0d6c1bd2bae21b178d6afce4563cbac22b2476e4030b1725a60bf39c6db588d16842459877
+MISC metadata.xml 329 SHA256 96929f22fa1641b7dfd9ba613d8c767e01449a0eb21a1ac8c0bfbc06af55cff4 SHA512 693739a0cd007f1297565389e6bb4415c4a930781675323ef8c1e6b13434751b8cccc3d6dc4030c532674e1cfc2902c6fcf0945bb22c1c2dde358958984226b0 WHIRLPOOL 9d40498c8382dc9e7c07b2ed34047aa4b6f94f9eed95b7936e5b560def2571189c8cad0339f7dee6227ea15a1962289bb898dd3ac5301cfae9349d6bc8ea08ce
diff --git a/www-apps/mythweb/files/0.25-postinstall-en.txt b/www-apps/mythweb/files/0.25-postinstall-en.txt
new file mode 100644
index 000000000000..0848d60cfa0f
--- /dev/null
+++ b/www-apps/mythweb/files/0.25-postinstall-en.txt
@@ -0,0 +1,9 @@
+You probably want to modify
+${VHOST_CONFDIR}/mythweb.include
+to fit your needs and load it into your web server
+configuration.
+
+In order to prevent unauthorized access to your MythTV
+installation, MythWeb can be configured to require
+authentication using htdigest or htpasswd. See
+${VHOST_CONFDIR}/mythweb.include for more info.
diff --git a/www-apps/mythweb/files/mythweb.conf.nginx b/www-apps/mythweb/files/mythweb.conf.nginx
new file mode 100644
index 000000000000..2737de91c931
--- /dev/null
+++ b/www-apps/mythweb/files/mythweb.conf.nginx
@@ -0,0 +1,30 @@
+location /mythweb/ {
+    root VHOST_HTDOCS;
+    auth_basic  "MythWeb";
+    auth_basic_user_file /var/www/htpasswd;
+    index       VHOST_APPDIR/mythweb.php;
+    try_files   $uri     @handler;
+}
+
+location ~ /mythweb/.+\.php {
+    root VHOST_HTDOCS;
+    include         fastcgi_params;
+    fastcgi_index   mythweb.php;
+    fastcgi_split_path_info ^(.+\.php)(/?.+)$;
+    fastcgi_param   SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param   PATH_INFO $fastcgi_path_info;
+    fastcgi_param   db_server   localhost;
+    fastcgi_param   db_name     mythconverg;
+    fastcgi_param   db_login    mythtv;
+    fastcgi_param   db_password mythtv;
+    fastcgi_param   hostname    mythtv.cardoe.com;
+    fastcgi_pass    127.0.0.1:9000;
+}
+
+location @handler {
+    root VHOST_HTDOCS;
+    rewrite VHOST_APPDIR/(.+\.(php|pl))/.*  VHOST_APPDIR/$1 last;
+    rewrite VHOST_APPDIR/(pl(/.*)?)$        VHOST_APPDIR/mythweb.pl/$1 last;
+    rewrite VHOST_APPDIR/(.+)$              VHOST_APPDIR/mythweb.php/$1 last;
+    rewrite VHOST_APPDIR/(.*)$              VHOST_APPDIR/mythweb.php last;
+}
diff --git a/www-apps/mythweb/files/reconfig b/www-apps/mythweb/files/reconfig
new file mode 100644
index 000000000000..01ab9aacff7a
--- /dev/null
+++ b/www-apps/mythweb/files/reconfig
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+die() {
+    echo "###"
+    echo $1
+    echo "###"
+    exit 1
+}
+
+if [[ $1 = "install" ]]; then
+
+    if [[ "${VHOST_SERVER}" = "apache" ]]; then
+        sed -e "s|/var/www/html/data|${MY_INSTALLDIR}/data|g" \
+            -e "s|/var/www/html|${MY_INSTALLDIR}|g" \
+            ${MY_SERVERCONFIGDIR}/${VHOST_SERVER}-mythweb.conf > \
+            ${VHOST_CONFDIR}/mythweb.include || \
+            die "apache sed failed"
+    elif [[ "${VHOST_SERVER}" = "lighttpd" ]]; then
+        sed -e "s|/var/www/localhost/htdocs/mythweb|${MY_INSTALLDIR}|g" \
+            ${MY_SERVERCONFIGDIR}/${VHOST_SERVER}-mythweb.conf > \
+            ${VHOST_CONFDIR}/mythweb.include || \
+            die "lighttpd sed failed"
+    elif [[ "${VHOST_SERVER}" = "nginx" ]]; then
+        sed -e "s|VHOST_HTDOCS|${VHOST_HTDOCSDIR}|g" \
+            -e "s|VHOST_APPDIR|${VHOST_APPDIR}|g" \
+            ${MY_SERVERCONFIGDIR}/${VHOST_SERVER}-mythweb.include > \
+            ${VHOST_CONFDIR}/mythweb.include || \
+            die "nginx sed failed"
+    fi
+
+    # Ownership fixes
+    chown ${VHOST_SERVER_UID}:${VHOST_SERVER_GID} "${MY_INSTALLDIR}"/data || \
+        die "chown failed"
+
+elif [[ $1 = "clean" ]]; then
+    echo $1
+fi
+
+exit 0
diff --git a/www-apps/mythweb/metadata.xml b/www-apps/mythweb/metadata.xml
new file mode 100644
index 000000000000..29fc6a5b900c
--- /dev/null
+++ b/www-apps/mythweb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MythTV/mythweb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/mythweb/mythweb-0.28.1.ebuild b/www-apps/mythweb/mythweb-0.28.1.ebuild
new file mode 100644
index 000000000000..5243d2658ba7
--- /dev/null
+++ b/www-apps/mythweb/mythweb-0.28.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+# Release version
+MY_PV="${PV%_p*}"
+MY_P="mythweb-${MY_PV}"
+
+DESCRIPTION="PHP scripts intended to manage MythTV from a web browser"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythweb/archive/v${MY_PV}.tar.gz -> mythweb-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/php:*[json,mysql,session,posix]
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/HTTP-Date
+	dev-perl/Net-UPnP
+	virtual/httpd-php:*
+"
+DEPEND="${RDEPEND}"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# Install docs
+	cd "${S}"
+	dodoc README INSTALL
+
+	# Install htdocs files
+	insinto "${MY_HTDOCSDIR}"
+	doins mythweb.php
+	doins -r classes
+	doins -r configuration
+	doins -r data
+	doins -r includes
+	doins -r js
+	doins -r modules
+	doins -r skins
+	doins -r tests
+	exeinto "${MY_HTDOCSDIR}"
+	doexe mythweb.pl
+
+	# Install our server config files
+	webapp_server_configfile apache mythweb.conf.apache mythweb.conf
+	webapp_server_configfile lighttpd mythweb.conf.lighttpd mythweb.conf
+	webapp_server_configfile nginx "${FILESDIR}"/mythweb.conf.nginx \
+		mythweb.include
+
+	# Data needs to be writable and modifiable by the web server
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+
+	# Message to display after install
+	webapp_postinst_txt en "${FILESDIR}"/0.25-postinstall-en.txt
+
+	# Script to set the correct defaults on install
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
new file mode 100644
index 000000000000..a64b5335b4c5
--- /dev/null
+++ b/www-apps/nanoblogger/Manifest
@@ -0,0 +1,11 @@
+AUX nb.bashcomp 1275 SHA256 001accd891e72c8e46d37f9e86f71de6b3e17d0b653edfae1f151b88fed164f7 SHA512 004db772c4f97870ebdbe378adc26f70ce42f8f28b68bed53fcbe2df4d95ce38e4a2608fee94ae17b1f057c28859a321cceb6cdd4f849845b5902ad048541c8e WHIRLPOOL f6fc16af385c850d8db5debb578e0d5e4d9f137e6bae9115aa533ec9ee0965654939056cd0051187d58658215166d2eec6ef796d73e2c10dad3b3663b6cf5137
+DIST nanoblogger-3.2.3.tar.gz 54672 SHA256 9b1d51060e9f0f8db7119546c8dbb915c0dd214ed970844705d8738616c9029b SHA512 5cd771d1621a6e5fdb60cf34f294e93596584d7535d4a89a98fd8332c85b58e70715a9bf34e46839a1756a8827f37f998f105ba1e494cabefb780e81f6deb8d7 WHIRLPOOL 84ce2b8431d11a7e47aa8d19c9214e11f10ff1fe8a8a09ea2436bc51a9884e246b79cd8dcd7b046027104f53675af41d95a588592f08865955a4e51b17c7c156
+DIST nanoblogger-3.3.tar.gz 82302 SHA256 b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0 SHA512 7de711a69ba0db7dd006902c335ce32773b8d02716048802487f683353702cebd164c059ce0a920856ab49a2b833d6524b6c0981d188c5874f42f6b2a6435f7d WHIRLPOOL 8e04673d72c6774f83ad2f97ddf0519e9ebce5bdaf785e45fc80ddc7a7257d4bdd2ca5b0832029ed15dc4fbc443faee94bac8666a4af0afdfa05d03c8515e8e3
+DIST nanoblogger-3.5-rc1.tar.gz 131833 SHA256 78f51b852238adc1cf1287f4a95d56c954fb3dced1a48eb46a0302579428bb26 SHA512 03a590b1bdf3adb9969e2ce6fda89ece99f33def9f46e1028d2c0724a86f47696c703a5a3bb3c4b1c34418b841702a15bae527cc94eba377ee2003203582de2f WHIRLPOOL 67ead0ccd68c71cd845f93909d719b585604b3c2703be05150190defa2d977784d7d37bd3c6824dbb1438931eb951783a4ad9652f5fa3dc80a9766df0bc9bdbe
+EBUILD nanoblogger-3.2.3.ebuild 1976 SHA256 1b3fc63cd189054e9e2f040eb7a9ce47780e618035f293a6d92e6df338697dda SHA512 f2c210fa7c0b157c55a4151f73a54c55cfb00913e59c278acda96a81e8fed84ef759f74b3ab069fc1243fcf337fd712ce26052b83b61aff35e042ccf93aeee48 WHIRLPOOL fdd45fe91edb3f16f52ee7fc86ef162709e457612d63ddf490f04fd38632a34cc9a6e482db0529b2b6395b16ea6009fc97777c2832497436eefffe553c452725
+EBUILD nanoblogger-3.3.ebuild 2196 SHA256 0d002a741c7d38d43087eee1c1db6d20b8f70ac5625d63b7769502cba7867ff1 SHA512 9b44ce33846797aa323977f277c63dfe00974ecad63f0026b18c68f7f3f13ff914b19882763e104ffeeffd26405cb046df9737d56fc4ddfc2cb807e336256215 WHIRLPOOL 06ab839a798da4e3f0a63ae61c1bb3cb74d7ea64da86fb04cca9836f2e0a2c72c48d690e57833f0c984766e41ac7a314b2816954f50ba69ba968d89ba7db30f4
+EBUILD nanoblogger-3.5_rc1-r1.ebuild 2222 SHA256 1a4db460f4365d3249ea2f5a729620545e2b861c2188ffb36ea5c296566db17a SHA512 4d4f953b77fa166b51ab55a16a3d01d0df8594aaa60ab86101d219090f8dc00eebd58e6e90d8e7ad93e1d8dafc5b3cc0d23f6e2990619f35918a7ddab80d3581 WHIRLPOOL 995bd9983cdfa8be5a4a6b49523367c4894681735bfa5a06dd645d4e9b6ea78ebb1f356504b7e84a2fe2e9ed55435deea7fcb3468bb49764d3a2421715cd4bb3
+EBUILD nanoblogger-3.5_rc1.ebuild 2217 SHA256 84c3378d592a165163ea47d784ee0c430306b420439015cb6dcd241f8cca8560 SHA512 ccfce25bfeb31b87aea68d78f86e0a63b162e0a2ee290045181f69bf73809658b1f82a607221624a71c5d1158e6aa424bfd2708df027691e2554ca067f8aa672 WHIRLPOOL f83e7a056ea27ae145fd766b635a2b7509af0241d46c74c7dcb06de6b5a76329a70835c3312caf1f26ac609f4d33e41bcfce5ead474deba9104b984e427581d2
+MISC ChangeLog 2581 SHA256 454df5757a666184d50a633dcbd197881c060bbf14746235fdd786f9adfebd45 SHA512 51d3a7cd37758e937b057073f841de86d60234a6643ff58ff3bede89965bfb55d1e062948a6a7e979fa9f760bcdbfa176cbe7d4d9ca2fe9c743432ed5991e995 WHIRLPOOL eb8423f242a5b2fa2e5f55f0f355d3c7232a304ad924f0691ac45cac20e64903d399bf75f63c96ac1773bedc7b0dcf464aae7f0665f162df867904de6380bf05
+MISC ChangeLog-2015 4379 SHA256 45dcff8f57e2b81ca4695058cf89e98b3fe95e4b16e0fd352661f116ced78b5a SHA512 19022709b4b647e446b17ab328178fc50b1b0e192abab9f77a16528182445f7365cfa76ab95f0c8b212b1baa4c66ce96bc7fc5a95aac7614882f9ff205310092 WHIRLPOOL a9308daebea2dc31581c25c205cfdba4d938d8f416cc6a08fb5e99ced0aafff649038f020c688e6b0babff51b1412056d4ca84bc412dbcaaf4aa702c27dcbb0c
+MISC metadata.xml 1158 SHA256 1ed7013cadf8bbb16182b96398674baa5f1dcdd9db087fa0ee8293fa4df626b1 SHA512 51fefdaaa979d1625c710655dcd2cf6bb2f1f0143f533b2b2ce1ee8022b6bfac20c9cc92dbd125aac5b19878df28e735f70653f75331c86f7152c194d37994f5 WHIRLPOOL 02f311189d754db991103668742340dd7174b157b5e9a1b2893959f1989ab341db09ea979684d1492654f3ea4f0975b0415d13c1a5b890c216c1d80b46c6152f
diff --git a/www-apps/nanoblogger/files/nb.bashcomp b/www-apps/nanoblogger/files/nb.bashcomp
new file mode 100644
index 000000000000..4e3c5606b1c0
--- /dev/null
+++ b/www-apps/nanoblogger/files/nb.bashcomp
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# nanoblogger completion
+# author: Aaron Walker <ka0ttic@gentoo.org>
+
+_nb()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="-a --add -b --blogdir -B --body -c --category --configure \
+	--datadir -d --delete -D --desc -e --edit -f --blogconf -h --help \
+	-l --list --makepage --manual -m --move -n --author -p --preview \
+	-P --publish --template --templatedir -t --title -u --update \
+	-v --verbose -V --version"
+
+    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+	COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+	return 0
+    fi
+
+    case "${prev}" in
+	-b|--*dir)
+	    COMPREPLY=($(compgen -d -S '/' -- ${cur}))
+	    ;;
+	-f|--blogconf|--template)
+	    COMPREPLY=($(compgen -f -- ${cur}))
+	    ;;
+	-l|--list)
+	    COMPREPLY=($(compgen -W "all cat current max" -- ${cur}))
+	    ;;
+	-u|--update)
+	    COMPREPLY=($(compgen -W "all current main max" -- ${cur}))
+	    ;;
+	?(-)-@(B|body|c|category|d|delete|D|desc|m|move|n|author|t|title))
+	    COMPREPLY=()
+	    ;;
+	*)
+	    COMPREPLY=($(compgen -W "${opts/${prev}}" -- ${cur}))
+	    ;;
+    esac
+}
+complete -F _nb nb
+
+# vim: set ft=sh :
diff --git a/www-apps/nanoblogger/metadata.xml b/www-apps/nanoblogger/metadata.xml
new file mode 100644
index 000000000000..438e4ce281b4
--- /dev/null
+++ b/www-apps/nanoblogger/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<longdescription lang="en">
+Nanoblogger is a small weblog engine written in Bash for the command line. It
+uses common UNIX tools such as cat, grep, and sed.  Features include: support
+for multiple weblogs, support for multiple categories, archiving by category,
+entry, and month, pagination, permanent links, RSS syndication (1.0 and 2.0),
+Atom syndication (0.3), templates and CSS style sheets for full control over
+appearance, placeholders for easy template manipulation, plugins for calendar,
+recent entries, weblog status, fortunes, etc, auto-formatting of HTML, support
+for relative and absolute links, per-weblog configuration, simple cache system
+for faster content generation, auto-detection of weblog by current directory, no
+database dependencies (uses flat-file), and mutliplatform portability.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nanoblogger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
new file mode 100644
index 000000000000..0a57d0807f66
--- /dev/null
+++ b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit bash-completion-r1
+
+DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
+HOMEPAGE="http://nanoblogger.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc x86"
+IUSE=""
+
+RDEPEND="app-shells/bash"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
+		-e 's|"$NB_BASE_DIR/\(nb\.conf\)"|"/etc/\1"|g' \
+		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
+			nb || die "sed nb failed"
+}
+
+src_install() {
+	dobin nb
+	insinto /usr/share/nanoblogger
+	doins -r default moods plugins
+	insinto /etc
+	doins nb.conf
+	dodoc ChangeLog
+	dohtml docs/nanoblogger.html
+	dobashcomp "${FILESDIR}"/nb.bashcomp || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Documentation for getting started with nanoblogger may be found at"
+	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
+	elog
+	elog "To create and configure a new weblog, run the following as your user:"
+	elog "   nb -b /some/dir -a"
+	elog "where /some/dir is a directory that DOES NOT exist."
+	elog
+	elog "To prevent having to specify your blog directory every time you use"
+	elog "nanoblogger (with the -b switch), you can set a default value in your"
+	elog "~/.nb.conf.  For example:"
+	elog '   BLOG_DIR="$HOME/public_html/blog"'
+	elog
+	elog "If you are upgrading nanoblogger from a previous version, follow"
+	elog "these directions (as stated in the manual):"
+	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
+	elog "      nb [-b blog_dir] -a"
+	elog "    2. copy old data directry to new weblog:"
+	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
+	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
+	elog "      nb [-b blog_dir] --configure -u all"
+	elog
+}
diff --git a/www-apps/nanoblogger/nanoblogger-3.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
new file mode 100644
index 000000000000..b305d681bb49
--- /dev/null
+++ b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit bash-completion-r1
+
+DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
+HOMEPAGE="http://nanoblogger.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-shells/bash"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
+		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
+		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
+			nb || die "sed nb failed"
+}
+
+src_install() {
+	dobin nb
+	insinto /usr/share/nanoblogger
+	doins -r default moods plugins lib lang docs welcome-to-nb.txt
+	insinto /etc
+	doins nb.conf
+	dodoc ChangeLog
+	dohtml docs/nanoblogger.html
+	dobashcomp "${FILESDIR}"/nb.bashcomp || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Documentation for getting started with nanoblogger may be found at"
+	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
+	elog
+	elog "To create and configure a new weblog, run the following as your user:"
+	elog "   nb -b /some/dir -a"
+	elog "where /some/dir is a directory that DOES NOT exist."
+	elog
+	elog "To prevent having to specify your blog directory every time you use"
+	elog "nanoblogger (with the -b switch), you can set a default value in your"
+	elog "~/.nb.conf.  For example:"
+	elog '   BLOG_DIR="$HOME/public_html/blog"'
+	elog
+	elog "If you are upgrading nanoblogger from a previous version, follow"
+	elog "these directions (as stated in the manual):"
+	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
+	elog "      nb [-b blog_dir] -a"
+	elog "    2. copy old data directry to new weblog:"
+	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
+	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
+	elog "      nb [-b blog_dir] --configure -u all"
+	elog
+	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
+	elog "		nb -u all"
+	elog "after copying your old entries from [oldblog_dir]/data to"
+	elog "[newblog_dir]/data."
+	elog
+}
diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
new file mode 100644
index 000000000000..f090ae374974
--- /dev/null
+++ b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+MY_P="${P/_/-}"
+DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
+HOMEPAGE="http://nanoblogger.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
+
+RDEPEND="app-shells/bash"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( docs/nanoblogger.html )
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
+		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
+		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
+			nb || die "sed nb failed"
+}
+
+src_install() {
+	dobin nb
+	insinto /usr/share/nanoblogger
+	doins -r default moods plugins lib lang docs welcome-to-nb.txt
+	insinto /etc
+	doins nb.conf
+	einstalldocs
+	dobashcomp "${FILESDIR}"/nb.bashcomp
+}
+
+pkg_postinst() {
+	elog
+	elog "Documentation for getting started with nanoblogger may be found at"
+	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
+	elog
+	elog "To create and configure a new weblog, run the following as your user:"
+	elog "   nb -b /some/dir -a"
+	elog "where /some/dir is a directory that DOES NOT exist."
+	elog
+	elog "To prevent having to specify your blog directory every time you use"
+	elog "nanoblogger (with the -b switch), you can set a default value in your"
+	elog "~/.nb.conf.  For example:"
+	elog '   BLOG_DIR="$HOME/public_html/blog"'
+	elog
+	elog "If you are upgrading nanoblogger from a previous version, follow"
+	elog "these directions (as stated in the manual):"
+	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
+	elog "      nb [-b blog_dir] -a"
+	elog "    2. copy old data directry to new weblog:"
+	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
+	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
+	elog "      nb [-b blog_dir] --configure -u all"
+	elog
+	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
+	elog "		nb -u all"
+	elog "after copying your old entries from [oldblog_dir]/data to"
+	elog "[newblog_dir]/data."
+	elog
+}
diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild
new file mode 100644
index 000000000000..1356e0e70101
--- /dev/null
+++ b/www-apps/nanoblogger/nanoblogger-3.5_rc1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit bash-completion-r1
+
+MY_P="${P/_/-}"
+DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
+HOMEPAGE="http://nanoblogger.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-shells/bash"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
+		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
+		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
+			nb || die "sed nb failed"
+}
+
+src_install() {
+	dobin nb
+	insinto /usr/share/nanoblogger
+	doins -r default moods plugins lib lang docs welcome-to-nb.txt
+	insinto /etc
+	doins nb.conf
+	dodoc ChangeLog
+	dohtml docs/nanoblogger.html
+	dobashcomp "${FILESDIR}"/nb.bashcomp
+}
+
+pkg_postinst() {
+	elog
+	elog "Documentation for getting started with nanoblogger may be found at"
+	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
+	elog
+	elog "To create and configure a new weblog, run the following as your user:"
+	elog "   nb -b /some/dir -a"
+	elog "where /some/dir is a directory that DOES NOT exist."
+	elog
+	elog "To prevent having to specify your blog directory every time you use"
+	elog "nanoblogger (with the -b switch), you can set a default value in your"
+	elog "~/.nb.conf.  For example:"
+	elog '   BLOG_DIR="$HOME/public_html/blog"'
+	elog
+	elog "If you are upgrading nanoblogger from a previous version, follow"
+	elog "these directions (as stated in the manual):"
+	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
+	elog "      nb [-b blog_dir] -a"
+	elog "    2. copy old data directry to new weblog:"
+	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
+	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
+	elog "      nb [-b blog_dir] --configure -u all"
+	elog
+	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
+	elog "		nb -u all"
+	elog "after copying your old entries from [oldblog_dir]/data to"
+	elog "[newblog_dir]/data."
+	elog
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
new file mode 100644
index 000000000000..917b38521b1a
--- /dev/null
+++ b/www-apps/nanoc/Manifest
@@ -0,0 +1,13 @@
+DIST nanoc-4.6.4.gem 241152 SHA256 4fc9c41f8103edc732654ba8559f42007ce6e7013078cf652f05e572c61272aa SHA512 49e41f5bfc3ae9afc7e40b182374579adbd703954ba97b0cbe68c0e3ac864e7301a90dc5993795636b96155a1d9cfbb102e6bfa321513919123ff680322a2631 WHIRLPOOL bbfd86c526f34258d68e1532ec4629cada74da8a5a6411f6bd5b1fa890693dd614205c9859483b1b796a0de38d9ec1ce21650d69415aa8eb4f08500fa9e27eea
+DIST nanoc-4.7.14.gem 256000 SHA256 e68fb32763517dbd78b655ad14d2bc69e0828f4cce6488240c4ec89b7d8377a9 SHA512 e7413771794e9d2931e3be2a5b5575f7cd207d9b11167a1838496edf34bee4e631c362d9ac50fb0f9dddbe2fd5836b402506565c704838327116a18f0ea34088 WHIRLPOOL ff04d10480a2a9ff308d0ac11320f37fcc7afed84221dc9bc86ff8b318a1100d2cdb20634d771612c7e56a727ac3448b094b7d736c5bf38c4f24fc09d9bd7486
+DIST nanoc-4.8.1.gem 256000 SHA256 9d2bb60fffcc3a0f1ec7b6c204494514874f51ad9d5f8f4e15441d5d4d976a22 SHA512 9b24c91074ba591a18ba1f4adc2e97e89f3fa0e152cb56fbce58b2591312f54db0336487526ca0f34dc02ef22b2c0960a70a5313e0d8b6c6b7cb2d36ab98b5eb WHIRLPOOL 51fbe4eb5a587143a16d8d9bec7f5f2ccea3900a87534808209a54b763e9fa0d7ba7c5fece38fc82ff447f6175f1feb9ec26ea2127c12bd65ddb94b155af89e6
+DIST nanoc-4.8.5.gem 257536 SHA256 bd0909d15dfacc3f1e859ba1c84f66611c414aee6600c256d27394d8b47bed58 SHA512 6cb4e57e3e852dea5f2b64ed2d194dba88e109ebf1e83433b49bb6c0027b7d47676bd418aa6d1149c88a71981790bb459ae5a5d21c18a805cdd9db1bf5c3647f WHIRLPOOL 289ed9e7c2e90fe41392d2ade914f57db022455cab8f40a809d30a2bdf1e74b7b999c8e7d25ee3fc109dc896062bf20baeeff53d412cfae1e9798f2cdd0aaa23
+DIST nanoc-4.8.9.gem 258560 SHA256 68f51386e8a2eb01f1348c43a10a752fc118f513550a9011d097693f7e193703 SHA512 7fedd050564134ba4f3706689af21d856639b02ba0c5a4bc02bf639f7be4dafd9efed4c3e11aaba08b53d4587476c9f071f4cd0fa07879e769295c6175735dd4 WHIRLPOOL 7c214f597864d4914e7f2279b39d2b415308ee97b43fd7657c370ea77f8a530902a6f323998099209272b8aa131932625c8aa6b1539557b1b106ea1364ca8a57
+EBUILD nanoc-4.6.4.ebuild 1244 SHA256 0cae293493918356633b4b1b4c49b4b73c428038780d0dd69bda0dab406583f0 SHA512 2be4cc8b453fccf9c1bb77cbc38b2f3d8b8d70dbe23611d0b6f40e832847f740c9747b9de1853e1a6d09d6ecc9f7548bc0098556362cff9b93ccd4dad3659959 WHIRLPOOL b673a7d76414eb4bfe8204df5cb78a8e7c3d346cade64151aa3fdc1a822fb09ac00e9246659c8b47e9773482caab28c22d046ff98e5db4e16c7a9cd7e0b7d7eb
+EBUILD nanoc-4.7.14.ebuild 1527 SHA256 33a3f473dac02173c37e4abd079a1eceaacd591298153f9da37f27a4f82f85af SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061 WHIRLPOOL 7aa2bc8a08a0283cb9f0687e2b762f30d1348c9a10592c3fcb3f2d23578e66d0503b0ee9e5bdf407868ba205d133745eb78e7b4726e7b339f0e6c4e97a3ac6e5
+EBUILD nanoc-4.8.1.ebuild 1527 SHA256 98ad5909cf9c8727cfb99d18d2e491149db88396e9328073f09eff546db41279 SHA512 e752e828227a445e7b575a7ce2e8071afbd6d9108a44e881e7e797490b27f73d7af8a4bba624cba72723c86a3b6e78b49c9de3fa387ce102894ba10bc46b58ed WHIRLPOOL 203087dc87539ca81fb64be31fa41ce5768d1a4af1c206363d4d8b939c691ca5e469a2ba275eb4cf9cc77e969c96df388f9dd9e1cb1a716b8d6b7e545fad7b2b
+EBUILD nanoc-4.8.5.ebuild 1544 SHA256 c8572b3bfde4528ee70b7184153bdae268f0cf464b2f71ad179d90f29e474dd7 SHA512 54561e950f0b332640ca35907bbf43f1fef9b817b26ea8dd6829944a9411f4869a1b3c9711a1fcb44ecf4e75be7809016a3d9fb0a5ab1ac914927f17c83523a6 WHIRLPOOL 963d7f51adab61f3923e80a4b936a4b08f77a9cf4180c57aa7103923e8e00e5860685573b9f4b77e7f11b1a7afdf5e2453b689240036a3276c55f16cfc4c6ae7
+EBUILD nanoc-4.8.9.ebuild 1572 SHA256 feb47a5784a68c591a3750befd90efc07183a02ccf040e82e52089d073190f77 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af WHIRLPOOL ebc12a47919b8d01a7488ea1cd3fa753a9edd433ee59dbfd469ac3d570afd655efb398ebb4f32d81b35bc45098d7de4b83b7ee093eece0f73a87e05ad687fc28
+MISC ChangeLog 5209 SHA256 4d4ceab64c54a87f9bdc25d0149c182e5721349c3a6f6985b95d3c7a79e1cadb SHA512 9ab85ec191a889c3f20641c4201acbfdd6a525abea49c39d909e06ef1fa11864f35d169d1de993ebd03ec97e7496b2f88f580d9c3bd3830b232533ac93c60a80 WHIRLPOOL de25826d041c79fa5dbb6443c1c15c0e52c33d83709994f27290316084a728a16c8725c790dc9e9f5a66ed4694344d5f74a17b1509aae436ae3f49fcb67f0466
+MISC ChangeLog-2015 2581 SHA256 7213c5e8b3f5a13b4e4e9e8ea201f9df7a6d206d192850523c9e32191b51375f SHA512 77f14ed34f29c41f1acc6575c2d01183d681d6de8ea30aa27576b27e6e43332e005e16978e2e589b76406be968aa0ff1a52118ebc81c07fd4f6b7120350f4e4b WHIRLPOOL dc5708c6c9ece7f4e33a51437b7e40cb49902dc9ed4844ece9c654150e1ab04f3f1754ca181df5c4cb8e4202c703ed39a643282d54fb884e1f94b10cc9fe614e
+MISC metadata.xml 317 SHA256 6fc7d88d357db79e3cbfe40c722f1d87c0062bfd62903fd6fa39b7af2858855f SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e WHIRLPOOL d2dec6e718dffd874139a0d2b438d4c5507363f5ac8baf057a71258930ff049deb33ba6a375b404fffdfa954053cf3d279b5df7be1a0e6e327dda66458e9ab63
diff --git a/www-apps/nanoc/metadata.xml b/www-apps/nanoc/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc/nanoc-4.6.4.ebuild b/www-apps/nanoc/nanoc-4.6.4.ebuild
new file mode 100644
index 000000000000..c5c634e6c7bb
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.6.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.3:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' test/helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake test_all || die
+}
diff --git a/www-apps/nanoc/nanoc-4.7.14.ebuild b/www-apps/nanoc/nanoc-4.7.14.ebuild
new file mode 100644
index 000000000000..0072b5e91737
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.7.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.3:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nanoc/nanoc-4.8.1.ebuild b/www-apps/nanoc/nanoc-4.8.1.ebuild
new file mode 100644
index 000000000000..5f688ebbbf39
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.8.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nanoc/nanoc-4.8.5.ebuild b/www-apps/nanoc/nanoc-4.8.5.ebuild
new file mode 100644
index 000000000000..10eba245930b
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.8.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/fuubar
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nanoc/nanoc-4.8.9.ebuild b/www-apps/nanoc/nanoc-4.8.9.ebuild
new file mode 100644
index 000000000000..b1c3454fd12c
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.8.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/fuubar
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
new file mode 100644
index 000000000000..ce6263c24a21
--- /dev/null
+++ b/www-apps/nextcloud/Manifest
@@ -0,0 +1,10 @@
+DIST nextcloud-11.0.4.tar.bz2 42164294 SHA256 68b89f1d0068728f76d89519c7d0a57396f2d216d048cc970346d436ec61999e SHA512 3e521921dfd218100cd114da02f5b9316883d72c000e44ecee606ecfc300c9847de9af3c291d8cbe936a43d29ac37b2d76c03d32a633b7a8f73dc6ff51e9c520 WHIRLPOOL 2453f49e0e7e8f0ed6bc69dbfbd5e7c9b88d9a2f4279fca046f47f7cf393c5d89a96c73956b685a40a9ddd7fb4ec155af5bc0d85828302cf6bda1654c0403246
+DIST nextcloud-11.0.5.tar.bz2 42515140 SHA256 47261211384e63b1d4816be60817b0315029d018b5568ac3aeb3181be5fb98a4 SHA512 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a WHIRLPOOL f9cd8473c839f2edf9e06b120e9efbd1b480310415d9973561f00a312c4d39fddceaf3682c373c857a1a436adbe6c2321b0a786c7604c0a355554251c29eebc8
+DIST nextcloud-12.0.2.tar.bz2 42756355 SHA256 eb34d6cb9f55ee84bf2ad847b4b08cdb925321848ffa2264a9b1566e7b21a17c SHA512 5451c2dd2fa0a9f64e66723e075642d3e37b43f9611dc1a954183babea137c241c4e6c6428dbac99b3a99bff1ce6c6e4db6f3b42babb37caf445bfbd1674faa2 WHIRLPOOL d1d1baa6c0852d5abf9863bcc0ba67fea29b8c14eb5015191f5f547fd9c6d1247e863eecf2f8966314cccecdb19ec16e5d66454ed21995b6c99076eac8f3205a
+DIST nextcloud-12.0.3.tar.bz2 42935218 SHA256 88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71 SHA512 4aae61cb201f3c8b7ba7fa6c2789fb72930b1190ff40ef96494bc2763f268f321b2c2d1ec70c9add8cd45307818ddee39749a5d0a7d0667997980e4b5087c308 WHIRLPOOL 3445559e0efe59c78098b6ea53660403664a70999c18b24759c945757450b3de0a7241c85caffdfc165a275caa7a87931af854853ff3330aeb382f0855d936e0
+EBUILD nextcloud-11.0.4.ebuild 954 SHA256 2acb77923d65767fa12032f3c88b2089d9dce36fbf85af8b64f16fe4c014fa50 SHA512 b81e4017d167d86e3e8f8533657655d475c4478d8c266d55e09b0b9076729492618811c18125b58bbe7c7c5c41c38e3383ab670277368971a94da0027c458664 WHIRLPOOL 714dc73207c38ac0a283e05c6ac0abc81ef240fc3b874600d598e2e722bfe845ac85a7843f26d6b0b8d5d1b36b9ee11c85581e6f4ae5ca5cd26e00ba16227b90
+EBUILD nextcloud-11.0.5.ebuild 954 SHA256 2acb77923d65767fa12032f3c88b2089d9dce36fbf85af8b64f16fe4c014fa50 SHA512 b81e4017d167d86e3e8f8533657655d475c4478d8c266d55e09b0b9076729492618811c18125b58bbe7c7c5c41c38e3383ab670277368971a94da0027c458664 WHIRLPOOL 714dc73207c38ac0a283e05c6ac0abc81ef240fc3b874600d598e2e722bfe845ac85a7843f26d6b0b8d5d1b36b9ee11c85581e6f4ae5ca5cd26e00ba16227b90
+EBUILD nextcloud-12.0.2.ebuild 954 SHA256 2acb77923d65767fa12032f3c88b2089d9dce36fbf85af8b64f16fe4c014fa50 SHA512 b81e4017d167d86e3e8f8533657655d475c4478d8c266d55e09b0b9076729492618811c18125b58bbe7c7c5c41c38e3383ab670277368971a94da0027c458664 WHIRLPOOL 714dc73207c38ac0a283e05c6ac0abc81ef240fc3b874600d598e2e722bfe845ac85a7843f26d6b0b8d5d1b36b9ee11c85581e6f4ae5ca5cd26e00ba16227b90
+EBUILD nextcloud-12.0.3.ebuild 954 SHA256 2acb77923d65767fa12032f3c88b2089d9dce36fbf85af8b64f16fe4c014fa50 SHA512 b81e4017d167d86e3e8f8533657655d475c4478d8c266d55e09b0b9076729492618811c18125b58bbe7c7c5c41c38e3383ab670277368971a94da0027c458664 WHIRLPOOL 714dc73207c38ac0a283e05c6ac0abc81ef240fc3b874600d598e2e722bfe845ac85a7843f26d6b0b8d5d1b36b9ee11c85581e6f4ae5ca5cd26e00ba16227b90
+MISC ChangeLog 2257 SHA256 d41be841f8a33eb232f52f39d14d2c3f7604115879be5d0446202db40af335f0 SHA512 80dc558db015a8de373eddb456406bc0c01d55a98e49453df9aaa0cc1e4c95c48a46266e60a2dc3c73595f7594397c90538f4355995fd4421d1e672ea3eef103 WHIRLPOOL cfaf7ccb1344999ca7e37774a7b86f4f53e9d674d06f9cee8914d6daf0c6957cb3e9224b48f726f7c17633f5717af6c8310ddefbbaac644bd2f54871beebab51
+MISC metadata.xml 363 SHA256 21672799e45f6cdb2669ce0ceda0939e8a8df03163535882ebd587704a90fb6a SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721 WHIRLPOOL 8564623b50e1e097674158764dbdbcb807a0f497893971d461914d7ab8b73ab542f9d6244651ffc84093bce23d76ce1006cfb56e132e46b5a9cdb6cb102e1b20
diff --git a/www-apps/nextcloud/metadata.xml b/www-apps/nextcloud/metadata.xml
new file mode 100644
index 000000000000..9202e43366b9
--- /dev/null
+++ b/www-apps/nextcloud/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nextcloud/nextcloud-11.0.4.ebuild b/www-apps/nextcloud/nextcloud-11.0.4.ebuild
new file mode 100644
index 000000000000..d70e7708a17f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-11.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-11.0.5.ebuild b/www-apps/nextcloud/nextcloud-11.0.5.ebuild
new file mode 100644
index 000000000000..d70e7708a17f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-11.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-12.0.2.ebuild b/www-apps/nextcloud/nextcloud-12.0.2.ebuild
new file mode 100644
index 000000000000..d70e7708a17f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-12.0.3.ebuild b/www-apps/nextcloud/nextcloud-12.0.3.ebuild
new file mode 100644
index 000000000000..d70e7708a17f
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
new file mode 100644
index 000000000000..34faf4cd63b5
--- /dev/null
+++ b/www-apps/nikola/Manifest
@@ -0,0 +1,10 @@
+DIST Nikola-7.8.8.tar.gz 3870991 SHA256 a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687 WHIRLPOOL 3f9d8e234db07910dd82a9319aefdef8e9d08d717e457506de1ba5f51281ad56335d7745d659f7245744924cd18fe54ba6b47953b598857750702e72fb06136e
+DIST a-study-in-scarlet.txt 122496 SHA256 633115482b8b6cca24332133f22ed3caa1b4b58361b604dbe26aaa943b7cb4ad SHA512 7958079a745ce6474b9006454ee99d9c848bc36372fc149265b4f2b82e562c961823b7716ec0e3285fce1e9363cf8e109190d6f0dc998801c568764ac82f8d19 WHIRLPOOL 0b03b0c6c89f9e23745e8cd1fb8f9faba3b382fc06d3481cfc72e50d386937d97452889a49ef9d298915431ecb5920b1374f1e7585aefd8fe893f13a69f66a9d
+DIST nikola-7.2.0.tar.gz 1843614 SHA256 05bf72f9894eaf83a61ebc1386ab61ffa1be1e4934265261e58487b371f8a926 SHA512 87a6f543793bc21453dc01b4662703edbfd887b775ea067a79bfcf0ac74e22e3034657ce24bdbaca5a05585a6e556295b6d5670ae085f8b31a057cf77d72d3eb WHIRLPOOL ad9794f705307393050727467ae8f4908e0e08134d78aebf9ff3aa0c12f35d2a6bffa7d8453a7c0ce1ba21b6591b3dcc493a0a52b5dd27971d67174ef24dbef6
+DIST nikola-7.6.3.tar.gz 2365230 SHA256 f07a0eb00cb1653bf778dea0d7fe6983dce01f845e6b53ba1ce1678ff2c87c3d SHA512 eef8b8cc4d3af03e009ae31247ba19eb37b9a3ed9691d942b44291562df80d0f12b8306a2d7c0a2a1fb0555f700da09db06a1b002ed58c0338234d2ca2336b5b WHIRLPOOL 5584f1254503c89044822bf6aa51a487ffcd0863f351fee41195217b596a549d2160470f63b0ce60f4131533577adf88d199a818a32caf351dd1edcf350545a7
+EBUILD nikola-7.2.0.ebuild 2226 SHA256 ee5c852a1dd4cf281d1defc184c02adf8741c8a34d5f7d6469dcdd0be6ac336b SHA512 5ffb3d68a602c333e710f2b7f193646b383bb1b3cdb0e7be3c81da39b6ff08b4531d1208e39e6ad15e1d446a9efb132854b0cdb01b13b560b8f9f74aff9735ca WHIRLPOOL 180b051a0a58ced63112c18f305c374ec37e3b080fff4dd096bdb4b14fa3677095222666333700215a3cbcda777ade975e1ab71ac9a35993a746d548f1b8179d
+EBUILD nikola-7.6.3-r1.ebuild 2663 SHA256 62b2aac5558fe9f0a02d05ec3ec97110e34efea36fef0dd2e8d38f61f54f92a0 SHA512 8218192c2c672084b7f5d63ebb9847cd230a9d2f8283b7a47742c20cf5809b70892d9a198ee7d22312b90e37d70dd4c39d9754c1e4a3ba3b48a5a3ecf0dea115 WHIRLPOOL 45f1ecfb666657ba451b2adaeb8db19ed3eb164899fb8a102911ee60280c491437714dc1938292eb92c802084e2255296ad98b82ef7a7e3cd68b9168734e690e
+EBUILD nikola-7.8.8.ebuild 2337 SHA256 10d1e354a80c367c0cf810d061187e2fd239f5ac1e5b1eae1b75b2c4d2e9c4ab SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b WHIRLPOOL 1d1abe91bec57c6bb9d3cbe1265d8e73aabb88d410506103dc13a3e28743efc0e6085bc64b9164336bc8fe5fdb309299104341c2df6631a8de86eba8dffe338d
+MISC ChangeLog 3617 SHA256 b17401e1c10f66d20053b8140102e3b3ba8a1f737816635a8ffb978ebf3ebecd SHA512 2dfd650782403c01831506b248b8a84866a30ba60d9208e40b618c86ef6edaf0f24ba4835288dedd85f31c34226793d3bf76dde514df937b80450d672f151796 WHIRLPOOL 168e0baaa01fddeef23d4b64decfb60261675b30963e876cdd7b4cac3ca4f2a489d30069c0ba4a5c593666a6d8c39a3de1b22895d2b15375fb8a07122d0082bb
+MISC ChangeLog-2015 4782 SHA256 fd71c1643a569ed8239fa9e165655a970ace9cda0d058aae8dafdbb7a9e6aa4e SHA512 c2627c61d34f62c581d54cff54415ccf6486ecc4a7142c8cb99f2e3d951030af26f8fb72b2e04df2db55bc3b040addba628f348f91eef141bbd3f0bfaa30ea16 WHIRLPOOL 795f7d113b9d32694ccd8aa1b3eef9832d3c764e728d5767732d6d47feb9a65c7edf015f6f8279d3d00d7c9efe7945d9208ce8b37401ac9d8cc8fa20bcfd8e25
+MISC metadata.xml 1487 SHA256 faf9d7a2c3cabeab2e7df29e0a026aeb1596929d506dd95bc7a82f67f623d0b4 SHA512 50837443dc23de0be887dd89fec5eced1163cacbb2f6c798d37a9eb6db1abcc46fd79d0fa8f8e5911a608bb278e95d6254b069cc2aebec1755ace70730b989bc WHIRLPOOL ca0ac3e8cf897dfb721964eb69d62296a3a5979ca22ca5c410f1ef44d96966faaddd242fbac4c266e2123082d57468b1efe7e7dbc4468708087c7c72b8ac7ba4
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
new file mode 100644
index 000000000000..86aba0b41f06
--- /dev/null
+++ b/www-apps/nikola/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="assets">
+      Support web asset management through <pkg>dev-python/assets</pkg>
+    </flag>
+    <flag name="charts">
+      Support chart generation through <pkg>dev-python/pygal</pkg>
+    </flag>
+    <flag name="ghpages">
+      Add support for direct uploading to github pages thru
+      <pkg>dev-python/ghp-import</pkg>
+    </flag>
+    <flag name="hyphenation">
+      Add hyphenation support through <pkg>dev-python/pyphen</pkg>
+    </flag>
+    <flag name="ipython">
+      Add IPython notebook compilation and LESS support
+    </flag>
+    <flag name="jinja">
+      Add support for <pkg>dev-python/jinja</pkg> as alternative templating
+      engine to Mako
+    </flag>
+    <flag name="markdown">
+      Add support for Markdown as alternative markup language to
+      reStructuredText
+    </flag>
+    <flag name="watchdog">
+      Use <pkg>dev-python/watchdog</pkg> to monitor file system events
+    </flag>
+    <flag name="webmedia">
+      Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
+      links
+    </flag>
+    <flag name="websocket">
+      Add websocket support thru <pkg>dev-python/ws4py</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Nikola</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apps/nikola/nikola-7.2.0.ebuild b/www-apps/nikola/nikola-7.2.0.ebuild
new file mode 100644
index 000000000000..782d8c1d45d3
--- /dev/null
+++ b/www-apps/nikola/nikola-7.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+MY_PN="Nikola"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/ralsina/${PN}.git"
+else
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+	KEYWORDS="amd64"
+fi
+
+LICENSE="MIT-with-advertising Apache-2.0" # Gutenberg
+SLOT="0"
+IUSE="assets charts hyphenation ipython jinja markdown"
+RESTRICT="test" # needs freezegun, coveralls, and phpserialize
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-1.5.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
+# more options as packages will be added:
+#	livereload? ( =dev-python/livereload-2.3.1[${PYTHON_USEDEP}] )
+#	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+#	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rf "${D}"/usr/share/doc/${PN}
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	doman docs/man/*
+}
diff --git a/www-apps/nikola/nikola-7.6.3-r1.ebuild b/www-apps/nikola/nikola-7.6.3-r1.ebuild
new file mode 100644
index 000000000000..9025b60e6d74
--- /dev/null
+++ b/www-apps/nikola/nikola-7.6.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/a-study-in-scarlet.txt"
+MY_PN="Nikola"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/ralsina/${PN}.git"
+else
+	SRC_URI+=" mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+IUSE="assets charts ghpages hyphenation ipython jinja markdown watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.28.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	~dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( ~dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+src_prepare() {
+	# replace Gutenberg licensed version with our public domain version (bug #552372)
+	rm nikola/data/samplesite/stories/a-study-in-scarlet.txt || die
+	cp "${DISTDIR}"/a-study-in-scarlet.txt nikola/data/samplesite/stories/ || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rf "${D}"/usr/share/doc/${PN}
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	doman docs/man/${PN}.1.gz
+}
diff --git a/www-apps/nikola/nikola-7.8.8.ebuild b/www-apps/nikola/nikola-7.8.8.ebuild
new file mode 100644
index 000000000000..a893c02361be
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) # 3.6 waiting for deps
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	doman "docs/man/${PN}.1.gz"
+}
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
new file mode 100644
index 000000000000..df96355df8a1
--- /dev/null
+++ b/www-apps/novnc/Manifest
@@ -0,0 +1,8 @@
+AUX noVNC.confd 104 SHA256 f6b072f2292701ded2c9acdc6a2a55d1d2c9b43c6db41ed99a7993d823b51512 SHA512 9e784f668965b55b562b020fb32d4674267583647b950dd19aa297856b5a4509f2a7b9891e9575bc823a379aa237d4499dfeb1a2b2f537052e5ae471828e888f WHIRLPOOL f0c769859f530452f7a7fc94f1b4e0ef78f9d1656b81a42cee3869025e4911f5ba9f133c0322d72ba6e01768fa64334a5395e1f395c9c06ec67459680b8af6f1
+AUX noVNC.initd 697 SHA256 17fb4ab9bea23c62c5ec2aa20bffdc9306b9d2ef833f9cdc6e26e49721498b32 SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a WHIRLPOOL cc967e28cee122f844aae5cb402281913b314ef132278b9c40549e34babd15e2f8df998e70179797e622297c9c51f6fa05b89d74214fec88fafee5a259c83f47
+DIST novnc-0.6.2.tar.gz 600675 SHA256 70a27fe472b901faef7235a61e01aed884ec8c2234a666844acfd9da7e5bcf9b SHA512 245d205f8935c82722a55d6cfcd2cea1825176c0cd695fd0eec34aa19cdc3b766fed62e741ff41b0a8c4a3b3cbabc5a39dfa6ad8ffa6169f5b88420a4a845a7c WHIRLPOOL 2ebbae02d702486674216864ef83c84a1439ee0b52815be423e4ad1bacc1748c57f8b749c4a1a0367bc2485506e2249d79bab13782324bd221314965b8fdd495
+EBUILD novnc-0.6.2.ebuild 1311 SHA256 ff8ddef51f728a493f9fde103fc480d74ed6f0d7a627587d8700fce96282c172 SHA512 88ca686dc5be5acabae7adfeb918bbaa7b9f3a05c3092e05632f8009576baaa41af90ceb3f4e1022a2c85a12b19fb8d317f4853f59364035d7c5139f12cfb0c3 WHIRLPOOL 7ee0ac9cc4146419f25e5cf728ab4b53305dbf96896cdaad58f604bf1f9054131266988aaa0bb776cf45c40e7a835db738a13a21aae4810644caffaae29a064e
+EBUILD novnc-9999.ebuild 1239 SHA256 2956d0b78d2a0b0f6fd83f5597f241963930be85976e08ebe5ac53f1a7c26cee SHA512 292abea22fee5b4e81c6f2e8e83c772cb8d41462b595bfdc7ea6ecf769f2740bb7fb29d903e828d43e52a23a0b70c265f2c03a034831fa165aac0a5be40add0c WHIRLPOOL 16d57f8af18b2513eb7e5baf379f4a0640f63699a0a78164ac820e7b129277c2e1cb6bf44d62faf123b7f260d7e31a31ef153ca46fdf4f090535609494d1b102
+MISC ChangeLog 3885 SHA256 3efeec9e5fe175e7aa03288f35f47d7f3573b5f4941c1e2d43de874a58a7beaf SHA512 fc0955d35f61c51fb1d77c06764f07fb4e7c685c8f45ab320412f02d72e89c851c44ac328b8af916a73d22065f2b45ebdd26522fa8d6c69eef3af2293f4a74fe WHIRLPOOL 851898e3d5659922fcb6e970a14e49303e0ae42b04f6c60cc25a515559dc550fface9fb9dc768cce6a023c4e4558f5be994d4c5d6e5d0269b9a0dfb94855ba1e
+MISC ChangeLog-2015 1700 SHA256 e1b79ad61b8d6c9b3dd43915cd240a2bf889caf13d1a5f13b5e5e3dafaf85eb4 SHA512 8dc6f6028557eef57c5e4e6673dfd4acb461ca628c0b02de3a7342352584038c341ac0cb2843d9a78f20abfdcb9642c56b663a686b9da747483850b5b57c1351 WHIRLPOOL 169fda6072306bf4da07bb4fa3b09ee7b190261a941c450f72c8e42e6c91aa07fc0358d8f32f639c0f8a43cdd5e380fceb4f898607ffb23de4ee5fb2f47f673c
+MISC metadata.xml 341 SHA256 1fbf3c539e9c98875fcf3334968c3102f82bbeecf4b38e273af1629c6ca98f7a SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8 WHIRLPOOL 8844d3995a0af2c47ac7242a59c75423ef5b91207ebb53d3ddfc4a42bf53bc5c4ddf5d32521213c761dc9ac6b5ef1a9baf8629d4984d7d649f30e6d0be7a6397
diff --git a/www-apps/novnc/files/noVNC.confd b/www-apps/novnc/files/noVNC.confd
new file mode 100644
index 000000000000..50ddb5cc3e57
--- /dev/null
+++ b/www-apps/novnc/files/noVNC.confd
@@ -0,0 +1,4 @@
+FLAG_FILE=/etc/nova/nova.conf
+WEB_ROOT=/opt/noVNC
+LOG_PATH=/var/log/noVNC
+CERT_FILE=/opt/noVNC/self.pem
diff --git a/www-apps/novnc/files/noVNC.initd b/www-apps/novnc/files/noVNC.initd
new file mode 100644
index 000000000000..93d87486ad4d
--- /dev/null
+++ b/www-apps/novnc/files/noVNC.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# Author: Cor Cornelisse <corcornelisse@gmail.com>
+
+pidfile="/var/run/${SVCNAME}.pid"
+command="/usr/bin/nova-novncproxy"
+command_args="--flagfile=${FLAG_FILE} --cert=${CERT_FILE} --web ${WEB_ROOT}"
+command_background="yes"
+start_stop_daemon_args="--stdout ${LOG_PATH}/${SVCNAME}.log --stderr ${LOG_PATH}/${SVCNAME}.err"
+
+
+depend() {
+	need net
+}
+
+checkconfig() {
+  checkpath -d -m 0750 /var/log/noVNC
+	if [ ! -r /etc/conf.d/${SVCNAME} ]; then
+		eerror "No config file found: /etc/conf.d/${SVCNAME}"
+		return 1
+	fi
+	return 0
+}
+
+
+start_pre() {
+	checkconfig || return $?
+}
diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
new file mode 100644
index 000000000000..2981c92d1633
--- /dev/null
+++ b/www-apps/novnc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kanaka/noVNC</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apps/novnc/novnc-0.6.2.ebuild b/www-apps/novnc/novnc-0.6.2.ebuild
new file mode 100644
index 000000000000..431a5d643c76
--- /dev/null
+++ b/www-apps/novnc/novnc-0.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
+HOMEPAGE="https://kanaka.github.com/noVNC/"
+SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/noVNC-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/websockify[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+python_compile() {
+	echo
+}
+
+src_install() {
+	dodir /usr/share/novnc/utils
+	dodir /usr/share/novnc/include
+	dodir /usr/share/novnc/images
+
+	exeinto /usr/share/novnc/utils
+	doexe utils/b64-to-binary.pl
+	doexe utils/img2js.py
+	doexe utils/inflator.partial.js
+	doexe utils/json2graph.py
+	doexe utils/launch.sh
+	doexe utils/parse.js
+	doexe utils/u2x11
+
+	docinto /usr/share/novnc/docs
+	dodoc README.md
+	dodoc LICENSE.txt
+
+	cp -pPR *.html "${D}/usr/share/novnc/"
+	cp -pPR include/* "${D}/usr/share/novnc/include/"
+	cp -pPR images/* "${D}/usr/share/novnc/images/"
+	dosym images/favicon.ico /usr/share/novnc/favicon.ico
+
+	newconfd "${FILESDIR}/noVNC.confd" noVNC
+	newinitd "${FILESDIR}/noVNC.initd" noVNC
+}
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
new file mode 100644
index 000000000000..3bcb1d55fc69
--- /dev/null
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
+HOMEPAGE="https://kanaka.github.com/noVNC/"
+EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
+S="${WORKDIR}/noVNC-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/websockify[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+python_compile() {
+	echo
+}
+
+src_install() {
+	dodir /usr/share/novnc/utils
+	dodir /usr/share/novnc/include
+	dodir /usr/share/novnc/images
+
+	exeinto /usr/share/novnc/utils
+	doexe utils/b64-to-binary.pl
+	doexe utils/img2js.py
+	doexe utils/inflator.partial.js
+	doexe utils/json2graph.py
+	doexe utils/launch.sh
+	doexe utils/parse.js
+	doexe utils/u2x11
+
+	docinto /usr/share/novnc/docs
+	dodoc README.md
+	dodoc LICENSE.txt
+
+	cp -pPR *.html "${D}/usr/share/novnc/"
+	cp -pPR include/* "${D}/usr/share/novnc/include/"
+	cp -pPR images/* "${D}/usr/share/novnc/images/"
+	dosym images/favicon.ico /usr/share/novnc/favicon.ico
+
+	newconfd "${FILESDIR}/noVNC.confd" noVNC
+	newinitd "${FILESDIR}/noVNC.initd" noVNC
+}
diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest
new file mode 100644
index 000000000000..f22c648655c8
--- /dev/null
+++ b/www-apps/openwebstats/Manifest
@@ -0,0 +1,7 @@
+AUX config.php 2106 SHA256 b71574e683824d9db53070d2037bd4c539e46d83029ae40c1adbabd92f438b4d SHA512 c4db28cffb2dd83bf54f483d57468cd0602680d8b40f471fb063a37a4a4ca3968157ef9aa0209c26d97a86855a1863c0908779bab0e54f6fe3b747cc38a887b2 WHIRLPOOL 73e4e8eb6b111302180cf6bcf86976e1bb38dbca550a93ce759f388280929879bba8cc1662e9b8aab70c60e262325dc1e72353d1bbaa00e23ab359f27c49e2b9
+AUX postinstall-en.txt 1245 SHA256 afe18f8bb893f91a5d523fdfcf359eaec0471521a5cfd077aaa8233a3c693c6e SHA512 b814a821aa70c1dbaa736976a7dc19c9589efa3f50cbb2686ce9059c339304bd224d7849265a64725805ee86463e948a15c24e2c807cef05a6f625bb463bc78a WHIRLPOOL f426687000fef51cd1716e08909ad6c18b05e5a1f17a64ef8512a35c6babf58301ff67516e7775c121a055bc3908a2a96089a4d81875b04e6724967a45b9fdbc
+DIST openwebstats-1.1.tar.gz 163477 SHA256 6378591300c68921fc2d5cd38ec9aaf4b00a4d34f97d3eafad2d22097030d926 SHA512 882a8aa672703e978282550437ea9944bc44c424c3a157acd10f35a42681721de4bd5dde60aa9e57e15d3b986b1b4d1c9f0e4adf0360a0d569aa46720b4e2eec WHIRLPOOL cced50e545688b80fd7a94bb7ce1c71fe9818a6a52d1fb32f789c2dac0a8bbe484809848e53baaa272f6da13af3900dae43d4f52d5650337cbea17f6e3ab8c23
+EBUILD openwebstats-1.1.ebuild 882 SHA256 1bebc6f0360ec3f9bd570f758863a7032c9937dd22a25db551518ff055fa3f80 SHA512 691df3b04ecb9f0748ddf2912fa500664ad9e5116c64e536292b1b71f03f8bf18e72f52b9aad4c41a2e07b57058278691f32eb0cb66b64eebb71b84c860e0a45 WHIRLPOOL 3d3a941ebf8b8c0bce69bf86429bcd251bc45ef76dcaf35d32b029596f2699b7c81b8c05ba5f95359690831aa52726c0e49cd284f9a8c57724b1d4f13a8e8577
+MISC ChangeLog 2484 SHA256 5ca4e5193a1bcda2292de43ccbfa6c98cae2925bed84bdac0e6e1d14e8645e65 SHA512 53b585ecc96543805316afe9b0b2634f806827752f4b19ce3a189e34a182b0745f55c4a86af3fffadd68194b43be413b554165f5505ba3b1b48aae4cb1a9210d WHIRLPOOL 5a0de6f1f0c02105909d37fbcee14de8399f3d96441b2cbe79c8951d9b2f470d50eae55cc7fff458a1b585228fc0cba4de6454825b6ef8fd9aaab07ec6fbf0b9
+MISC ChangeLog-2015 1212 SHA256 6001ff626610aa04dbced8d25d5a990541a715b5aa0ab6e5c3aa00118ffaa2ee SHA512 b36f051fb955ae25bb0865a4508452ef6d86a4e582c3541351d6a4cc58b09c4a83417cd5ddbe1c7a3c67cefdea316b89a350c9a270c848b454cbdf74d1bcedd0 WHIRLPOOL c669a68f901234704c354ed698e62eac464108790f20ed345b49bd417b04ee9d7d953f809f633a9d31ead3f48ec6ec4b3719f876cb51b03507b8406f3db54be5
+MISC metadata.xml 332 SHA256 cc30d6019142d6d4c2b5ea0f7606f94351aa4d251fe7e696418f6b36ed1530e2 SHA512 b3a5cd09143fa07cc7f0ebaed3382a34bd6ddfa0e28f4540a01356be6d4d4b4367dcf2b6ec901179526f1deb5f66ced1503dbe8fcf9e41b7addd400dde6dadaa WHIRLPOOL 12719eba6b31f576c3323f342f620dd6f6f9036636aaf6aaf03c928160b28560b8aff0a19d0353eb64943e629fe8145867568a9bc7e4985ac2599f59f1eab940
diff --git a/www-apps/openwebstats/files/config.php b/www-apps/openwebstats/files/config.php
new file mode 100644
index 000000000000..5523397582b4
--- /dev/null
+++ b/www-apps/openwebstats/files/config.php
@@ -0,0 +1,46 @@
+<?php
+################################################################################
+##                    OpenWebStats Version 1.0                                ##
+##                                                                            ##
+##        (c)2005 mathews_dm - <Davidmathews@open-creations.com>              ##
+##                                                                            ##
+################################################################################
+## Please read the README!                                                    ##
+################################################################################
+
+##########################################
+## Define Globals for OpenWebStats      ##
+##########################################
+global $openstats_web_dir, $databasename;
+
+if (!defined("logformat_combined"))
+{
+	define("logformat_combined", "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"",  TRUE);
+	define("logformat_combined_vhost", "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"",  TRUE);
+	define("logformat_common"  , "%h %l %u %t \"%r\" %>s %b",  TRUE);
+	define("logformat_referer" , "%{Referer}i -> %U",  TRUE);
+	define("logformat_agent"   , "%{User-agent}i",  TRUE);
+}
+
+##########################################
+## Database information below here      ##
+##########################################
+$databaselocation = 'localhost';
+$databaseport = '3306';
+$databasename = 'ows';
+$databaseuser = 'ows';
+$databasepass = 'pass';
+$db_connect = mysql_connect($databaselocation, $databaseuser, $databasepass);
+mysql_select_db($databasename, $db_connect);
+	
+##########################################
+## Logfile and Logformat are for the db ##
+## import in the class_apache file.     ##
+## $openstatsdir is the install dir on  ##
+## your system.                         ##
+##########################################
+$openstats_web_dir = '/openwebstats'; // Remember to include the stats dir
+$logfile = "/var/log/apache2/access_log";
+$logformat = logformat_combined; //example: $logformat = logformat_combined_vhost;
+
+?>
diff --git a/www-apps/openwebstats/files/postinstall-en.txt b/www-apps/openwebstats/files/postinstall-en.txt
new file mode 100644
index 000000000000..ed4c7cd9260e
--- /dev/null
+++ b/www-apps/openwebstats/files/postinstall-en.txt
@@ -0,0 +1,36 @@
+------------------------------------------------------------------------
+INSTALLATION
+
+The ebuild installs most parts of openwebstats automatically, but 
+you will have to create a database for the apache log records.
+
+You can do this using the following commands as the mysql root user:
+
+> mysql -u root -p -e "CREATE DATABASE ows;
+                       GRANT CREATE, SELECT, INSERT, UPDATE, DELETE ON ows.* TO 'ows'@'localhost' 
+		       IDENTIFIED BY 'pass';
+                       FLUSH PRIVILEGES;"
+
+Please do not forget to choose a password that is more sensible than 
+'pass' ;)
+
+Now as user "ows":
+
+> mysql -u ows -ppass ows < ${MY_SQLSCRIPTSDIR}/mysql/${PV}_create.sql
+
+You also need to set the MySQL passwords for the ows user in 
+the ${MY_INSTALLDIR}/config.php file 
+so that openwebstats can access the database. 
+
+If you use a special logfile format for your web server you should 
+also modify the log format in the config.php file.
+
+Make sure your access_log is readable if you want to use the update
+function of the web frontend.
+
+> chmod 644 /var/log/apache2/access_log 
+
+Now you can go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR} and use the
+application.
+
+------------------------------------------------------------------------
diff --git a/www-apps/openwebstats/metadata.xml b/www-apps/openwebstats/metadata.xml
new file mode 100644
index 000000000000..5551d3efd112
--- /dev/null
+++ b/www-apps/openwebstats/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">openwebstats</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/openwebstats/openwebstats-1.1.ebuild b/www-apps/openwebstats/openwebstats-1.1.ebuild
new file mode 100644
index 000000000000..4aff79996bfd
--- /dev/null
+++ b/www-apps/openwebstats/openwebstats-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="PHP stats application that reads Apache log files and imports the data to a MySQL database"
+HOMEPAGE="http://openwebstats.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="dev-lang/php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README
+
+	## Main application
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	cp "${FILESDIR}/config.php" "${D}${MY_HTDOCSDIR}/"
+
+	## Docs installed, remove unnecessary files
+	rm -f "${D}${MY_HTDOCSDIR}/README"
+	rm -f "${D}${MY_HTDOCSDIR}/CHANGELOG"
+
+	# Database creation
+	webapp_sqlscript mysql "${D}${MY_HTDOCSDIR}/openwebstats.sql"
+
+	# Postinstall instructions
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	webapp_src_install
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
new file mode 100644
index 000000000000..66e8ba655d7b
--- /dev/null
+++ b/www-apps/otrs/Manifest
@@ -0,0 +1,6 @@
+AUX otrs.service 246 SHA256 6d5f64a524efcfe103e57be41e70c65435d754ff12aac3de2d466f9c9a7b08ac SHA512 52fbaf320b3943ec51b178cf0558f77d208b6f735e3278a790f48c74770bfc0b87888ac9225b43c0f7f3b0149296497b2c405b0424995d1d6f83a33b5d072ae7 WHIRLPOOL 55cd6e131387e6624f082539fb52d94614296e4d49c7bb03917cb8672a7080cb7e21f67e307ab8d6fe2db8e114f0475c8aef2c8996269a2c737e1c9e42c6e17b
+DIST otrs-5.0.23.tar.bz2 20617459 SHA256 5e12affbccde0cae5738de1d0c7334e655b4c373ea668913ec54f31564b128c4 SHA512 c6ae594178e1f0eb59b87a8d08b610940ba7ad0a44699ba73568c6844a49fc03e2486bce393aaf0dd78da9c64790b9fae72cfad65c9c6955c0524fbf27b95d7e WHIRLPOOL d4e9e23fd54993b7c7a8559585c0fd3e934424d24c5283efbfc204ad202478910f3dc9fbf9a4073d6c4eb237320f4ef81207e715215c63e405c032a4dca3bd6d
+EBUILD otrs-5.0.23.ebuild 4124 SHA256 96a933a791f7609f8ad4e98ea968f3e1bc77696b346c2fda12675d5eff4eb025 SHA512 bca3059455541b65749e612773d46983c5b6eb8b7e64696a9b807c07c26237e6b072b4269737efe2b94e5ecded5bbf8388261223b6c65d4c47a1689f57ad6479 WHIRLPOOL e7bd82142b763039a3de58099aba066301ca9d58107388d64cf70c8ee3d45db754674855844bc3efbd4d6d65720de2d440aebd4cfdc16bce10c5ce845cee563a
+MISC ChangeLog 4411 SHA256 05ebca40f23bd5a1da9832c1b9f420138c236015ec2856229cac84d69b2d4aa3 SHA512 ef11c94f71cb91757b9c947f9c1a7d23dcef984d1e3b4fde267f8c01dc736b0cea1ad11f857a11a69a6db66a0db0866c9b7b3cac11fb2480b863cc09c8081dcc WHIRLPOOL 2c6d799efcf01b507002505b9d79faa3accb5dc1e795d524acdf6a29319786c71fcd171431deeee76585235ca65b0b5fefb50462c322a574e747488a023689a3
+MISC ChangeLog-2015 10802 SHA256 e119af3a3f51877e1c94f598c142decca79cd5f5a80e5130b7d193319a36a41e SHA512 b8b51d1ab78779013c79f7859fe94802a55eca13d69db0e6e5cff750e0365cef94950fde3a0f079b82dfd450bc1d6471e7a6ea61788cbd435955eb550dcd6185 WHIRLPOOL ef676c684316f8c8cb434258c90acac0cdd4aa0c4f45d0f874838d1131d9337e9514e235ba4f3939076de8634ca19a942267b50632ddbc1223082eb05ea1a7c3
+MISC metadata.xml 631 SHA256 b88be5c308216a44411243246798a15f65f0be083860121751344cb9db2a12c5 SHA512 d50b116faf2a7e1b7a9c904f112fe3606e331984e4056e18962d591af2537fc5b7186c6006d50a02306635856e7e6051c3a25f1c9781662456ee84d1de278614 WHIRLPOOL 39fd9fe9c3927ac24d9136fb2de6e022ff01ae201bf1f8c62667057669658bce1b3fa90ccd4046faecbdb8bad00484625de7fab446f408d7d4929591e7bdf982
diff --git a/www-apps/otrs/files/otrs.service b/www-apps/otrs/files/otrs.service
new file mode 100644
index 000000000000..546ecdda8f93
--- /dev/null
+++ b/www-apps/otrs/files/otrs.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OTRS daemon
+
+[Service]
+Type=forking
+WorkingDirectory=/var/lib/otrs
+User=otrs
+ExecStart=/var/lib/otrs/bin/otrs.Daemon.pl start
+ExecStop=/var/lib/otrs/bin/otrs.Daemon.pl stop
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
new file mode 100644
index 000000000000..38448c9a8c7e
--- /dev/null
+++ b/www-apps/otrs/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+	<email>lists@xunil.at</email>
+	<name>Stefan Weichinger</name>
+	<description>Proxy maintainer</description>
+  </maintainer>
+  <maintainer type="project">
+  <email>web-apps@gentoo.org</email>
+  <name>Gentoo Webapps</name>
+  </maintainer>
+  <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+	<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
+  </use>
+</pkgmetadata>
diff --git a/www-apps/otrs/otrs-5.0.23.ebuild b/www-apps/otrs/otrs-5.0.23.ebuild
new file mode 100644
index 000000000000..172bd42f6b4e
--- /dev/null
+++ b/www-apps/otrs/otrs-5.0.23.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user systemd
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="https://www.otrs.com/"
+SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="media-libs/libpng:0"
+
+RDEPEND="dev-perl/Apache-Reload
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-XS
+	dev-perl/LWP-UserAgent-Determined
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	>dev-perl/Net-DNS-0.60
+	dev-perl/Template-Toolkit
+	dev-perl/Text-CSV_XS
+	dev-perl/TimeDate
+	dev-perl/XML-Parser
+	dev-perl/YAML-LibYAML
+	apache2? (
+		mod_perl? (
+			www-servers/apache:2
+			=www-apache/libapreq2-2* www-apache/mod_perl
+		)
+		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
+	)
+	fastcgi? (
+		dev-perl/FCGI
+		virtual/httpd-fastcgi
+	)
+	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+	gd? (
+		dev-perl/GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pdf? (
+		>=dev-perl/PDF-API2-0.73
+		virtual/perl-Compress-Raw-Zlib
+	)
+	soap? (
+		dev-perl/SOAP-Lite
+		!=dev-perl/SOAP-Lite-0.711
+		!=dev-perl/SOAP-Lite-0.712
+	)
+	"
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
+	# so we create the apache user here just in case
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+	enewuser otrs -1 -1 "${OTRS_HOME}" apache
+}
+
+src_prepare() {
+	rm -r "${S}/scripts"/auto_* || die
+
+	pushd Kernel >/dev/null || die
+	local i
+	for i in *.dist; do
+		cp "${i}" $(basename "${i}" .dist) || die
+	done
+	popd >/dev/null || die
+
+	# Fix broken png file (and see pngfix help for exit codes)
+	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+	if [[ $? -gt 15 ]]; then
+		die "pngfix failed"
+	fi
+	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+		|| die "sed failed"
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+		|| die "sed failed"
+
+	grep -lR "/opt" "${S}"/scripts | \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		|| die "sed failed"
+
+	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+
+	eapply_user
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+	einfo "Installing cronjobs"
+	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
+}
+
+src_install() {
+	dodoc CHANGES.md README*
+
+	insinto "${OTRS_HOME}"
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+		Custom Kernel bin scripts var
+
+	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
+	insinto /usr/share/doc/${PF}/
+	doins "${T}"/crontab
+
+	local a
+	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+	do
+		keepdir "${OTRS_HOME}/var/${a}"
+	done
+	doenvd "${T}/50${PN}"
+
+	systemd_dounit "${FILESDIR}/otrs.service"
+}
+
+pkg_postinst() {
+	einfo "Setting correct permissions ..."
+	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
+		--otrs-user=otrs \
+		--web-group=apache \
+		|| die "Could not set permissions"
+
+	einfo "Installation done!"
+	elog "1) Rebuild your config now by running the following commands:"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
+	elog ""
+	elog "2) Enable cronjobs with the following command:"
+	elog "crontab -u otrs crontab"
+	elog ""
+	elog "3) systemd users: enable and start OTRS daemon:"
+	elog "systemctl enable otrs"
+	elog "systemctl start otrs"
+}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
new file mode 100644
index 000000000000..ddfb892e6f72
--- /dev/null
+++ b/www-apps/owncloud/Manifest
@@ -0,0 +1,11 @@
+DIST owncloud-10.0.2.tar.bz2 30963258 SHA256 3645214d6b9527dc218b4cdcbbf1d01809aaba14435d644b545bee0274c88fd0 SHA512 1d83e194c6d1835f47051ea334b39650b9ce394eacd91199283fe926aa4b5ae88e709f8802547ec7e8e2935ea0064ba1f42bdbe137552e6c75ca4459c7e36ad0 WHIRLPOOL cb048e045816aecd0597c7c1a7af7e970d717119e8c9ad4b33a64148626eed566652bd427869f3191e1e2f5a54dd70aa9ed672bbad192a741f70f119ca99d2a6
+DIST owncloud-10.0.3.tar.bz2 35358244 SHA256 f489e072090d51e47b390109297d7aaee56dd39c42d8d149fb0b7d002c3ac38d SHA512 bafba0416182bc4051e2664c0d2b328912c8c7c49b42f8f6e9540fab40ec5d49c592f84d639ef32380291cbe4d8b8acce4b40dba8a6c9e2440c29fd9943b274a WHIRLPOOL 9772a7a8e36f9f102019c2729d74d7e963b4148650c1f6a8396630b5a0865a988d46aebcb9b93393f587df5a06cb6c39c1881f0b7a3d68309368ade5f2deb4d2
+DIST owncloud-9.0.10.tar.bz2 28522993 SHA256 dca06f13500bf01b4b54c2229d43d032901b60b9976aef55176199f02c573ef5 SHA512 da0980ef5180097a56f663205e42824570dd000bddd337ff3e7ac7ee76b76b976b18ed7f77ca250ab974c934973811e8d8d384ca7951a043ad90148583dac577 WHIRLPOOL bdf29f75b23616f859b93688339ecc743e463e1c830e6dea10da9d076a34644b7b05d421c86fc01f676a4eb65118464b4d60e85b611b429835cdd4bc6a8a7b79
+DIST owncloud-9.1.6.tar.bz2 29134671 SHA256 3268a989e586a0f7bd67d4c6ac8dbf3326755bbcfcffdcc8eca6a32090410ed5 SHA512 40b4fd03c188624c059fed6737b102cae03c6b1c713644733eae3e0cba8e86db6856e7a831bcc2bff660dfc4eacd979f200ec55f8bc1e36e3209142f21f7989c WHIRLPOOL 8d8affc086ac1cf3a58dd2ca4ad64ffac1809389bc62b2b47e10dea03ab166c0d91047784b434098e1347e1fcc3f16e3a79b4113e05e0d5310badac879575970
+EBUILD owncloud-10.0.2.ebuild 1263 SHA256 06f0fc70ef3f2d59bf16ed62c5a7f6e4b699dda5cd4453c24717dfab363a4839 SHA512 7fdfe4e0d2bf89c0ea34b101aedecdc6b1409e369fb1bad576cad9199a17257b933a2adced22563ac6e0dc62660a21cd22775b3e2c2f09927e278c6791c96489 WHIRLPOOL fcf99e216a4159f579ca0845a4f684522f974b09289fd83f1cc8672031343f6a31cad656bcc6eb8fa5cafdd4d4bc423b4eed90974a1e3f8ddd2af1ca89b5954a
+EBUILD owncloud-10.0.3.ebuild 1263 SHA256 06f0fc70ef3f2d59bf16ed62c5a7f6e4b699dda5cd4453c24717dfab363a4839 SHA512 7fdfe4e0d2bf89c0ea34b101aedecdc6b1409e369fb1bad576cad9199a17257b933a2adced22563ac6e0dc62660a21cd22775b3e2c2f09927e278c6791c96489 WHIRLPOOL fcf99e216a4159f579ca0845a4f684522f974b09289fd83f1cc8672031343f6a31cad656bcc6eb8fa5cafdd4d4bc423b4eed90974a1e3f8ddd2af1ca89b5954a
+EBUILD owncloud-9.0.10.ebuild 1273 SHA256 3b36896967f02a42476783335e62c998fda457fdd45c74b21ff3253db74f119c SHA512 4220760318016c1202e7176bd19741ef502d24b6a0f156dfb3067bfa4e54d81dc088d3c9e255921731a9079fe1adc0ad317c1bad8d04e19fa5c8b169a84ce750 WHIRLPOOL aa94460347758db77eba2c44f043c43d08a4931388d9ffb6ac02a2b5803d6d1b848565c5a6087d367104eeb8f220881c1e6d60ccf323c25168d4014992c8cd10
+EBUILD owncloud-9.1.6.ebuild 1273 SHA256 3b36896967f02a42476783335e62c998fda457fdd45c74b21ff3253db74f119c SHA512 4220760318016c1202e7176bd19741ef502d24b6a0f156dfb3067bfa4e54d81dc088d3c9e255921731a9079fe1adc0ad317c1bad8d04e19fa5c8b169a84ce750 WHIRLPOOL aa94460347758db77eba2c44f043c43d08a4931388d9ffb6ac02a2b5803d6d1b848565c5a6087d367104eeb8f220881c1e6d60ccf323c25168d4014992c8cd10
+MISC ChangeLog 9558 SHA256 993824a3dc42957bb18526f71e3a370680fb364aecb1253d0ec6792d88c96f8d SHA512 1f239e61be68d1ebe20006585e129313ce7240099eb5d5fb237b9f34970c6ed3ca4f69488d9a7e6a0957b87926f8ae07af8ade47bf722509afe9286ae61bd892 WHIRLPOOL fb099a543229e3be526e8dc2158ce6835f2cd41062c4a935ccbd58d178a3e9f3f57ab032fe31db1af416e790715251b13804aea9f035f9ee09bfacff20ae9183
+MISC ChangeLog-2015 15443 SHA256 c545ba9a124b221a2ee650ee35ef522f47113f5caf51eed5357f17131178f2ff SHA512 fecc70966e3fa8a133de71fd595ba0643932e48ad4936fb8c163896990d7fa0ee696720abb8c4fe1dc6719c599fa7a38147960a5f715f00bd8f66496829541ce WHIRLPOOL 277e8e904340b9f7bab1e8478b411140b9d5bbf7829a7c40e1e0af92313212082ddbfd1210fa9cf397edddb8c4c11943886c94e1d757341a5827bad39bc578f2
+MISC metadata.xml 362 SHA256 40f613b47809fcdbbd320f6c96b00eed0b36c221373c46173e92ad1e6180d491 SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99 WHIRLPOOL f4c4f3b3263dd1b90e19d83b908f6b8801cdcc65bb49b57275e1f23fd470f25e86b0a79cf6c2660edee4083abfab73134594fd0febbc4dad6dd96d7fdcc52a9b
diff --git a/www-apps/owncloud/metadata.xml b/www-apps/owncloud/metadata.xml
new file mode 100644
index 000000000000..6608c097e970
--- /dev/null
+++ b/www-apps/owncloud/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/owncloud/owncloud-10.0.2.ebuild b/www-apps/owncloud/owncloud-10.0.2.ebuild
new file mode 100644
index 000000000000..2c070014fe55
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/owncloud/owncloud-10.0.3.ebuild b/www-apps/owncloud/owncloud-10.0.3.ebuild
new file mode 100644
index 000000000000..2c070014fe55
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/owncloud/owncloud-9.0.10.ebuild b/www-apps/owncloud/owncloud-9.0.10.ebuild
new file mode 100644
index 000000000000..85552c665ee3
--- /dev/null
+++ b/www-apps/owncloud/owncloud-9.0.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="<dev-lang/php-7.1[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	<virtual/httpd-php-7.1"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/owncloud/owncloud-9.1.6.ebuild b/www-apps/owncloud/owncloud-9.1.6.ebuild
new file mode 100644
index 000000000000..85552c665ee3
--- /dev/null
+++ b/www-apps/owncloud/owncloud-9.1.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="<dev-lang/php-7.1[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	<virtual/httpd-php-7.1"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/ownpaste/Manifest b/www-apps/ownpaste/Manifest
new file mode 100644
index 000000000000..6313b6d8229f
--- /dev/null
+++ b/www-apps/ownpaste/Manifest
@@ -0,0 +1,6 @@
+DIST ownpaste-0.2.2.tar.gz 22030 SHA256 98e6bb80ff395617ce037968a739f8f71c1d0fd140914317986a9cc68e8878df SHA512 2a55e89e00e7530aafab427e7e2e4015391a68a8c7b8843cdd5b1010f492a4ecb6f28f33b2a92812a7072a35f3437f08ac1635867b492903256e92dabcb9beaf WHIRLPOOL 1ee3e1a8ff2756c1062fdb0492d96d9ef17d30919227f67480fd7bc1e73e37ca723acecbdcd243e30f5e554a4c11e8bdaa55f804a29eb402acf9b1cd05848a00
+EBUILD ownpaste-0.2.2-r1.ebuild 1306 SHA256 bd6fcda03918fd79b26090e03dc601b0dc81ac42513109677365615cb6335d03 SHA512 8d6e133cb4c577ed8e2a7664cbd19bc8a41989aa6f4a05370598f447e98c1713078bc175d2ba7898f76141684dbc468502f2f743b3ba9847b90551dce1e4db41 WHIRLPOOL 47b53536da43a73424c056841f4e414c56e415ea96bc1e4ad11e7c08bd4b39687c7c36cd20b2d8e759718a9a77551d4576b52d14433d01beabc4f8a0d110823d
+EBUILD ownpaste-9999.ebuild 1306 SHA256 bd6fcda03918fd79b26090e03dc601b0dc81ac42513109677365615cb6335d03 SHA512 8d6e133cb4c577ed8e2a7664cbd19bc8a41989aa6f4a05370598f447e98c1713078bc175d2ba7898f76141684dbc468502f2f743b3ba9847b90551dce1e4db41 WHIRLPOOL 47b53536da43a73424c056841f4e414c56e415ea96bc1e4ad11e7c08bd4b39687c7c36cd20b2d8e759718a9a77551d4576b52d14433d01beabc4f8a0d110823d
+MISC ChangeLog 2408 SHA256 b1f12bee32ec1dcd07eb814437f4278b0eab4adb97b0e642047536cf29baa291 SHA512 e81235e088dc1fcba79570d537c6773ff6564ad32c26ead2657525b9307d50d85816274017caa50ef03352c6aef187b6d97f15305e1dac2ef7ef86626f7b927a WHIRLPOOL af932ff585eb3fcc176d605173360a4104a785c6a05cdf48d6fa5a5343b8b74b119cf033b478e94baedae544c2f689abf5391cb2a72ef18944c3fe8b6d641c37
+MISC ChangeLog-2015 1353 SHA256 38442917c199755ae34958a1f1530626f661347e46739f8b730a132b4f076697 SHA512 9208335a95fecdc7eddf64deed0c961e8720edc32220467fedf30dae153ba9b089f20aad030d80654e7856bceec8515566c09b85b92932789b0f1deaf306ee09 WHIRLPOOL 95b3e3d18c7a5d910d2cffff2e25b44e04367dd39208a69dce6e1d39d62fa5dc69e57a4781f8fda0ca54ab917c684636a8ae97fcc00e7c9ede8bed6a0196ea79
+MISC metadata.xml 452 SHA256 b56fc487607b18c72a63727e4a39c91369969b36e5ae08aeb243a4841a64b10d SHA512 a40bf5d6d52d1bfb10b01367bc1bfc7520349699ea3b8218619d93c052cb9c6425cb4bdf2415b48c428007a83d8a1e4344fbc7cd59fed75822083cd50ee1b4bb WHIRLPOOL e797b7ac5c314a5da7b049384f3c0a0d6ae7cb4ba424eda8ea998c8ca2dda1a4b7b2d2b7750ccdc4a947e471fb0899c64479885b4db257db1d9f16f40c8ad1be
diff --git a/www-apps/ownpaste/metadata.xml b/www-apps/ownpaste/metadata.xml
new file mode 100644
index 000000000000..e02a6833f99a
--- /dev/null
+++ b/www-apps/ownpaste/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="pypi">ownpaste</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..f141d29af9e8
--- /dev/null
+++ b/www-apps/ownpaste/ownpaste-0.2.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
+fi
+
+inherit distutils-r1 ${HG_ECLASS}
+
+DESCRIPTION="Private pastebin (server-side implementation)"
+HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.python.org/pypi/ownpaste"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		einfo 'building documentation'
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-apps/ownpaste/ownpaste-9999.ebuild b/www-apps/ownpaste/ownpaste-9999.ebuild
new file mode 100644
index 000000000000..f141d29af9e8
--- /dev/null
+++ b/www-apps/ownpaste/ownpaste-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="http://hg.rafaelmartins.eng.br/ownpaste/"
+fi
+
+inherit distutils-r1 ${HG_ECLASS}
+
+DESCRIPTION="Private pastebin (server-side implementation)"
+HOMEPAGE="http://ownpaste.rtfd.org/ https://pypi.python.org/pypi/ownpaste"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-0.15[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		einfo 'building documentation'
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-apps/pcgi/Manifest b/www-apps/pcgi/Manifest
new file mode 100644
index 000000000000..34b819c32715
--- /dev/null
+++ b/www-apps/pcgi/Manifest
@@ -0,0 +1,6 @@
+DIST PCGI-HOWTO-1998-08-13.html.bz2 6483 SHA256 b6ba268bc1b41aca82224193bbcb3a882e0e097d6cbe598486a3584c7a7e8610 SHA512 8b86e0c166055492564ee919d8f983f8f9df7927aac63f9f63068f5dd837a675c3b230801763d2623401095515fe138b5c9ab222d972bbbcedce36ad1b576d16 WHIRLPOOL ac6c5226cf2f8c1815aa1784b9349734174fc8e9b235474408f2ec517cc16065c252f21b67517e790bbfbf8e1033e7e1b0b9a56d093f1753307a39b3efcb1e06
+DIST Zope-2.6.1-src.tgz 2318685 SHA256 0629b4d1af328641e2d2ea324899ab174561cdd9dea974bc02ea01e83e67149a SHA512 b714c533f818cbc16bd6c5f899049a4f214d5aad06a98f822f886a33fd5636b416cf8e944757f4a50d39daaac482e2af24dcaf4bc0ab795b9e9d25c961525451 WHIRLPOOL c34b10f3d69afd673417b05a5087fcd9332c69a962122fe6bb9248000bcb6d143fa15c134a765307c7f34f358d4b87921b123d0ba066022f3a3b880dde585226
+EBUILD pcgi-2.0_alpha5.ebuild 1455 SHA256 a62274ddac272223220d543a4de7d1feee0faf609492bd159632caee32aaa693 SHA512 da6abbcda1c13fd5660f92e89adbf5a5fcc977aab41b589bd9d5b019b2dce808d31d60c713ebf3fe58fd88654079dac897a0ea30114e24b5a0923996d5116772 WHIRLPOOL fa5b0a1541f7a7f1bbc3aa391d656cf3b4c3ec41747d41cc9f51f5df9bce898df835ad06fdebdc8b1c5639af8e99c6c5f1fa83fbe43f85f11dfc3440853485b1
+MISC ChangeLog 2428 SHA256 8d01ea84585788e9c2c4e44353923ae47a1b9fc5d60020cad1bd641739284578 SHA512 503385180f97cbd78ce5c39001aaa0a964b1ceb3c4d8636792be294e10db97901e8004c1875b66a897ab8b0984a7392093a4e0a986ab72a3a76d17dae3958a29 WHIRLPOOL 11cb695c37136e40ba5e49d0860817fb66d144d230a5f7d7466491d118451d7c5c985f2daecdc4c70c1fc59cd80beb9ff7622471ba37b93d1bc103ed187da4e3
+MISC ChangeLog-2015 1430 SHA256 b79092cdacb98f2a8b791c86e7baacc9122e709dbef2c1cfe09b329728c00079 SHA512 6efb676d30fb5296000b56a8b72761fb3a485768179e319657586a3d85d1fdf844a5fdddc8a17eb061f44cd51c7bb5b7b13d037a89942f807e493c5f43a71c7a WHIRLPOOL 8937b8d1cbc80988816a747c8e0b2e140bbba793ab072358b4b6d42648e4856a48e770ab11179ecc6147a66dc19c69a42f51139898fd586776b3e5794dcd2aee
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/pcgi/metadata.xml b/www-apps/pcgi/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/pcgi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
new file mode 100644
index 000000000000..c9815cd57798
--- /dev/null
+++ b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# this package is ONLY available inside the Zope tarball!!!
+ZOPE_PV=2.6.1
+ZOPE_P=Zope-${ZOPE_PV}-src
+S="${WORKDIR}/${ZOPE_P}/pcgi"
+
+# the only real docs about it are on the author's homepage
+# the html.bz2 file is a copy of http://starship.python.net/crew/jbauer/persistcgi/howto/index.html, renamed.
+# this is specifically done as every link I have seen is to the old URL of the
+# author
+DOCDATE="1998-08-13"
+
+MY_PV="${PV/_alpha/a}"
+
+DESCRIPTION="Jeff Bauer's Persistent CGI"
+HOMEPAGE="http://starship.python.net/crew/jbauer/persistcgi/"
+SRC_URI="http://www.zope.org/Products/Zope/${ZOPE_PV}/${ZOPE_P}.tgz
+		 mirror://gentoo/PCGI-HOWTO-${DOCDATE}.html.bz2"
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="${DEPEND}"
+RDEPEND="${RDEPEND}
+	dev-lang/python"
+
+src_compile() {
+	econf || die "econf failed"
+	emake all creosote || die "emake failed"
+}
+
+src_install() {
+	into /usr
+	dodir /usr/bin
+	dodoc ${WORKDIR}/CGI-HOWTO-1998-08-13.html
+	newbin pcgi-wrapper pcgi-wrapper${MY_PV}
+	dosym /usr/bin/pcgi-wrapper${MY_PV} /usr/bin/pcgi-wrapper
+	dodoc MrCreosote/README.MrCreosote README Test/README.parseinfo
+	newdoc Util/README README.Util
+	dobin MrCreosote/pcgi-creosote MrCreosote/creosote.py
+	dobin Util/killpcgi.py Util/pcgifile.py
+	dobin pcgi_publisher.py
+	newbin Test/parseinfo pcgi-parseinfo
+	cp -pPR Example ${D}/usr/share/doc/${PF}/
+}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
new file mode 100644
index 000000000000..003d65ab0dd6
--- /dev/null
+++ b/www-apps/phpBB/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-en.txt 507 SHA256 75a4c64f7bcfe2594299aac7cb868b2aff740579b9dee076c8b04ff8e2988d0f SHA512 dc54de4de270eacd4ef765ad1537333229a6acbf6495f88f6c6a7f555fcf643177f03f690c426f08eea63a4988d113b39fb519162b26c6200b14ee387f1ebed0 WHIRLPOOL d688107ff8b43e17c7978fc4cbea6ab9a0bb037a16830a384033cb8e5db87ce86f15023499ff0544fdeb76dd3cc089222d2660cd225031d0bfaf898e0e6059dd
+DIST phpBB-3.1.10.tar.bz2 2150999 SHA256 198fda1a0bd833d42e0d4f4fe26a47d656a6e087ed9a561e06b0940de131a22c SHA512 077a529075ea4e0691f9125be521b3fa8d4a078f9234b40bc5495faf00e1389808da40176ab8c8d9c66db259ebbf252d7292919d5c8e96e93c0bbda8d19695e2 WHIRLPOOL a41d9a602563a23fcf644967c374c0af4ae28e6a003e7fe0bbafe7af87c9417a87e0ec96978dba7819e022a46c46383e5ff19214ec7d39171146f689c0054565
+EBUILD phpBB-3.1.10-r1.ebuild 1197 SHA256 ce3be4149c43cfd628e58ba68ce44a631a8b737d21d1b054b4d7dbd6b1084664 SHA512 038a9b1cd4118b9b3892e8abaddeb157a801236e315a7ed971960d97f7e82c04bee1f4ac193d45354c4145eb3b2ace0e12b6649472e5924bc12499819a08907c WHIRLPOOL 70730338066ee94d0078aca32cb2aabe6471312377531fa2276fd35afc7bd1fc815156e2d346a357fc1c71f8793d39c305a64ff6c8e2ae24f4f16ec74444f272
+MISC ChangeLog 2552 SHA256 0f94d06b2cb74f47bbf25a8eac957ef5cb601ea03f3a720b7f06e1d58d42dcee SHA512 cf837e5cb0666fda6e51a5cd0f2adcbda05efb991b22fdf443103167044ae22e0997a0c860a2245cbcd02f40f1de7e461c0f99e200da72ae956d32cfe21a6b1b WHIRLPOOL e05aa4ad0512e0a128a95c5c32afd90cc7d4b049b5b85d1991c115fc85be6aae8b8b37e64ea284f3723a3a4b10c49638e26e1f2f723ac4c5332b0c4dff742dfd
+MISC ChangeLog-2015 9092 SHA256 6274d5bc06d5b6c6a2cc0637933972306a88e7a298c58a5faddf50f5a2c7ddbb SHA512 0e783f8038832216dfc6bb17a9356e0fa785987c6338541aea8c639358b9d73cffe35f13bfc99f6824c0266eaa6d60bb870b6d3c356260774dcc6098901c1d21 WHIRLPOOL 50b63659878245c5e76ce61103badcf755e35906609013c2a57f172db60e3e464d5988ac30e69161e310518486835b05bea49eaf472a44bb0ba4a49f6c88162d
+MISC metadata.xml 398 SHA256 7eddc344f26de94a728895b5ea2d6e1f6fa52efe2f3dc0ae3e9cf6f65183583d SHA512 60e852825bd7bd49fd9607383dd089e27da9a15adf8d4a065c46bbef9eaf87a13112cccb57ee9a5c9c0774a57b3e712d5c0611d8783b442b58c881e102499438 WHIRLPOOL cb9af7fab94461238b0df330d055ccb563b48b62673b5b024e5e932b40ab459204963d1e87bdd2f255a0bff5bbe2af95c1430dc7fa6eb3ef7dd97b614e743103
diff --git a/www-apps/phpBB/files/postinstall-en.txt b/www-apps/phpBB/files/postinstall-en.txt
new file mode 100644
index 000000000000..6787a37ca813
--- /dev/null
+++ b/www-apps/phpBB/files/postinstall-en.txt
@@ -0,0 +1,22 @@
+You are almost done!
+
+  0. Setup a database (e.g. MySQL: see 
+                       http://www.gentoo.org/doc/en/mysql-howto.xml)
+
+  1. Login on
+
+     http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+     and finish the installation.
+
+  2. Move into the directory where you installed phpBB and remove
+     the "install" folder:
+
+     # cd ${MY_INSTALLDIR}
+     # rm -rf install
+
+  3. You can now launch your browser and point it to your phpBB site:
+
+     http://${VHOST_HOSTNAME}/${VHOST_APPDIR} 
+
+  Enjoy phpBB!
diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml
new file mode 100644
index 000000000000..dee8adaf3281
--- /dev/null
+++ b/www-apps/phpBB/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+		<description>Maintainer</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/phpBB/phpBB-3.1.10-r1.ebuild b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..f3dc1e75af3a
--- /dev/null
+++ b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="An open-source bulletin board package"
+HOMEPAGE="http://www.phpbb.com/"
+SRC_URI="http://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86"
+IUSE="ftp gd imagemagick mssql mysqli postgres sqlite xml zlib"
+
+PHPV="5*:*"
+RDEPEND="=virtual/httpd-php-${PHPV}
+	=dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?]
+	imagemagick? ( virtual/imagemagick-tools )"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}${PV%%.*}"
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/cache
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/upload
+	webapp_serverowned "${MY_HTDOCSDIR}"/store
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	# phpBB needs docs together with the other files.
+	dosym "${MY_HTDOCSDIR}"/docs /usr/share/doc/${PF}
+}
diff --git a/www-apps/phpmp/Manifest b/www-apps/phpmp/Manifest
new file mode 100644
index 000000000000..fcb51d386268
--- /dev/null
+++ b/www-apps/phpmp/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-en.txt 33 SHA256 c5c688eb7c8da48d82cc9fd5e062e7f02880b58f7d293b4af97c23d5884974da SHA512 2fed8859caf849a060c11bd07d029fce8f44794b42dce9bf7bc00437561bec47ce8a031258d78582bd742fb9b4912d13ba8b518e88d6a11cd01c8e67a3f86aa4 WHIRLPOOL 4d7e2754698cae369bf300894c64f86fe2af5a7f7e87e92590ecb843e42cb09e9aec3b098a911124554ef433ccff082b1edb11d95ddb2ae70762b44857523072
+DIST phpMp-0.11.0.tar.gz 20886 SHA256 7f2a168632839f2c476275a1cff41ea3295b9ebbe85e4e3cc691609258ab0103 SHA512 ed629e5ae34376c841a2d258097b1ce1181fe1fe5e3c6b752b58cfeac07ebd11183315c90501913ba9e99ed281b62c154ee61431b882414eeff58828d69ad948 WHIRLPOOL b81b0ddbe57fdbdfabb5ea4192b4cf649abda93bf5a378989236bf113441511f57bb58b82acc3883bb34d09bfe19da2e577dec0d8abaa1206da7f77005e353d7
+EBUILD phpmp-0.11.0-r1.ebuild 805 SHA256 9cd1d70671e90b74d61d28af507bff444d9f80ecff582edaf08c85a18b6c1525 SHA512 b3125bb888558d0182cf52af164f557c93b70ee2fd9f0a2a9a8e5fed8b91ec70455059b358659694ccf2367c64d80117df7d1b6d3a0b2a350e753352e69d6d42 WHIRLPOOL 3aefb896a5315a53e30580d883da03d81e337c104e052b4ca0c7d01e2a9bb39de8b1d06a9ffacebfa4abde0db13f6b8a12f69398332f50c96cc4f38f1c24136b
+MISC ChangeLog 2968 SHA256 64a4e11d1d9e1c0835f371b7bfaafdf7d5255dae43755da496f83a85782aa169 SHA512 7aa58cc458ff11037c96fc276875c14e863f4fdb6b7320003680bc383463cb172015eded0370b660bb68279b395495fb6b350c8ffc8f7da4cbb4722907e52562 WHIRLPOOL 42bd7b1765bd29ea2cdaeebd2fe6198d82351269bba824e24f19033e53f9b027fe46a5ca87da6778fb6bb0a532d45ed111eaeff1cb53aff755373b060611a292
+MISC ChangeLog-2015 4463 SHA256 ce6139ea664fb51930902c5b58e05a3aad3c5ca6bc41fc0b133f7c84372dc041 SHA512 9e57723c37323b42ca09708e51f852a62b3e70b0e4e10f47b057c12f4e66cd225adabe2fb91353fa6a44eddf1402e677970ae2e4f081916e7ce536d23626b657 WHIRLPOOL 174e755e6cf65eef61f2bb9a1369d47e8cc89533fdc640b93096255f4b3da9ce634f77967d319f5a838438f20d3773cdbd261a4d8fa55efc797f56764c081b8b
+MISC metadata.xml 441 SHA256 bf21905b14d3e0e93730b3acd70e3273dbe800c6f355bab604bd983200a957bb SHA512 9624b2c3d38396a3250006383e0bf9d0b2bd6d3d30a69c00e3f09859d04045a00defa274e8557e7b733cde8e3ecabc2d4587b85d606a37e71f652b53cb20457d WHIRLPOOL 6950336078768ff828806122e83373975757378d64d9691adab19c1ec10597d0a6fd866051b136479f46c2005045f3823d6e49c95e82008fa0e8ef615162b456
diff --git a/www-apps/phpmp/files/postinstall-en.txt b/www-apps/phpmp/files/postinstall-en.txt
new file mode 100644
index 000000000000..7e1cae079973
--- /dev/null
+++ b/www-apps/phpmp/files/postinstall-en.txt
@@ -0,0 +1 @@
+Remember to edit the config file
diff --git a/www-apps/phpmp/metadata.xml b/www-apps/phpmp/metadata.xml
new file mode 100644
index 000000000000..e438e02eb7aa
--- /dev/null
+++ b/www-apps/phpmp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">musicpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/phpmp/phpmp-0.11.0-r1.ebuild b/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..b020b1e08557
--- /dev/null
+++ b/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit webapp
+
+MY_PN="phpMp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="phpMp is a client program for Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org/"
+SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc ChangeLog README TODO
+	rm -f ChangeLog COPYING INSTALL README TODO
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/phprojekt/Manifest b/www-apps/phprojekt/Manifest
new file mode 100644
index 000000000000..56f9032cb85d
--- /dev/null
+++ b/www-apps/phprojekt/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-6-en.txt 235 SHA256 c6edc429bf4b8ef5839629e78a623172da9ea14683b17fcc6bcd843ee1f84167 SHA512 986193b1a03fdff4d62c3b79c28e4b9f6e9f71f994280e6ba5d0dfb84e212aa38ca5573f0b9bdd1b0d61664b963034ce4aa7798f442663a4ea13e71fc8bb04a1 WHIRLPOOL 88bcc5a0a1d9bd723c84c9f4c3e9b0e45ce017c73ca5aee00d57eb8c4cd53d81e5ea37e47a531fab0603fd737e3c3b32cfa4cb4c0add6dd120e36a41077175c6
+DIST phprojekt-6.1.2.tar.gz 34786513 SHA256 1192c00e09e3552e1f43d80239371de8239b24e6c5bc6a2d13d2f791e47f3048 SHA512 f37453458db85ede353d7bdae79504d3cc4b65e80db7b8ff72db8a0e5ed9770579ea106c2b180d69c79dcadda95fd89049d81fb310c281ec796662c83131e081 WHIRLPOOL a611f1a63c6b7cba8f4c73c226891e84372ccc2ed3feb624470f496f89ea8475f1bf793b1164209e43a37abc36679f0ce4d59471112945f8e43158e69f870495
+EBUILD phprojekt-6.1.2.ebuild 1018 SHA256 a9fc512e7bc4dae40ac92e88049df40c0c2ddba12d9e08060e6be3aaa9c1dca0 SHA512 ae9956ff678e1be6bc3ed3972c4fe901901615b40ea8229944760b61dea29a8a6e650f214c04807bf846f1181e4191ba8d0d4f08b8ed0b114eb630798ee35372 WHIRLPOOL 649747258362c385fae35074767ef328d7b6667fe818e5ae796926b1160165992e0f0f05a8f4c517f67ac1c30881d212aaee56b6504206097d906714aeafe020
+MISC ChangeLog 2491 SHA256 255018f2edbf2fe9776e63c41d76aac5321b365524cd389f72914fc469f1e470 SHA512 b742f320c0f17df5ca42e0979ff250cbf5c6a9c2afc79f9bdffdb52941304f1abd707ee6210853ea8b6eb4988b6765e5ecb6ed9f46ea18b8f259a663104b41aa WHIRLPOOL b1cf5c821ab5105fa748f1c2aee4ce88d3e7d92a56e1ff96eec52f247ec130823cae69cbe301910f9aa2e8c35f21229abfb9c3bd320cfec67032b1fb9c1a655d
+MISC ChangeLog-2015 5973 SHA256 9b56e36a39d53cdd818b1a2aeb461d7f658e1e80fd6478f132acb411988653d5 SHA512 c250876c8c541e05c96e204e8068fa24013875ea6b44cd49bfc132e9898c0f562978287efc8e8c0778178a73beda91d63be2db84b6d20a44a5015645b52245e9 WHIRLPOOL 146f2c4d91253b5e9a31112ca5e39f9ffffb10dbb36628308f96aa60e09f2b2a5b1b30d4809f71fa088f37ec45c3575eee2a9a5149ad9b491ab1c9826c27db15
+MISC metadata.xml 334 SHA256 c51a118eef3baac5b9dbae0d55937e15603ea6383bb32ef489d26cd5b1dc9fa5 SHA512 a8b49e47ecf5ca0e9fd06ce76e42ec6749d11a03120e4b2e1fc1cf4a3a08515127361a6405562fff743f97b7db30a51f1d412b612ad59e143829d1a60a579d11 WHIRLPOOL 364d7fc52ccae0ce3a58883e305c55a083dc10b794ace071e3cacdd86b9678c00bed903b8a59433d8170dc9204a3144e92ad326be2b9cf0e17f455c6666dd42d
diff --git a/www-apps/phprojekt/files/postinstall-6-en.txt b/www-apps/phprojekt/files/postinstall-6-en.txt
new file mode 100644
index 000000000000..488d5dfd561e
--- /dev/null
+++ b/www-apps/phprojekt/files/postinstall-6-en.txt
@@ -0,0 +1,9 @@
+You are almost done!
+
+  1. You will need to create a blank database for phprojekt to use. Consult
+  your database manual.
+
+  2. Complete the installation by logging on to
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/index.html
+
+  Enjoy!
diff --git a/www-apps/phprojekt/metadata.xml b/www-apps/phprojekt/metadata.xml
new file mode 100644
index 000000000000..e2ac42934964
--- /dev/null
+++ b/www-apps/phprojekt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Mayflower/PHProjekt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/phprojekt/phprojekt-6.1.2.ebuild b/www-apps/phprojekt/phprojekt-6.1.2.ebuild
new file mode 100644
index 000000000000..d09ebbe17495
--- /dev/null
+++ b/www-apps/phprojekt/phprojekt-6.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vcs-snapshot webapp
+
+MY_PN="PHProjekt"
+
+DESCRIPTION="Project management and coordination system"
+HOMEPAGE="http://www.phprojekt.com/"
+SRC_URI="https://github.com/Mayflower/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ppc x86"
+IUSE="postgres mysql"
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[gd,imap,mysql?,pdo,postgres?,session,zlib]"
+
+# need at least one option for a database
+REQUIRED_USE="|| ( mysql postgres )"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc phprojekt/INSTALL phprojekt/UPDATE phprojekt/README
+	dodoc phprojekt/configuration.php-dist
+
+	cp -R phprojekt/* "${D}/${MY_HTDOCSDIR}"
+	cp phprojekt/.htaccess "${D}/${MY_HTDOCSDIR}"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	dodir "${MY_HOSTROOTDIR}/phprojekt_private"
+	webapp_serverowned "${MY_HOSTROOTDIR}/phprojekt_private"
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-6-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
new file mode 100644
index 000000000000..0cebe35cd08e
--- /dev/null
+++ b/www-apps/phpsysinfo/Manifest
@@ -0,0 +1,7 @@
+DIST phpsysinfo-3.2.2.tar.gz 899974 SHA256 d25ee38c29f022869be6d592155bc04c955e7fcf73738df139fa6d5cb222f51d SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9 WHIRLPOOL 44c7648ba0267c8445304ba25339d1913a3819c0750b4f60b13167b2b3f557d67823a37caabea354779a11a6e0de3b7bdd15726e3b302459bcb6eb226c983b17
+DIST phpsysinfo-3.2.3.tar.gz 909045 SHA256 25490f7e0a99731b66717407d4e025f029873fb7a1d089df295b472d86c767dc SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa WHIRLPOOL 81aeb342c168eae811c215fb305700ee48266d265c1d930f9a84e39000916364464ed5db0d3db6a3f9a34bc910b28320304d41afb679bab40f2c486cf590cf62
+EBUILD phpsysinfo-3.2.2.ebuild 782 SHA256 e586b493eabed04188a3bf21174ffb3ecfa8fa494bebf5c207cf2e2ab8fa924f SHA512 9b2ae4906226d73a734d288110ec8e90c93930ef252df7e0c7bd9e28faa0bf87afe1cdffdd912a3db4994e623332d2b6b824f5e5ae1d02900fc1bc1290f81551 WHIRLPOOL c9b6c3e8c1a4d06169dbcd5ebff076463d8e2d7f8062be45072cfee7b89a5a23d2fee9a95168eab89e47e3ad4d0996fdf1aef0771701f7d52608cc3851f13d68
+EBUILD phpsysinfo-3.2.3.ebuild 787 SHA256 18f7c205891bddae7f474d4d54979b594028a4826bf98640b748971db7168949 SHA512 dd9a20c132bb3ba4ccbb7c76d275b920bdaba7009efe50bc29afe86538d35575273802f9003fd8a609abbacc3f19c2dfb36a3ff9c13b4953b38a161506e12b3c WHIRLPOOL b845e7fd6db2366f69a8d5376cf0725a523566d465d97b84b9fb96b526741be2d87ff7253e1ed956f1d151b15dd70394267ab88b5f465ca806ec04cf5b84b59f
+MISC ChangeLog 4103 SHA256 af1b182be20c221201ee0a391ffea1383f8c526a0e35200a80ec8b6f53d2a0b8 SHA512 331d84bf1a219be0018a190a199e47b642cf8c0df568f039f10b56d690e79193b458a344d779602b6cc48cc4941f5c197bf352541d6945161eb1250e731f82e5 WHIRLPOOL 0c71b2d21b20cac0735385fe3edf34c04ece3c124e4b6416bc04b35eedac83a7cc90a73a300565cbc2448991f0232286e7b3fa4423f169ae419462450377a806
+MISC ChangeLog-2015 16644 SHA256 7ba2c7a29d50eb920bc6fd560fc0c6d8a815a1e41b07905d1d6b78c077613b96 SHA512 3f2210fd0520d176d30a8cf021bdc46a2ceb96d96a897db90b0bfbfbc135a0569d83bab200fd038a4a115d891ab1aa882f9991ef0d93f8fb8e2eaf3efe4d98d8 WHIRLPOOL 4e64024aaeb5044300959a479537ad255f57399aa32b924ce05c9147bc02f580f656bfd94ae21db2aa08edb05d04355c1660ced820689840f462bc67f508bfe9
+MISC metadata.xml 331 SHA256 91fb2d06e68a4e8e9f49350ba5c7fe36edb48c3b1595078d105e6e36172b8954 SHA512 91c34c9422b5d175bd50aeab393cf68d50bde1081e4dc31b2c2e1454ed9f8f6c67c0e9c194f0a1625d1c68d9f7d62a599ce32d8dbd5a1cb47a4a1a2dd871518e WHIRLPOOL 5bc87d7e952b72a8ad1abcac39f1ebe11cc112a1d15ed92a788c72ef497dcc8356c7885a14e4da5f449d3a7c412630ad8eb0f89c6908cc9e73b525fff8f22422
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
new file mode 100644
index 000000000000..15b8d1f6508f
--- /dev/null
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rk4an/phpsysinfo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.2.ebuild
new file mode 100644
index 000000000000..3288fa826894
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+
+RDEPEND="
+	virtual/httpd-php
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins phpsysinfo.ini{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+	webapp_src_install
+}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild
new file mode 100644
index 000000000000..b2f26ade0cc0
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	virtual/httpd-php
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins phpsysinfo.ini{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+	webapp_src_install
+}
diff --git a/www-apps/phpwebsite/Manifest b/www-apps/phpwebsite/Manifest
new file mode 100644
index 000000000000..3a2c639f461a
--- /dev/null
+++ b/www-apps/phpwebsite/Manifest
@@ -0,0 +1,9 @@
+AUX postinstall-en.txt 4642 SHA256 aa928a0658820728c93f14cca446644745e0cc7408091a1971c7d06bd7616d9f SHA512 18698195eabc6f0b032c679f6f8bb4e6f5c09c1063155feb98ea366ac204e3577b7fbc5a0b49a1f6d5b00f0354c0e5b2bab52f99e4996f81e1511657e7529aa0 WHIRLPOOL 4a148e211ecd6d8a59e1ae76f38806d779ebb54a3633cf7aeb9a78102f9344a3eb4be3c2353c2116d39c2248a84cdd056409269f055b2c46221c7807aeba9b0b
+DIST phpwebsite-0.10.2-full.tar.gz 3338377 SHA256 1b91045e6e8d40dbfaac2b0016dac378885f98588e68e752fec76d1991c71696 SHA512 b767ddf2f211c5bf9ccee22f88dae0a66a26a7a294d8eb95a94a9384d358f18ecf3ce888423c98a8a84091f7bad6399c370220ae31fbf5006f1416a44ec4d4c6 WHIRLPOOL 2081c4e88fa2e6037c6b3e2ba46840266d4616b6a5ad2cc9c2a81b9231c185e18fbae84ebfe04620db68707ed0eda7e4e3d377cae1407fb3425528a15dd9792a
+DIST phpwebsite_1_7_2.tar.gz 14531036 SHA256 a97b481f83d693913c2bd90b28e3d41844fab2abf7dad1a0729df5c2ac00fb99 SHA512 cf3f503794bb12d24ea003b0caf3e98148be43e0acd38e4d15be559cdf643266270800450309337d6540eaa069022730cef64bf315bd0fb3853a344a63c78ae5 WHIRLPOOL d882ef8b7bb69e0355e5e6eea228ec2ffb051bb7a574e2a3257a4999b1f5e34c48872d19658595cdb82f00dfae21febad733df5d1f3b1f679c52b70748a10b07
+DIST phpws_patch_20060419.2.tgz 1560 SHA256 7df6518405f13da4b7ffd87cf5ec3d11d6df32927b6f8a045fc0ec02eef96345 SHA512 12354f8012dbb5540f681b3df54108153745264f9703242edfb31122bfe5e59df86ad51fbb4faced52afad1f69eae137f0da428fac2f32af582e5e91800539c2 WHIRLPOOL 3c110ef4b27336adee28a208ab9db04f436d9fdb500f6bf4b099228fd58192da8717ba83bc7b5ea01d9b3288dec93911c625ab14cdcc54de7cf463681679a341
+EBUILD phpwebsite-0.10.2.ebuild 1332 SHA256 bcdd4ae7651aa8754e97dd506f9934f2920c4ab863f39bb9eba4524e8d20c180 SHA512 16b6ba4832cae9bba062c72d22b3006d2b0b64d4e6228aa39af297ccd955ac4a0439205221bdd24ae612a8ccd29e2f43a414e6ad6990a26db4ea25e1b18fc9d7 WHIRLPOOL 06f3b15d78e328da25a9dded8977bc66db4dbe69b7130cba2687cdfbdafe9cfda53ef373604ed52dfebfc8ee40b5663d6e06b34b5c048652d5c513e861e20e13
+EBUILD phpwebsite-1.7.2.ebuild 1076 SHA256 51fa1908db3656f6478951b3656fa6d8b4581fad324be7bdd53f46b29a280979 SHA512 f71f17722a93f01f61db60b703ed382a433bfecfde4cc3e238b01b4859d68641559ee73b82c24ae6b888475f4db5f7e007149e367fd83ca6793ef4175580f213 WHIRLPOOL de3280bfc51455672a2f364c8fd11c7da69df97787485a7fb487d8190a673e3027dd64840da03d32187d9c4be16cd0d51f675181a450112a3c187f35c32390b3
+MISC ChangeLog 2525 SHA256 0ed0d509da4618d05d6e2877b3efe5ca95e82a036a793271c1ca73185d70d47d SHA512 44283d58ef3155ca41743d0199c9909aaadfdfb83c860cb2e4ef6465f08778610ead32be809a4d19b5287bc04916cad6473b24d12031b6d07ed7907fe2eecb1c WHIRLPOOL 31e8383de14d2449e3a9c63d5ef87deee2f6d28adae75329218f027f1ddc1de9defbbb1c4f00121bf685efc3f089ee9769970e0c4dbc4bad8535f9d03e2a61a7
+MISC ChangeLog-2015 11371 SHA256 d255464b6e05c645c60f3f534dfcc52eb2f91e1d9fd0aa17915b3761bb585b32 SHA512 24765cbdbb29e39a3d858e1c96271ea4fcf79e2ec4095a4a37f64767f275e476445e929acb1271655fb7359cee757eb1b81bee4c2596a568240299fc23e30998 WHIRLPOOL 62623e28773adfa86a1281f88e7136cedf43cd0deabb3414a99dcad742ec6b5fe2529db888c085c5dc3a21878874506f3536501fbcab4b839acc095b3abaf457
+MISC metadata.xml 530 SHA256 11f9a66efb29de4e635a1586e0963bc940b4953d5e6eeb6d82a411e3afcd1ad0 SHA512 ae99108e95329aacd90e09478fa476ddde8c30de43db1c2f09b7083d034d0190114922ae70715414ad32456884b9be9e99fadc6ace9374336dc8eb35aa089c90 WHIRLPOOL d3ac0f070c766f9674f4a8e27f8d896c6149b786c99509460687b2c48ab34607f259bd63d74966a472fd07375ea4aca58a196e64777740b4f70c8b4431671306
diff --git a/www-apps/phpwebsite/files/postinstall-en.txt b/www-apps/phpwebsite/files/postinstall-en.txt
new file mode 100644
index 000000000000..7bca5583dafb
--- /dev/null
+++ b/www-apps/phpwebsite/files/postinstall-en.txt
@@ -0,0 +1,130 @@
+phpWebSite is installed.
+
+Installation Instructions
+=========================
+
+You will need to create a database for phpWebSite
+on your own before starting setup.
+
+Then change permissions for set with this script:
+
+cd ${MY_INSTALLDIR}/setup
+./secure_phpws.sh setup
+
+Once you have a database ready proceed to
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR} to continue installation.
+
+Once you are done with installation you need to run:
+
+cd ${MY_INSTALLDIR}/setup
+./secure_phpws.sh run apache users
+
+Upgrade Instructions
+====================
+
+Preparing to Upgrade
+--------------------
+ - Dump/backup your hub and branch databases.
+ - Backup your hub and branch directories/files.
+ - Create an index.php file that warns users of the upgrade.
+
+<?php
+echo "<div align=\"center\"><h1>Please be patient while we upgrade the site.</h1>
+We'll be back in a jiffy!</div>";
+?>
+
+ - Close and restart your browser.  If you have a session live while updating
+   your site, it MIGHT interfere with the upgrade process.  If you are using
+   Boost to upgrade, you can skip this step.
+
+If you are upgrading to 0.9.3 or greater, you should make the images/
+directory and subdirectories writable by the web server.
+
+Prepare your branches if you are running any off of your hub site.  Depending
+on the owner of these directories will affect the commands to run.  The base
+directory of each branch will need to be writable.
+
+If the owner is the webserver and you have root access:
+chmod o+rwx branch1/
+chmod o+rwx branch2/
+etc...
+
+otherwise:
+chmod 0777 branch1/
+chmod 0777 branch2/
+etc...
+
+The images and themes directories will also need to be writable for the
+upgrade:
+
+chmod -R o+rwx branch1/{images,themes}
+chmod -R o+rwx branch2/{images,themes}
+
+-or-
+
+chmod -R 0777 branch1/{images,themes}
+chmod -R 0777 branch2/{images,themes}
+
+If the webserver is not given the proper permissions then the branch upgrade
+will not be successfull.
+
+
+Once you have you have finished these steps (and ONLY after) should you
+continue.
+
+Running the Upgrade
+--------------------------------------
+Now you can untar the new files into your installation. If you go to
+your site's index.php file, you will see a few error messages. The
+aforementioned index.php prevents most people from seeing these messages.
+Point your browser to 'http://www.myWebSitesName.com/setup/' where 
+'www.myWebSitesName.com' is the address for your web site.
+
+The first thing the upgrader will do is upgrade your core modules. It
+will also check to see if you are running any branch sites and automatically
+upgrade them as well.
+
+You should receive a 'Core Updated!' message. Underneath these messages
+will be a list of modules that appear to need upgrading as well. Click
+the checkboxes of the modules you want updated (or click the 'Check All' button
+to check all of them) and click the 'Update Modules' button. Your site and
+all your branch sites should now be updated.
+
+If you made a warning index.php file, dump it and put the real file back.
+You should now be able to use your site as normal.
+
+Should something go wrong
+--------------------------------------
+If you go to your site and receive errors the FIRST thing you should try
+is closing your browser, reopening it, and trying to use your site again.
+Sometimes old sessions will conflict with the upgraded information.
+
+If you get an error message or your sites still don't function, restore your
+backed up databases and files and try again. If it STILL doesn't work, contact
+us via Sourceforge, we want to know what went wrong.
+
+Please include your OS, web server, PHP, and phpWebSite version information.
+Also include any error messages that were displayed. The more data you supply
+us, the better chance you will receive help.
+
+You may also try using the repair.php file. It contains answers to a few
+commonly experienced problems.
+
+Returning to update.php
+---------------------------------------
+Most of the time, Boost will handle your upgrade needs. However, should 
+an upgraded module cause problems before you can get to the Boost module,
+you can always return to update.php to upgrade the offending module.
+
+Securing your Site
+---------------------------------------
+Although setup.php, update.php, and repair.php require passwords to enter,
+you may want to prevent malicious users (read: jerks) from even accessing
+these files. One way would be to limit read access on that directory after
+you are finished using it. Another measure would be to alter your 
+allow_setup.php file. Open this file in an editor and change the 'TRUE'
+to 'FALSE' like so:
+
+$_SESSION['allow_setup'] = FALSE;
+
+Change this back to TRUE when you need to update again.
diff --git a/www-apps/phpwebsite/metadata.xml b/www-apps/phpwebsite/metadata.xml
new file mode 100644
index 000000000000..cce709fb534c
--- /dev/null
+++ b/www-apps/phpwebsite/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<longdescription>phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">phpwebsite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild b/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
new file mode 100644
index 000000000000..7ffafe8c5a2d
--- /dev/null
+++ b/www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+
+DESCRIPTION="phpWebSite Content Management System"
+HOMEPAGE="http://phpwebsite.appstate.edu"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz
+http://phpwebsite.appstate.edu/downloads/security/phpws_patch_20060419.2.tgz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="ppc x86"
+IUSE=""
+
+RDEPEND="virtual/httpd-php"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	cp -f index.php ${P}-full
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cd ${S}/${P}-full
+
+	local docs="docs/CHANGELOG.txt docs/CONVERSION.txt docs/CREDITS.txt docs/INSTALL.txt docs/KNOWNISSUES.txt docs/PEARERRORS.txt docs/README.txt docs/REQUIREMENTS.txt docs/THEMES.txt docs/UNINSTALL.txt docs/UPGRADE.txt docs/sample.config.php"
+	dodoc ${docs}
+
+	einfo "Installing main files"
+	cp -r * ${D}${MY_HTDOCSDIR}
+
+	#webapp_configfile ${MY_HTDOCSDIR}/conf/config.php
+
+	# Files that need to be owned by webserver
+	webapp_serverowned ${MY_HTDOCSDIR}/conf
+	webapp_serverowned ${MY_HTDOCSDIR}/files
+	webapp_serverowned ${MY_HTDOCSDIR}/images
+	webapp_serverowned ${MY_HTDOCSDIR}/images/mod
+	webapp_serverowned ${MY_HTDOCSDIR}/images/mod/controlpanel
+	webapp_serverowned ${MY_HTDOCSDIR}/mod
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild b/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild
new file mode 100644
index 000000000000..e2b172dd995d
--- /dev/null
+++ b/www-apps/phpwebsite/phpwebsite-1.7.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_PV=${PV//./_}
+DESCRIPTION="phpWebSite Content Management System"
+HOMEPAGE="http://phpwebsite.appstate.edu"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
+IUSE="+mysql postgres"
+REQUIRED_USE="|| ( mysql postgres )"
+
+S="${WORKDIR}"/${PN}_${MY_PV}
+
+RDEPEND="virtual/httpd-php
+	dev-lang/php[gd,mysql?,postgres?]"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README docs/*
+
+	cp -r * "${D}/${MY_HTDOCSDIR}"
+
+	# Files that need to be owned by webserver
+	webapp_serverowned ${MY_HTDOCSDIR}/config
+	webapp_serverowned ${MY_HTDOCSDIR}/config/core
+	webapp_serverowned ${MY_HTDOCSDIR}/files
+	webapp_serverowned ${MY_HTDOCSDIR}/images
+	webapp_serverowned ${MY_HTDOCSDIR}/mod
+	webapp_serverowned ${MY_HTDOCSDIR}/logs
+	webapp_serverowned ${MY_HTDOCSDIR}/templates
+	webapp_serverowned ${MY_HTDOCSDIR}/javascript
+
+#	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
new file mode 100644
index 000000000000..1385d94e709f
--- /dev/null
+++ b/www-apps/piwigo/Manifest
@@ -0,0 +1,6 @@
+DIST piwigo-2.9.1.zip 7777925 SHA256 7ff2d936d5436d9883f318ac32c1a3b482b870abb7e825d7414ebb21b2ab147d SHA512 5fee3e96a5a9a4d70cc1528f40569b45c1898e71245ca7fcfdf529d39ee79ae0d419ef38b61c536dfb5150d1f9fe683ceabf8393455d51539253d0010ccc2fff WHIRLPOOL 63d22402e80e18d85d0bdd2a9ac65f1ebf6a3d9479d43b5e239a3ebdc10dc72ba6b21b22670f24bb1c9303fbf301f20a80dc61e2c058083329967cf1aab7ef69
+DIST piwigo-2.9.2.zip 7794574 SHA256 344937dd1685efb41c1aa7301497aea0fb84707a6a9809eca9efb390d4eadb4a SHA512 e87ff57a4713435880c0a9c8b03db30952741c3e9a8d7b8e3f13410d78d9b117d7a63693ec42f288c7516ed623746c6191b69a5a4fd5c31afdfcc36e93d3de1d WHIRLPOOL 1909c41e4d01f17bc67e67cb20d162ba1b25c07a9430a061952012d64c72037efda8840e8f99d2832d585c1e0c19dbfaa1177c5b85f4f8c49b01b795a9a81c65
+EBUILD piwigo-2.9.1.ebuild 1124 SHA256 4f515958932bd9fe136d24d35cf6a13733b12749fd36b3d609851d229102d033 SHA512 3871a0effc4e0a0087c454b1f5012e26e423155ce4dfe26d0e84462d6606caee3bed5fd1d6c0c0798fdf4abcefa05433caa35123846de8a42d3e8bc80b2c25f7 WHIRLPOOL fa4715e053cf1397fbea1b3fe661e92960981a33e04ea4752cb91935b3e83015827c3da17a48134068b6088035e359216591e843ce1dc57d7bbb4ef23868efe0
+EBUILD piwigo-2.9.2.ebuild 1124 SHA256 4f515958932bd9fe136d24d35cf6a13733b12749fd36b3d609851d229102d033 SHA512 3871a0effc4e0a0087c454b1f5012e26e423155ce4dfe26d0e84462d6606caee3bed5fd1d6c0c0798fdf4abcefa05433caa35123846de8a42d3e8bc80b2c25f7 WHIRLPOOL fa4715e053cf1397fbea1b3fe661e92960981a33e04ea4752cb91935b3e83015827c3da17a48134068b6088035e359216591e843ce1dc57d7bbb4ef23868efe0
+MISC ChangeLog 828 SHA256 23f1131e26dc42b98162c17dec5384b1a8591d41afe65c1549747ce25b58ef82 SHA512 d033b4459c40b6c1e92bb5350af06444e7940a348ee416e34d1dd114d7bdbc751f350b1fd117f07a55fb8f2a6f1787770f94e433c1c1f2a7da364e901790f0f0 WHIRLPOOL 2e420ab3f12363ec59bbd00621c44cf986df5dc62214dd1299751252ec1929ad21b0662c4af02a721b922535c9ef379f311e6dffd839890a515d77634afc41ef
+MISC metadata.xml 1022 SHA256 53054161fd5f6eef9a8e99bf5baa8698a3960027544a1e476e707a2b0c715edd SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09 WHIRLPOOL 6717c217d2c11915052b1d883781ef14c835ce04a54e1183a65b0ad11f4a2829150d152c8876b4d1d599a84922deb481f8e6c6b3e4c39a967ad50d4f35f6df86
diff --git a/www-apps/piwigo/metadata.xml b/www-apps/piwigo/metadata.xml
new file mode 100644
index 000000000000..586c819bb3f1
--- /dev/null
+++ b/www-apps/piwigo/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+Piwigo is a photo gallery software for the web that comes with powerful features to publish and manage your collection of pictures.
+
+Started in 2002, the project is now supported by an active community of users and developers.
+It supports numerous galleries of all sizes all over the world, from an individual ten-photos party to the images stock of an agency. This scalability is supported by smart browsing capabilities based on categories, tags and chronological search. Various extensions make Piwigo even more scalable and customizable to suit your own needs and desires.
+
+Piwigo is both web and photo standard compliant. And, icing on the cake, it is free and opensource.
+
+PhpWebGallery became Piwigo on February 15th, 2009.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/piwigo/piwigo-2.9.1.ebuild b/www-apps/piwigo/piwigo-2.9.1.ebuild
new file mode 100644
index 000000000000..5eabb1cb9062
--- /dev/null
+++ b/www-apps/piwigo/piwigo-2.9.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-apps/piwigo/piwigo-2.9.2.ebuild b/www-apps/piwigo/piwigo-2.9.2.ebuild
new file mode 100644
index 000000000000..5eabb1cb9062
--- /dev/null
+++ b/www-apps/piwigo/piwigo-2.9.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-apps/polarblog/Manifest b/www-apps/polarblog/Manifest
new file mode 100644
index 000000000000..2114a0f1b418
--- /dev/null
+++ b/www-apps/polarblog/Manifest
@@ -0,0 +1,7 @@
+AUX postinstall-en.txt 546 SHA256 ab5053d6db5167520579733f86e58db44d874ff6f2d7f919390a1aaa4da90cab SHA512 969431d8b54e5bbdd283d63d5cfa292df9c0414bf5a84bdbab7b6a4fd65443e0acc9db569b5e91895d244e5f085290e58a2645cce63ff573389c667bddd73776 WHIRLPOOL 9f0008f1504a39290876ebab34120d0780c967e1312e0fcb64e96eeb52cae62f3ecaa4372bc17bc1d75a727072890323012da27fc3ef5828a902e8c331106d93
+AUX reconfig 229 SHA256 5a644866d2fdbd066eb9faf17980506d0b919c7ad5270701465141b3e1395fb3 SHA512 fc289905031c92544711098dc587c5fc609f2c950f51c77bca91ce44341e2b6094106bfc0caa6b11f50fb12992f7583609d6bad7fe3d71d8a51c73812de0d664 WHIRLPOOL ffc56b17f9704852f7bcb52575b6e5040b5eeaf27f775e6d6f96835ed7c6afc7c4434ff13cc4812af859e9caefb0dd7b413e126f45a7932460140d7be898239e
+DIST pb_v1111.tgz 284842 SHA256 c3cefd0f95a24a6559d1665126c63ee4bab19f72417e33b22231675696dd26db SHA512 2024230ece57cfea10353d6f28c4d3e81c1d5713d069f2cf4a64539ee831eaba4d15483066ea57f29ad3dacaa5cba41e5e1f640be1481c4e07769877a9242605 WHIRLPOOL f425d2a41b970a111c00ce35fdb55e6c10b1ac9a8ee15275aae63ae9f71aa9ed677ac9249ce85479a4e4864e19ebff4a8d21f324861397bddf2c6f6286780ed4
+EBUILD polarblog-1.11.1.ebuild 724 SHA256 5b090b93866f1a882ce3b53231652d61dfda01f377825cec37478b8cc10893d3 SHA512 1987709016fa5d00baba27eceb2f28ffeae4ab0b0bb3c2e70856cd1cf9ac67c6678d7229b93a42480d1a2dac3bebac288e3f092178a19ff923929518360cd4c5 WHIRLPOOL efc3c2a9ab49fde16a873d5c7f21f12a617a73ab1c5a5f83ffea827481038baa5562fe15a92a7bc5065cd8985f231bf4fc4bb11f1863fb7519e89c4ec68b8d00
+MISC ChangeLog 2481 SHA256 fcaf9e256f6e3165f08f74277cfa0343b0d39b1292780466fab71152e0a736b4 SHA512 64efccad43a55d03d955a0c13f747bf7c8027b0266f723490c9c6516bc2eb26b84fcb29ffc66ac61b05235ba95d6ae4b36c4177c69594bb81612b4e8c63996e8 WHIRLPOOL 6a5613fd8218966a42e05a2b4228e3ee7157d3ff58d905a4f0fc02c5623dcfd33b0273693228ba4eb13b21397d8a497c282847619a0c4b9ad640aac27a251f8f
+MISC ChangeLog-2015 3846 SHA256 20f3e108b9a4856348c953eaba138cbeb6a58a5f84fa2cf760d53a64d508caa4 SHA512 8fd34627dab85fbb9b6dea754f6fac029f3b18b1654b22f8c4e782629235a314c671c40ca6227774193736ee127abc50d75c4787f86a7bd0cd4b3e60844e3e8c WHIRLPOOL 7833eecef051465cff0183ec373ca74462f11b8907fb2260b55f27de2d235007efa2835ed07fd517dc3b4713ba5f4e888dc6301959fb34e5603370e352136b61
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/polarblog/files/postinstall-en.txt b/www-apps/polarblog/files/postinstall-en.txt
new file mode 100644
index 000000000000..5764bcf53589
--- /dev/null
+++ b/www-apps/polarblog/files/postinstall-en.txt
@@ -0,0 +1,13 @@
+
+Now execute:
+
+cp ${MY_INSTALLDIR}/css/<one_of_css_files>.css.dist ${MY_INSTALLDIR}/css/<one_of_css_files>.css
+cp ${MY_INSTALLDIR}/config/config.php.dist ${MY_INSTALLDIR}/config/config.php
+and edit them. As a minimum, set LIB_PATH, DB_PREFIX, DB_HOST, DB_NAME,
+DB_USER, DB_PASSWORD, CSS.
+
+Then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php to finish the installation.
+Don't forget to delete ${MY_INSTALLDIR}/install.php when you are done.
+
+Read the docs at http://polarblog.polarlava.com/docs/ , in particular the
+.htaccess section.
diff --git a/www-apps/polarblog/files/reconfig b/www-apps/polarblog/files/reconfig
new file mode 100644
index 000000000000..89f55b48d928
--- /dev/null
+++ b/www-apps/polarblog/files/reconfig
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|/your/path/to/public_html/polarblog|${MY_INSTALLDIR}|" -i ${MY_INSTALLDIR}/config/config.php.dist || die "sed failed"
+fi
diff --git a/www-apps/polarblog/metadata.xml b/www-apps/polarblog/metadata.xml
new file mode 100644
index 000000000000..f2f2ba9e2823
--- /dev/null
+++ b/www-apps/polarblog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>web-apps@gentoo.org</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/polarblog/polarblog-1.11.1.ebuild b/www-apps/polarblog/polarblog-1.11.1.ebuild
new file mode 100644
index 000000000000..e894fa3bb6fc
--- /dev/null
+++ b/www-apps/polarblog/polarblog-1.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit webapp
+
+MY_PV=${PV//./}
+S=${WORKDIR}/PB_v${MY_PV}
+
+IUSE=""
+
+DESCRIPTION="PolarBlog is an open source embedded weblog solution"
+HOMEPAGE="http://polarblog.polarlava.com"
+SRC_URI="http://polarblog.polarlava.com/releases/pb_v${MY_PV}.tgz"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+LICENSE="GPL-2"
+
+RDEPEND="virtual/httpd-php"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGES INSTALL README
+
+	cp -R [[:lower:]][[:lower:]]* "${D}/${MY_HTDOCSDIR}"
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_src_install
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
new file mode 100644
index 000000000000..2256741bf1e9
--- /dev/null
+++ b/www-apps/postfixadmin/Manifest
@@ -0,0 +1,10 @@
+AUX postinstall-en-2.3.txt 1827 SHA256 ffaaa33b2a3b67d82fe8914c1c1e9b58328d6ef119b8e32326ce10ff8b478357 SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a WHIRLPOOL 8604fa62ae9534537accede40c77d3c7910d5a24c0ad2bccbf5669e87d8c6af3016f7628629a9dca8aa1abd7601ccb34ae6eaac4eb0101ffaa2147d0a8f8f1cf
+DIST postfixadmin-2.3.8.tar.gz 1600215 SHA256 8969b3312935c6e94ff17508f5b7e78b65828cd52d371adde3bfd9206597d94a SHA512 96cd4212109a9459344dc017a397b0d6abcb8653c7aae4f40f913e9a49581d7f74bd92500046f8758e195bd24e63a3b2373c461edc96c67fa1d01f91f4f489c6 WHIRLPOOL 4c98ad01a69708abf10970dd437f15945d02c0ccf8e3563051369f39be6b78eba0f7d7bd09b1784e73e65976b7454ae419571b77c0142477790e320710f3de21
+DIST postfixadmin-3.0.2.tar.gz 1306500 SHA256 9a4edb111258c90912aea66ad1dd684445b4f03f08f8549b9d708336ae019c8c SHA512 19db70cc59e8e41356e4cd632b0cb9df8d8de0f0451e7e2c84d61a0aa6ede5cc93bbf8914786a2eec012e4c013ad130a001d143ce869aa54b54a50fb798ed92b WHIRLPOOL 9ab719381dcd4d38f6cc85ba17e9124aed13b6124c1eea4bfbb3323c33046886e6191a4d90d11e4ef9596fce9f31eb07683fd09e2af3370ddd8f6d25379e167c
+DIST postfixadmin-3.1.tar.gz 1279224 SHA256 36eaed433c673382fb5d513bc3b0d2685bf3169ead6065293d3a0f8f6d262aa4 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812 WHIRLPOOL 2f1a8faad7661fc442e7e4bb78bf852eeef2f5901b862bf6e246ea0cb65457f201d4a314bf26227519973f0f4def505957df3ff596294f47662a815b87314a71
+EBUILD postfixadmin-2.3.8.ebuild 2774 SHA256 bca04e3f05ba5c91d72483b993eacd17d8c6f0e927a1ac03934e89156ad020b0 SHA512 6a87a80fe823fd5a66cab4ab0db985b0afefb3bf365e8faa22ad0d118add71acaa3f2f338883a5a7e4c2d81e4ecf5b45c2688a810cd681f14b91f65c2f130950 WHIRLPOOL fbb45966946f987a7052b52a324aa0d8abb71e2126bb5c334bc7f9a872afcc636f668f754c647a57fbab04fb75319df978670bbdf896b31b6f52cddde2b9e33b
+EBUILD postfixadmin-3.0.2.ebuild 2785 SHA256 4d6526359f167f7e982db63ecb1c273c1377c7b1d1b45b7c2277ce38f5b0f040 SHA512 8d5ac164a30daf1eee14cfbefe7a4edf378134609e85e4091ddc147752ad4ff624bb70e83426807d9b43912c5519a75dcd5faa7f705015c789c6f811323d1008 WHIRLPOOL 52c784d08d7e24c945ed1447ca5bd62bddcfb76bdc5be883fa7b943118f081bc256e82ca5ded39e5661fdde2663b27a8d5cf2f961ed86a32e68fa90677a6c6f3
+EBUILD postfixadmin-3.1.ebuild 2732 SHA256 dda1168d217b091832ef30db551d383ed705b2e6071b4eaf000602e61ca80e9d SHA512 0e0316387c1e3d7566bf3eb42b08e5630a738c68d2053b651251201bbe1503c09963df830a26d84a6b8935d30957f0e3fc37b50d24491d159a05ed305ac80cb1 WHIRLPOOL defe79c8713c75046e168875984e6c4d47d26ff78e9ee1ecff6fe0316dc26d4a44dc19311416ea7c6e88af6331cf42694efcce15bfd1f4b5f977922565e7eb3b
+MISC ChangeLog 3433 SHA256 acc392ce91ee4b52bc11cc300f115d527be8c4024460f0956aa377f5463ee041 SHA512 de3d5fc5b4fb83941fc56c3f2cbfa49089cf982e538c3fc38fefa85f2bf4e69576ff89937e6648c3ade50e805e8660801811bb285caee34bf8bdb2d4cdccb4cc WHIRLPOOL cc3c1f9fb6188b8a91723ca0f30e38b8c8643f3bb4265517a5e1e524b1006564a036628eee6e45c1410d2695d793f9bab68090d00cbfcb25e5cf0bfac5dd11c5
+MISC ChangeLog-2015 7093 SHA256 508c765b3d45a5a600361a345fa7e865294fec10f66c41a1aba5ea77e5bb8621 SHA512 dbb867f4b97f98fc3534fa0090dd460bc62516d932137e42d61389552e52290ff9c95308c39883ef63ab24fb622f1a4eb1d64bb5164087837084cc1c89d13d6d WHIRLPOOL 3a236c25c306afde25a0700a08f4397987161e3ef265644b677648413f0a6317711963e0cefb30a3ae4be4678260ffdeabe84f74d7ad3228af5ee4b58cb11a8f
+MISC metadata.xml 653 SHA256 36cc87c0e80a44ca9a9244eb37c23e6df34b62cad830b28fe7ba7a5d109b924a SHA512 fb272a65935706c463f34a5d93fd2b1dbff191cda0de0ecf2cf4f14fb73a288353ec03f264ddc3d3e5d45178e8e76d4c0348117d96c1a2b5f007a77161673199 WHIRLPOOL d047f8bb471cb514f82cc83c42eae2709fe11ef8cd6b620575868ec02c610ebbb570c33d90b2b212c34e2f7825fb22a0507b8c0996e68cc5e4ba3e78d18c4411
diff --git a/www-apps/postfixadmin/files/postinstall-en-2.3.txt b/www-apps/postfixadmin/files/postinstall-en-2.3.txt
new file mode 100644
index 000000000000..d6411acbe06c
--- /dev/null
+++ b/www-apps/postfixadmin/files/postinstall-en-2.3.txt
@@ -0,0 +1,47 @@
+First Time Installation
+=======================
+PostfixAdmin can use either MySQL or PostgreSQL. It is up to you, or your
+database administrator, to provide a database and a user with full access to
+the database for use by PostfixAdmin.
+
+If you are unfamiliar with MySQL or PostgreSQL, we have some good starting
+guides:
+
+  * http://www.gentoo.org/doc/en/mysql-howto.xml
+  * https://wiki.gentoo.org/wiki/PostgreSQL
+
+Once the database and user have been allocated, you will need to provide the
+details of this database and the associated user within the configuration file:
+
+  ${MY_INSTALLDIR}/config.inc.php
+
+In the same configuration file, check for other settings that are relevant to
+your setup. Once you're finished with your changes, make sure you set:
+
+  $CONF['configured'] = true;
+
+To use Virtual Vacation, please read VIRTUAL_VACATION_INSTALL.
+
+Finally you should be able to complete the installation of postfixadmin by
+pointing your browser at:
+
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup.php
+
+Postfix Admin contains 3 views of administration:
+  1. Site Admin view, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/admin/.
+  2. Domain Admin view, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/.
+  3. User Admin View, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/users/.
+
+In order to do the initial configuration you have to go to the Site Admin view.
+
+Upgrading
+=========
+When updating from older version of PostfixAdmin, make sure you backup your
+database before you run the update script on your database.
+
+  * mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
+  * pg_dump -U postgres -d postgres -C -f pa-db-backup.sql postfixadmin_db
+
+For update from version 1.5.x of PostfixAdmin:
+  1. Please read the DOCUMENTS/UPGRADE.TXT
+  2. Run: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup.php
diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml
new file mode 100644
index 000000000000..024770a12b44
--- /dev/null
+++ b/www-apps/postfixadmin/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="vacation">Install vacation.pl script and dependencies</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">postfixadmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
new file mode 100644
index 000000000000..8be06195e4c4
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+mysql postgres +vacation xmlrpc"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="vacation? ( dev-perl/DBI
+		virtual/perl-MIME-Base64
+		dev-perl/MIME-EncWords
+		dev-perl/Email-Valid
+		dev-perl/Mail-Sender
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg ) )
+	xmlrpc? ( dev-php/ZendFramework[-minimal] )
+	dev-lang/php[unicode,imap,postgres?,xmlrpc?]"
+
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
+	fi
+
+	insinto /usr/share/doc/${PF}/
+	doins -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
+		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
+		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
+			"${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild b/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild
new file mode 100644
index 000000000000..9cef0cdd9d38
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation xmlrpc"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?,xmlrpc?]
+	vacation? (
+		dev-perl/DBI
+		virtual/perl-MIME-Base64
+		dev-perl/MIME-EncWords
+		dev-perl/Email-Valid
+		dev-perl/Mail-Sender
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	 )
+	xmlrpc? ( dev-php/ZendFramework[-minimal] )
+"
+
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
+	fi
+
+	insinto /usr/share/doc/${PF}/
+	doins -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
+		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
+		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
+			"${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
new file mode 100644
index 000000000000..7c491a63d73b
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		dev-perl/DBI
+		virtual/perl-MIME-Base64
+		dev-perl/MIME-EncWords
+		dev-perl/Email-Valid
+		dev-perl/Mail-Sender
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
+	fi
+
+	insinto /usr/share/doc/${PF}/
+	doins -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
+		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
+		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
+			"${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
new file mode 100644
index 000000000000..797d2b1f56bc
--- /dev/null
+++ b/www-apps/prewikka/Manifest
@@ -0,0 +1,6 @@
+DIST prewikka-3.1.0.tar.gz 1349193 SHA256 f7e27fe9ef2acb0df7e28586e675e9a783a13f3f7b762eb0350f835366200649 SHA512 7321e7383d6205f18dffd00a23d07e9154dd79e35eb58d04a6af77bc9f70e476b67a953eb5d09685b4a7c386ecdb9111d40c77bf3b570ffc27a1c90b612a4803 WHIRLPOOL aef9f3876f840ad43b78ac27cbefb6ef6555e411b9d2bd54163368ff8c769e030b9736e8957e592605b1c14d0aa792bb5ee3cb4eff5aab4a80b793665207dae2
+DIST prewikka-4.0.0.tar.gz 1365985 SHA256 9346b9c3d0ea0cfaba4d1685b6bfa28075e26d558b0eaa20c4d8647994f657e5 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6 WHIRLPOOL 359feebc1881b51d67e7925ab2d3e976da07e63c38744d6bdf5f2f7c19b14bcb0a748d0e645edbbbf77be06e897d31fcded6566f622c6996673faecc0b1b07d1
+EBUILD prewikka-3.1.0.ebuild 899 SHA256 b04b4a6ec77877d077f0f1c4899866ef68749eefef9ba7cdb0fb8b69ca92c6ee SHA512 7acd6f07af3f6a4124a5ecc2d569793c2fcb6a60e6768836f36bf8a2639a06288ca811941e9d275f3d9ab4c40eb618c010558d1e8c74e294fb23ce8ba479e003 WHIRLPOOL eed75256a89447ec29f385f3f7191b175458ac9ab2953acd503b378df16c3145b5429b11c0147844a627a0eb48c1f2d2cb43c1ebc45f15c2411f8aa6eeae1f56
+EBUILD prewikka-4.0.0.ebuild 964 SHA256 6728b25ca90de3d5521a6f4fece9e416f90332d392087751534d9612d1d9aff2 SHA512 cad0bac73833ff273de437a0a8443bffd745437c4464381e16e86832de75cff5ece23642875189c0ae0422dba79ee9cf2b1bd6e3d9cfbd1159e27874b54e6a0b WHIRLPOOL 6997e7ea727b303d2387f5b38b3006d5f3b2ae61450c0e75a478cf163498aad6934f5a7c214cdfc78a7f666e6bc2944243ee66ae2ce7a532de40fc94c5d9b2d1
+MISC ChangeLog 728 SHA256 366974528b17802d862d20de0e4032a7bf0f065892f12532e5452bbaab8d99e2 SHA512 a9d70019d69011e93313e743f54ea78f98f14887f3b54a8e087a056dfe24952b985d76b050560f26421911c3f5ee03612ef184e1ee97b070e444cec7e96732b7 WHIRLPOOL 60ec9cfb5c77bcd37efad3ce0cc5c0f3d956faa877ca6f260737a1bd2c43eae65c93f692be74c339e5c786daed18ae599ae04edc7b2ef49a53952b36f0e01d64
+MISC metadata.xml 789 SHA256 ae50a2f20fc87a248ed75490cb3139dcd3d64104f7913e76f7aefd5fd68888e0 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e WHIRLPOOL 9a242bac7c39a0a2e624c7e60eacd9e2e1e44387adfe58e853064d64b477b63c2e6ca9fd66c28b0a7516388ef2072cf7a841668103eb8aa3ab8c2c6daf90f036
diff --git a/www-apps/prewikka/metadata.xml b/www-apps/prewikka/metadata.xml
new file mode 100644
index 000000000000..6f2383f98070
--- /dev/null
+++ b/www-apps/prewikka/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas.andrejak@gmail.com</email>
+		<name>Thomas Andrejak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Prewikka is the graphical front-end analysis console for the
+		Prelude Universal SIM. Providing numerous features, Prewikka
+		facilitates the work of users and analysts. It provides alert
+		aggregation and sensor and hearbeat views, and has user management
+		and configurable filters. Prewikka also provides access to external
+		tools such as whois and traceroute.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/prewikka/prewikka-3.1.0.ebuild b/www-apps/prewikka/prewikka-3.1.0.ebuild
new file mode 100644
index 000000000000..708a8bd0e991
--- /dev/null
+++ b/www-apps/prewikka/prewikka-3.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="adns"
+
+PYTHON_REQ_USE="ssl"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/lesscpy[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	dev-python/cheetah[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	adns? ( dev-python/twisted-names[${PYTHON_USEDEP}] )
+	media-fonts/font-xfree86-type1
+	~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
+	~dev-libs/libpreludedb-${PV}[python,${PYTHON_USEDEP}]"
diff --git a/www-apps/prewikka/prewikka-4.0.0.ebuild b/www-apps/prewikka/prewikka-4.0.0.ebuild
new file mode 100644
index 000000000000..5d997575de18
--- /dev/null
+++ b/www-apps/prewikka/prewikka-4.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="adns"
+
+DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-devel/gettext"
+
+RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
+	~dev-libs/libpreludedb-${PV}[python,${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	media-fonts/font-xfree86-type1
+	adns? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
new file mode 100644
index 000000000000..163486d8cd46
--- /dev/null
+++ b/www-apps/radicale/Manifest
@@ -0,0 +1,6 @@
+AUX radicale-1.1.1-config.patch 841 SHA256 5fde28355b7c4cae3d4ed84402f5d631efd67adeec642e1439bb478d666e177b SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9 WHIRLPOOL dce9ce67138fb19a826ead92674f308ffd58bfd06f7ce6679ab8b4ca9803d37cd9b822c81605ed7e4b3ed9dca176a7ca9d451439af8838197f77a4a95b4a0170
+AUX radicale.init.d 564 SHA256 2475792713d1ff78ccf376bf2ab20243a69b04ef68cc637668db758e677bcbdd SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa WHIRLPOOL a65ef3ee6a18622f90e70dac5bb0fa37426d9f751d7850b0faf2b61294efd254cebc31ffa0c82657cb047576784893cbd0a362c7412e5855717ea9ec11374f98
+DIST Radicale-1.1.1.tar.gz 47174 SHA256 e2c9812913c464ab88ae1f66b29e81f87a4cc6ee1c94d167b33508c530dab4b0 SHA512 dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2 WHIRLPOOL 315977a0bed6c1d5bfac24617b23e791d6c306658a14a478364dde61b5df5ac4136be18139d3edb7ab554f40a1d3cfce367770dab4c023868bb476f34e28a3b6
+EBUILD radicale-1.1.1.ebuild 1645 SHA256 3bdce2bc3cc22e55b172c131642d51b70b255547812ebc953f9c7c3df03b925e SHA512 8448309d0df8c2e8eb191556bc7e654f85e06c114b98669207d2ca7c3e0e99137cf0a2953068f2380ffe7bc52bda2811d2fd74c0c3aa5abfd3bf1887ea88a5c8 WHIRLPOOL 6fa80a61dfcf6a38044c6612990c6b6977c63f47776163bf8e4ba6f4e7af48edbfa4b3a35ebcde3d71a5f5fd6d5e85a1e6880b3743cc478d021cde26fa5957bd
+MISC ChangeLog 931 SHA256 940622f585fa3fc4f1944ba8c0db14e1c111b932f745752868eebffbb26c954e SHA512 6351df09ab4122cc55a36a8b0e5be465a2726db92fc589c304fd9f53233ed42bcde8ff6536a3676d9841e972ff8a7105b8a293769fb61a82338dfc5ebfd96182 WHIRLPOOL 1c71e6a4e37b144fcd62cfeb1a2ef88c6297b624fb9a20e5bad871d0ceb7e6299c56c3b98d4d3f96acc1fbb3c17fce2e2846b137a20362e89331210cf6d7eda9
+MISC metadata.xml 350 SHA256 e99a1349e8de0136ecec48dd7a7dcf546bbb7a73f5bcdd2fec0ba7733dc9ed03 SHA512 3f8e0eecc8780b629878668cb1cbbb58ccc974f3467e2d919453233caae3b4d903ca191d7cc9b9d2f43d3f91583d734f7da04ac6f4f730b923d7e69bc271da4d WHIRLPOOL 3c677a8ade67232382ab133fd74cdafad8c36942c5955eea0074a6a5acd3d38f567abfb3fc4dfb713599d893d5770674ad61feae144cb3767898cc8216a10b28
diff --git a/www-apps/radicale/files/radicale-1.1.1-config.patch b/www-apps/radicale/files/radicale-1.1.1-config.patch
new file mode 100644
index 000000000000..4eb286f8d400
--- /dev/null
+++ b/www-apps/radicale/files/radicale-1.1.1-config.patch
@@ -0,0 +1,34 @@
+diff --git a/config b/config
+index 453a45e..10c1595 100644
+--- a/config
++++ b/config
+@@ -146,7 +146,7 @@ http_password_parameter =
+ #custom_handler =
+ 
+ # File for rights management from_file
+-#file = ~/.config/radicale/rights
++file = /etc/radicale/rights
+ 
+ 
+ [storage]
+@@ -163,7 +163,7 @@ file = ~/.config/radicale/rights
+ #custom_handler =
+ 
+ # Folder for storing local collections, created if not present
+-#filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/lib/radicale/
+ 
+ # Database URL for SQLAlchemy
+ # dialect+driver://user:password@host/dbname[?key=value..]
+diff --git a/logging b/logging
+--- a/logging
++++ b/logging
+@@ -45,7 +45,7 @@ formatter = simple
+ [handler_file]
+ # File handler
+ class = FileHandler
+-args = ('/var/log/radicale',)
++args = ('/var/log/radicale/radicale.log',)
+ formatter = full
+ 
+ 
diff --git a/www-apps/radicale/files/radicale.init.d b/www-apps/radicale/files/radicale.init.d
new file mode 100644
index 000000000000..a59e8d387093
--- /dev/null
+++ b/www-apps/radicale/files/radicale.init.d
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/radicale.pid
+
+depend() {
+    use net
+    need localmount
+}
+
+start() {
+    ebegin "Starting radicale"
+        start-stop-daemon --start --quiet --background \
+        --user radicale \
+        --pidfile ${PIDFILE} --make-pidfile \
+        --exec /usr/bin/radicale -- --foreground
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping radicale"
+        start-stop-daemon --stop --quiet \
+        --pidfile ${PIDFILE}
+    eend $?
+}
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
new file mode 100644
index 000000000000..c7327c300ab9
--- /dev/null
+++ b/www-apps/radicale/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>maksbotan@gentoo.org</email>
+        <name>Maxim Koltsov</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="pypi">Radicale</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild b/www-apps/radicale/radicale-1.1.1.ebuild
new file mode 100644
index 000000000000..8876986e631f
--- /dev/null
+++ b/www-apps/radicale/radicale-1.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils distutils-r1 user
+
+MY_PN="Radicale"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="http://www.radicale.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
+
+PATCHES=( "${FILESDIR}"/${P}-config.patch )
+
+pkg_setup() {
+	enewgroup radicale
+	enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+python_install_all() {
+	rm README* || die
+
+	# init file
+	newinitd "${FILESDIR}"/radicale.init.d radicale
+
+	# directories
+	diropts -m0750
+	dodir ${RDIR}
+	fowners radicale:radicale ${RDIR}
+	diropts -m0755
+	dodir ${LDIR}
+	fowners radicale:radicale ${LDIR}
+
+	# config file
+	insinto /etc/${PN}
+	doins config logging
+
+	# fcgi and wsgi files
+	exeinto /usr/share/${PN}
+	doexe radicale.wsgi
+	doexe radicale.fcgi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "A sample WSGI script has been put into ${ROOT}usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+
+	einfo "Radicale supports different authentication backends that depend on external libraries."
+	einfo "Please install"
+	optfeature "LDAP auth" dev-python/python-ldap
+	optfeature "PAM auth" dev-python/python-pam
+	optfeature "HTTP auth" dev-python/requests
+	optfeature "FastCGI mode" dev-python/flup
+	optfeature "Database storage backend" dev-python/sqlalchemy
+	einfo "Please note that some of these libraries are Python 2 only."
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
new file mode 100644
index 000000000000..c4d31bcc7b31
--- /dev/null
+++ b/www-apps/redmine/Manifest
@@ -0,0 +1,18 @@
+AUX 10_redmine_vhost.conf 343 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847efaf92a8415d753387435 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc WHIRLPOOL 7bdb8c8eb7b24b5fa7750f14a5d6d90504b9e95b1c3d07827a1bba320135ff9aca195282bcc86e6964b742cf0dde3690d79065e61fd14145135ab6ff4c10816b
+AUX additional_environment.rb 322 SHA256 ebce2301ec9c15feb045948145052e7a716da35be7afc93ac74a739e4bd01db5 SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf WHIRLPOOL ffe6dd03718249b2016fc3163c49d65d183509ca14eae495907c847003915050a9175135e7f4c6943c93d28944b997951139cfdb949b72632d36e21441b768c4
+AUX redmine-3.3.4_requires.patch 2632 SHA256 d45ceeb281bbbb4a723f170b7748713b2af605b399dbdbb643fa4a1aee9e329e SHA512 737605cd5f8c8df9e8113204a49ce452908a75675d7c9682d4db455e9c852f881b5fa318e7f286727253ab56d7ced43c2b48b1066567ea2f6f1193c827da892e WHIRLPOOL bb1515368426e8d41c2c888af02eb2b057b55fde78fcd6a679ef557cefc6ef53db31e8fb6e62f0b57ab8178195b049001f41c04f3d0794fa0ecfa59ce650d13f
+AUX redmine-3.initd 1269 SHA256 7e9eaabbf0da516991d7e585e7fb0f9a00e6c1a454254c635e258d5adc060037 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece WHIRLPOOL f7e7ba0eb84c395c0a0abb62a834e3eee584b2e3530b35e6baac94163b22c38cba46f1e6d9dfc6bd83126942e4b4a02008ac1b4991becfca9643391f486322ab
+AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
+AUX redmine.logrotate 106 SHA256 c0999bdfedb44d8c84ca933c5371770194dbc46e6f06a9dac467dcb4dbc5f2d0 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1 WHIRLPOOL 8b9ac739c63c226deda3a3fca5e89f277770de7bcad0c9777a203971236ed45f28a793ecc067b7e92704d99a1afe79883f36dea0658e02cd3d59f9151d3cf9f9
+DIST redmine-3.2.7.tar.gz 2322680 SHA256 f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc SHA512 74eb67e25a835500c7eb1c251de824981d45402fa04d03801c16ed2e3a78d90e3eee414063fd95379749335714e72c34760a251b3a583176e76cb9398e24b711 WHIRLPOOL 61dd4497d290b6f88fa4332119b9e2c0fcf27a727f5cb727f2700153eef6fac5e088a77d5f120e77f3a59f53e2de1fa9ad6eb03a0cfb2aba3ecf4eb2998dc9ff
+DIST redmine-3.3.4.tar.gz 2367776 SHA256 f28125f31df7ebcf7debf9b030d62002e2757c6ed228882ac64562dec90efbac SHA512 152806f829ba7e4f8df18933aa9d46c959e9f314a5698b20f30b90bb0d1292439fd6a3dfaea427145273d3fd37d48f62a64068dd7f8ab1cbe507eaf5c09f7f2e WHIRLPOOL 5a61eb7ba1dfd56cc3564488ee4a3686876cfea6fe83b624a0014588a27e6623b6ed5bcfe668e92b1edf26895b3d9f6c88edccca9629539147649aa7f197ba22
+DIST redmine-3.4.2.tar.gz 2438319 SHA256 747d649e3bceef41345a147a17db143ea646eaefb23ad7c514027456847c77fd SHA512 aededddd59bb84633f7360fb19e78a9313cf2654cb2a36a449c305834dc58d8e45f4d0433fe6d188f44e950163987b8b5e5285c9a9706d6f95f2346acdfd81fe WHIRLPOOL 23c01a72d7329e5948b0ba6a6ff59dcf162c364e8eaf60714e5883b6c36796b58b12867ebb678dcac714d7dfb49610795a417b410fd56b3e0765483e968aa894
+EBUILD redmine-3.2.7-r1.ebuild 6863 SHA256 c69b26a33f176ea4468beaa9f51e1a6ef5792b1891ae34e75747877a692d211e SHA512 3a5e65dcdafb654d0e741e56d6fa8e5045a398f9910a7aa0d392204783ad948ff2a5f8c466f3764205ceff9485af2b9600ea3042e6ab6becce25990fe0190f1e WHIRLPOOL a816467088352a752fcbbd20cad623e51b2ed900062bd335ae294b0b11fa405408553e7771e9092f2fd3102891af5e355d0e8e05e29fe970d102b36d67250dee
+EBUILD redmine-3.2.7.ebuild 6863 SHA256 a39eb7c5ac6bde49cbd17bc82115b785ff2f31cb2e4033458ad83a7509961e63 SHA512 6e4b36796adc3b1f80373159828c494fd043ed9e0a0d202231689b06eccf68293f091a8f0d9de2c87f549d526fc93e49791aefbba65f2aef57673c95a6822445 WHIRLPOOL 014886e11253e241042b0875a106ce2d3f8175d073844eedb91d81c78c7219745ac2a2b7c32a9656a27ec247ac2fc34d83d59f8e00c149c967c543c24f7fa0c9
+EBUILD redmine-3.3.4-r1.ebuild 6583 SHA256 b2d5de053d6a6e03c277c0451b589b79c306a92ea0bb2efd75fd77dd093523ab SHA512 0a4769542933822a8650bdf837a1fc953beb79b6ac5f3170618f30cb43cded2b6ba811db947cc85b7082964f34af95c0782ab8470c070ace9d0a361a9cefa013 WHIRLPOOL 324ade0a32e25bebb2e552dc2b50e20bc1e117b06753457e4e275726e4fa310df71495231c1b12076b6b8ee179a1dd30cd17f2934fe7fad18bdc7b147a91852d
+EBUILD redmine-3.3.4.ebuild 6583 SHA256 74dbf5fc9e2076f6667ea69bf7065814f9a7bae04fc42f10ad20a86bd0a77d06 SHA512 1b1767683f44b62169b4a205a635e324c7ed657515e95993c415f947e65181a2bb6299c666fef0a834e5d2d865d80b86b6f902da4c311ee453e60f306e59164a WHIRLPOOL 91ddcba928f7f3a8dc0ce4cfb7455cd26f2908253dd783968eb9fee179b7a181d6a389398d19379592dc11e8d294299494aab21cba01121f9ed9d72efbb3268e
+EBUILD redmine-3.4.2-r1.ebuild 6590 SHA256 359384bf4fdf36a91e76be44d110520ef544daaeb38c18ca17a99df5e30e96b2 SHA512 995ead1f0968ff585ec892ca4b34c1369e50542f80427e0341a93e36e4ef3ef8b140668c14e89c4eb951ec980a6d7efc9ea66a3c585e50bb5889e9e88e4f711e WHIRLPOOL c3846ac498d8da0a6d87cbe12d1150b8ca9d37de4c3ba2c91d0d76acb7be155c6cd5fa438dc3f32f2fbb8f80e777be195c51f85ec0e66d87f17c3a623772d41b
+EBUILD redmine-3.4.2.ebuild 6590 SHA256 9be76a40a11a524426b842767a605ee29c082306e17b940e0e9c3c6d28dd057b SHA512 84b54aea6054f6fb2ac961ce7a0a647474ea4acf7f12ed81a2ecc5a38cc6b49053fa058321dbef9b555bcbae1850f14a422ef0902a6c82c30f27bfd24c6dc4b9 WHIRLPOOL 998ca955d951cb322793e08b3a9888ce3d4226205e6937c08609ab8d23d5c202ea06dd6ee99febeacfce6486d8a223f832124faa94b7ad5ad7ab6fa06fd28c3c
+MISC ChangeLog 3999 SHA256 96b085622c371ed012428ec6bff28c7cd5423bf06f8d788d39d574c1dcadbeb4 SHA512 97aa9958e2ab41ce90e1b6607b550a8053653d52e4e0c9d4d99920f4da789a1f3cbe24f27ff50b89af227f94bb8191ce4884c204b61f8f075e68d3880d8fe73f WHIRLPOOL dc8d7e880d8fbef9764601a771256bbf6713fd90beaa30617f6603b8aa91b9c89b928d93d44e4fdeb9b2dcbe21e30c6caa28f513fee2e63351bdb35e142ebbdb
+MISC ChangeLog-2015 9269 SHA256 3814b4ebd58462879a42dcc4ac854c11670d0d13bdc5a98aa41638d79bb2bdff SHA512 2d4e57af048aaa3d0baff110d72fe5e59259f1c5bfb10fc445157cc35a558a36379135b7065e0ca3dad80ee083b539d8dae53084c6bcb2487470ab3c05b2dc10 WHIRLPOOL 8d4530cabfb864263160329f9a1b90f6a8efc96911fd2fa43653614239c5897296adec7e8eb303969a7bdef559db75851f2523272033494865fe2eeb320dc024
+MISC metadata.xml 527 SHA256 90c80d49a227178b30c96ef99f2849474109570a550a337730ebbe1f28b97826 SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4 WHIRLPOOL e5167ddd29b75e750adcedbbb195b53d66cf03313f615e273e8c4523c1b96bb535b88abb8a81fe2cf1ca6d789b6aa6b1535f575d838d933b335ec22a2849052d
diff --git a/www-apps/redmine/files/10_redmine_vhost.conf b/www-apps/redmine/files/10_redmine_vhost.conf
new file mode 100644
index 000000000000..33a117a91e52
--- /dev/null
+++ b/www-apps/redmine/files/10_redmine_vhost.conf
@@ -0,0 +1,12 @@
+<IfModule passenger_module>
+Listen 3000
+<VirtualHost *:3000>
+        DocumentRoot /var/lib/redmine/public
+#       RailsEnv production
+        <Directory "/var/lib/redmine/public">
+                Options FollowSymLinks
+                Order allow,deny
+                Allow from all
+        </Directory>
+</VirtualHost>
+</IfModule>
diff --git a/www-apps/redmine/files/additional_environment.rb b/www-apps/redmine/files/additional_environment.rb
new file mode 100644
index 000000000000..a4e9baf758a1
--- /dev/null
+++ b/www-apps/redmine/files/additional_environment.rb
@@ -0,0 +1,7 @@
+# Copy this file to additional_environment.rb and add any statements
+# that need to be passed to the Rails::Initializer.  `config` is
+# available in this context.
+
+# Place log-files to /var/log/redmine
+config.logger = Logger.new(Rails.root.join("/var/log/redmine",Rails.env + ".log"), 0, 10485760)
+config.log_level= :info
diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch
new file mode 100644
index 000000000000..e4510839cf48
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.3.4_requires.patch
@@ -0,0 +1,60 @@
+diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb
+--- redmine-3.3.3-orig/app/controllers/application_controller.rb	2017-05-24 21:05:03.515966923 +0500
++++ redmine-3.3.3/app/controllers/application_controller.rb	2017-05-24 21:07:22.629960174 +0500
+@@ -15,6 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'request_store'
+ require 'uri'
+ require 'cgi'
+ 
+diff -Nuar redmine-3.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb
+--- redmine-3.3.3-orig/app/controllers/welcome_controller.rb	2017-05-24 21:05:03.514966923 +0500
++++ redmine-3.3.3/app/controllers/welcome_controller.rb	2017-05-24 21:08:14.895957638 +0500
+@@ -15,6 +15,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'action_controller'
++require 'action_controller/action_caching'
++
+ class WelcomeController < ApplicationController
+   caches_action :robots
+ 
+diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb
+--- redmine-3.3.3-orig/app/models/custom_field.rb	2017-05-24 21:05:03.513966923 +0500
++++ redmine-3.3.3/app/models/custom_field.rb	2017-05-24 21:08:32.223956797 +0500
+@@ -15,6 +15,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'protected_attributes'
++
+ class CustomField < ActiveRecord::Base
+   include Redmine::SubclassFactory
+ 
+diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb
+--- redmine-3.3.3-orig/app/models/mailer.rb	2017-05-24 21:05:03.514966923 +0500
++++ redmine-3.3.3/app/models/mailer.rb	2017-05-24 21:05:47.039964812 +0500
+@@ -16,6 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ require 'roadie'
++require 'roadie-rails'
+ 
+ class Mailer < ActionMailer::Base
+   layout 'mailer'
+diff -Nuar redmine-3.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb
+--- redmine-3.3.3-orig/config/application.rb	2017-05-24 21:05:03.689966915 +0500
++++ redmine-3.3.3/config/application.rb	2017-05-24 21:05:35.723965361 +0500
+@@ -1,8 +1,8 @@
+ require File.expand_path('../boot', __FILE__)
+ 
+ require 'rails/all'
++require 'action_dispatch/xml_params_parser'
+ 
+-Bundler.require(*Rails.groups)
+ 
+ module RedmineApp
+   class Application < Rails::Application
diff --git a/www-apps/redmine/files/redmine-3.initd b/www-apps/redmine/files/redmine-3.initd
new file mode 100644
index 000000000000..507987034be3
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.initd
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+RAILS_ENV=${RAILS_ENV:-production}
+REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
+REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
+REDMINE_PORT=${REDMINE_PORT:-3000}
+REDMINE_USER=${REDMINE_USER:-redmine}
+REDMINE_GROUP=${REDMINE_GROUP:-redmine}
+REDMINE_PIDFILE="/var/run/redmine/server.pid"
+
+depend() {
+	use git-daemon mysql net postgresql svnserve
+}
+
+start_pre() {
+	if [ ! -e "${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then
+		eerror "Execute the following command to initialize environment:"
+		eerror
+		eerror "# emerge --config www-apps/redmine"
+		eerror
+		return 1
+	fi
+	checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine
+}
+
+start() {
+	ebegin "Starting redmine"
+	start-stop-daemon --start --quiet \
+		--user "${REDMINE_USER}:${REDMINE_GROUP}" \
+		--pidfile "${REDMINE_PIDFILE}" \
+		--exec /usr/bin/ruby "${REDMINE_DIR}"/bin/rails server -- \
+		--daemon --environment="${RAILS_ENV}" \
+		--binding="${REDMINE_ADDRESS}" --port="${REDMINE_PORT}" \
+		--pid="${REDMINE_PIDFILE}" \
+		${REDMINE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping redmine"
+	start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}"
+	eend $?
+}
diff --git a/www-apps/redmine/files/redmine.confd b/www-apps/redmine/files/redmine.confd
new file mode 100644
index 000000000000..1c3830a09b07
--- /dev/null
+++ b/www-apps/redmine/files/redmine.confd
@@ -0,0 +1,13 @@
+# /etc/conf.d/redmine: config file for /etc/init.d/redmine
+# Bind to specified address
+# You can set to 0.0.0.0 to accept requests anywhere
+#REDMINE_ADDRESS="localhost"
+
+# Port
+#REDMINE_PORT=3000
+
+# RAILS_ENV
+#RAILS_ENV=production
+
+# additional opts
+#REDMINE_OPTS=""
diff --git a/www-apps/redmine/files/redmine.logrotate b/www-apps/redmine/files/redmine.logrotate
new file mode 100644
index 000000000000..69e98cb3fc64
--- /dev/null
+++ b/www-apps/redmine/files/redmine.logrotate
@@ -0,0 +1,9 @@
+/var/log/redmine/*.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	delaycompress
+	notifempty
+	copytruncate
+}
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
new file mode 100644
index 000000000000..c8cda2384e9b
--- /dev/null
+++ b/www-apps/redmine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>azamat.hackimov@gmail.com</email>
+  <name>Azamat H. Hackimov</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<use>
+  <flag name="markdown">Enable support for Markdown</flag>
+  <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/www-apps/redmine/redmine-3.2.7-r1.ebuild b/www-apps/redmine/redmine-3.2.7-r1.ebuild
new file mode 100644
index 000000000000..ee397cf4ee39
--- /dev/null
+++ b/www-apps/redmine/redmine-3.2.7-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap fastcgi passenger imagemagick"
+
+ruby_add_rdepend "
+	dev-ruby/rubygems
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/jquery-rails-3.1.4:3
+	>=dev-ruby/coderay-1.1.0
+	>=dev-ruby/builder-3.0.4:*
+	>=dev-ruby/roadie-rails-1.1.0
+	dev-ruby/mime-types:*
+	=dev-ruby/request_store-1.0.5
+	>=dev-ruby/rbpdf-1.19.0
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	dev-ruby/protected_attributes
+	>=dev-ruby/redcarpet-3.3.2
+	>=dev-ruby/nokogiri-1.6.7.2
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	>=dev-ruby/ruby-openid-2.3.0
+	>=dev-ruby/rack-openid-0.2.1
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
+	#	ruby_targets_ruby19? (
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
+#	)
+
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me || die
+
+	# bug #406605
+	rm .gitignore .hgignore || die
+
+	rm Gemfile || die
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
+	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	# Make it work
+	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
+	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
+		app/controllers/welcome_controller.rb || die
+	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
+	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
+	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
+}
+
+all_ruby_install() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
+	rm -r doc || die
+	dodoc README.rdoc
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo
+		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.2.7.ebuild b/www-apps/redmine/redmine-3.2.7.ebuild
new file mode 100644
index 000000000000..5c7f032e6273
--- /dev/null
+++ b/www-apps/redmine/redmine-3.2.7.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap fastcgi passenger imagemagick"
+
+ruby_add_rdepend "
+	dev-ruby/rubygems
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/jquery-rails-3.1.4:3
+	>=dev-ruby/coderay-1.1.0
+	>=dev-ruby/builder-3.0.4:*
+	>=dev-ruby/roadie-rails-1.1.0
+	dev-ruby/mime-types:*
+	=dev-ruby/request_store-1.0.5
+	>=dev-ruby/rbpdf-1.19.0
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:*
+	dev-ruby/protected_attributes
+	>=dev-ruby/redcarpet-3.3.2
+	>=dev-ruby/nokogiri-1.6.7.2
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	>=dev-ruby/ruby-openid-2.3.0
+	>=dev-ruby/rack-openid-0.2.1
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
+	#	ruby_targets_ruby19? (
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
+#	)
+
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me || die
+
+	# bug #406605
+	rm .gitignore .hgignore || die
+
+	rm Gemfile || die
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
+	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	# Make it work
+	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
+	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
+		app/controllers/welcome_controller.rb || die
+	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
+	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
+	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
+}
+
+all_ruby_install() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
+	rm -r doc || die
+	dodoc README.rdoc
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo
+		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.3.4-r1.ebuild b/www-apps/redmine/redmine-3.3.4-r1.ebuild
new file mode 100644
index 000000000000..113a62483531
--- /dev/null
+++ b/www-apps/redmine/redmine-3.3.4-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${P}_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.3.4.ebuild b/www-apps/redmine/redmine-3.3.4.ebuild
new file mode 100644
index 000000000000..b65197f8bc20
--- /dev/null
+++ b/www-apps/redmine/redmine-3.3.4.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:*
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${P}_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.4.2-r1.ebuild b/www-apps/redmine/redmine-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..d50f5c1e5135
--- /dev/null
+++ b/www-apps/redmine/redmine-3.4.2-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.4.2.ebuild b/www-apps/redmine/redmine-3.4.2.ebuild
new file mode 100644
index 000000000000..50abc9804762
--- /dev/null
+++ b/www-apps/redmine/redmine-3.4.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:*
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+	einfo
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/rocketwiki-lqfb/Manifest b/www-apps/rocketwiki-lqfb/Manifest
new file mode 100644
index 000000000000..77c5ea6ad229
--- /dev/null
+++ b/www-apps/rocketwiki-lqfb/Manifest
@@ -0,0 +1,6 @@
+AUX rocketwiki-lqfb-0.4-utf8.patch 1164 SHA256 2fa2f060093f7d9ddc155f90190865d9aafbc5a701dc9f7b904cfad62e613994 SHA512 146a39a78e944f41d569f47ec39a53b192d4a5c127189cd3cb4e784e33a94761c0cc309f7edc08f73fab6eb6ceaf6545757e232c5a912f874c5bf4af80c9903b WHIRLPOOL 04269332d7cdc81ed182c97b134508167dfcdd8c595ecaf81b9623f64cf0865f45613f3e39c6a9ad328ec646850578b00561e09e428fbc927be8e353919abc6d
+DIST rocketwiki-lqfb-v0.4.tar.gz 5274 SHA256 d4035e01026585eab69d135e70cf3e5b8cfd93c078d09303902f3862f885c830 SHA512 fa90b317007c42e2e6d36c79773948ab7ab68ee914bd20825e0d5acbb8bf0add2c0a48119440d8a5b4c991f2d1f59bc83a1835b02d9070ae67fca1d4ffb73caf WHIRLPOOL 41dc9f02ed196f7c1881c33f0092cb267d45299dc6eb479afda9fa9adde30be06405af60faebd1cfa85e7c5ee16a8f161f59f5881824326ddc05d97489f3bf29
+EBUILD rocketwiki-lqfb-0.4.ebuild 648 SHA256 cbe552bf33b81f645ea029ca75c628541f0b6a79c0b120d8cd20d339f4b0c4c1 SHA512 2f54c4fda9de1a7c3d635631b8ed5a80a54a7b776c3f679ba2c5113ad2e98ddc3bc2a1466e5ebfdd7f2f62cb19c2f7d0d3358d0edb7da16995651235ae40c6a6 WHIRLPOOL bfaf203582db1a852a6772bc901c4cfdf603f067c0aa89a45b25f0e1d1031689cf3453180db491a1e6506416c9f7d51717148016f2c1e7e65bf9bdd214ff0eb6
+MISC ChangeLog 2630 SHA256 cdc234db9529d1067607d15f723f9d6a179ebe39c917c444571f1d26fb6f0089 SHA512 c33f2b2881bb24cdeb75b6ccb735c04137ca33fd8fb2469eab833092911c0f1e4c03587e7c0937120fd852d9e1192bdd580985ad1beb6be185aa5c1d80eb2705 WHIRLPOOL 8b8d9fe4486a58df53996255780137e3ec4756846984cb464fb3b5de95cb6006c2bea9828deb452bbe15fcd09835e9bd0ff6ca7479988b3f4e9a37950d54f9bd
+MISC ChangeLog-2015 609 SHA256 bdeaceae18fb2935002f1e1f7fbf1d77f569e32f6c8b155f7117503a9745fe69 SHA512 e1ddf45b110e7d8418a51b09255afef0646c4e242d1e57aae372d491a3b887ee8e8e0b7404c087d65460bb2c08e3265240177f1773d9cf06e4605bb553c21162 WHIRLPOOL e889a7d81f04213bc13042fcc126c2fc1c07da63f31da8588a8e133e8a86b7b73888f84c22138e9b7eb5abcb2e369dd20bcedd58ac18bfdf9a7c54858f2d7842
+MISC metadata.xml 502 SHA256 3363dc354fc6abf6df18138e3eeb61272bb0b0b37ff8bf6a1a3a8056bd581dc9 SHA512 f9c4da2ace81b5cf8ce45de2e923ae3ef67bb486c606f6ef2737bc733c27308bf11a653a2fe12f9036d4053eb10e514489aa7fdcc5db363ad043c607c45800d7 WHIRLPOOL 73eef82cfa698fd8bdba9b6a3063f738cf43cd3092da90603c7481d78e26d500a86b5e883268552bdef2bfb8e4962638b714a658cc5d49a941419755e6e4bb5a
diff --git a/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
new file mode 100644
index 000000000000..0156686ee29c
--- /dev/null
+++ b/www-apps/rocketwiki-lqfb/files/rocketwiki-lqfb-0.4-utf8.patch
@@ -0,0 +1,44 @@
+--- rocketwiki-lqfb.hs.old	2013-04-25 21:41:34.044588280 +0200
++++ rocketwiki-lqfb.hs	2013-04-25 21:42:33.108020316 +0200
+@@ -2,6 +2,7 @@
+ import Text.ParserCombinators.Parsec
+ import Control.Applicative ((<$>), (<*>))
+ import Data.List (intercalate)
++import System.IO (hSetEncoding, stdin, stdout, utf8)
+ 
+ 
+ -----------------------------------------------------
+@@ -405,7 +406,10 @@
+       return htmlEntity
+ 
+ 
+-main = interact wikiParse
++main = do
++	hSetEncoding stdin utf8
++	hSetEncoding stdout utf8
++	interact wikiParse
+ 
+ wikiParse str
+   | success parseResult = html
+--- rocketwiki-lqfb-compat.hs.old	2013-04-25 21:41:41.340518231 +0200
++++ rocketwiki-lqfb-compat.hs	2013-04-25 21:43:21.299557312 +0200
+@@ -2,6 +2,7 @@
+ import Text.ParserCombinators.Parsec
+ import Control.Applicative ((<$>), (<*>))
+ import Data.List (intercalate)
++import System.IO (hSetEncoding, stdin, stdout, utf8)
+ 
+ 
+ -----------------------------------------------------
+@@ -412,7 +413,10 @@
+       return htmlEntity
+ 
+ 
+-main = interact wikiParse
++main = do
++	hSetEncoding stdin utf8
++	hSetEncoding stdout utf8
++	interact wikiParse
+ 
+ wikiParse str
+   | success parseResult = html
diff --git a/www-apps/rocketwiki-lqfb/metadata.xml b/www-apps/rocketwiki-lqfb/metadata.xml
new file mode 100644
index 000000000000..10420b57d80d
--- /dev/null
+++ b/www-apps/rocketwiki-lqfb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>tupone@gentoo.org</email>
+<name>Alfredo Tupone</name>
+</maintainer>
+<longdescription lang="en">
+RocketWiki is a small parser written in Haskell which translates a wiki dialect to HTML. It uses Parsec, a monadic parser combinator library. The compressed source code of RocketWiki has a size of only 5162 bytes.
+</longdescription>
+</pkgmetadata>
diff --git a/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
new file mode 100644
index 000000000000..662933a4fb42
--- /dev/null
+++ b/www-apps/rocketwiki-lqfb/rocketwiki-lqfb-0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="Small parser which translates a wiki dialect to HTML"
+HOMEPAGE="http://www.public-software-group.org/rocketwiki"
+SRC_URI="http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/gmp"
+DEPEND="${RDEPEND}
+	dev-haskell/parsec
+	dev-lang/ghc"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-utf8.patch
+}
+
+src_install() {
+	dobin ${PN}{,-compat}
+}
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
new file mode 100644
index 000000000000..805193780080
--- /dev/null
+++ b/www-apps/roundup/Manifest
@@ -0,0 +1,5 @@
+DIST roundup-1.5.1.tar.gz 2618886 SHA256 d5b915e57d33c302ca38a0f018032ac7842570a4d1a5ac3f04f6f07211f94a68 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58 WHIRLPOOL 093f3b7d202b04ab3e21f96a1fb0b900d24c5ff60a91a716ed96d0abb106d124b251440a4b5f449b82d2d986dbe860cc37fadd84630386d5e4f60861e1f2dbd6
+EBUILD roundup-1.5.1.ebuild 1227 SHA256 3ba493d120c889659f9cff5e1c5b1f6016edf269bf5fc03b75ce35475e8fa6c0 SHA512 fe8a296bbb8713e76cf34b1f8e1bb1dfa26c5c58d9c393893f1181b148237534ce4d88d520b3624b74d468ab6b01b464a85540fab55ad1b306e580257c410085 WHIRLPOOL 77282bceea3a89dbf2ee3e8a7af8cb0710dc551ffe59bdc26856518a83f85312f416991ea1ee089c532256fe6b361fc1c861e18f8c4f393d3244e4a9604d0e46
+MISC ChangeLog 3272 SHA256 58b066b920977bc989f11cf691d302c1a76b6fa1cb65de95dd1daf620b05440d SHA512 36f38aba3aac4047d9501930b013410e24a1159b938235cafb0a963bd1d156d1eb0ec51f65b78664c610603ee4400dec1e3c43984c46e85103f042a2a08214c3 WHIRLPOOL 26993b603977d79e99f1a67af5cc566d650e4c95dd0bcb434371212de111797b6e31588f3b7db21e8ab6c4594ec6dc84f02f238e82b504f85e716cf73dc491de
+MISC ChangeLog-2015 11365 SHA256 feb6bec2b2cc2727d7effc9a06543294b713ae79df76a46aa31774227d6015e7 SHA512 5727ca077f734ab039e1d151b061dd8abd3e40ede505085989ff493b106823e37e69359e715a568d8709e28a25c322bdfcb48a2da99fd03742b26e34f594c3bf WHIRLPOOL d7fca64b8dfad434ba1c48a92344d0a398097b6c0ac48e368345d8d9d5c1d196c792d7983b3d79b263f820e07a42b2c7c674f3ea103e32b5d46c88ddd2877250
+MISC metadata.xml 477 SHA256 d65faaf86fb9db15f2c340f551ddaebb6bf4c44c682eb56a58963559301ac57a SHA512 2a8912d94be88771ed0044ae823fb2027fb3f403256f8d3045b01a46f9595866a9129e85cdbc05e601a18d264b92c88648e8acc78a50ce52a4810ee7d5532999 WHIRLPOOL c2f2985119fe668910a75726da51b3fc62c9527ad0b43c67874cdde964bcd4c659b83486025d424cd8996814d291ce9bc5691575c819afe95442ef2b2c00c117
diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
new file mode 100644
index 000000000000..0942edd01872
--- /dev/null
+++ b/www-apps/roundup/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">roundup</remote-id>
+		<remote-id type="sourceforge">roundup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/roundup/roundup-1.5.1.ebuild b/www-apps/roundup/roundup-1.5.1.ebuild
new file mode 100644
index 000000000000..dd40a00a4804
--- /dev/null
+++ b/www-apps/roundup/roundup-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Issue-tracking system with command-line, web, and e-mail interfaces"
+HOMEPAGE="http://roundup.sourceforge.net https://pypi.python.org/pypi/roundup"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT ZPL"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES.txt doc/*.txt"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+	dohtml -r doc/*
+}
+
+pkg_postinst() {
+	ewarn "As a non privileged user! (not root)"
+	ewarn "Run 'roundup-admin install' to set up a roundup instance"
+	ewarn "Then edit your config.ini file in the tracker home you setup"
+	ewarn "Run 'roundup-admin initialise' to setup the admin pass"
+	ewarn "run /usr/bin/roundup start port host \"your tracker name\" [your tracker home], and all should work!"
+	ewarn "run /usr/bin/roundup stop [your tracker home] to stop the server"
+	ewarn "log is in [tracker home]/roundup.log"
+	ewarn "pid file is in [tracker home]/roundup.pid"
+	ewarn
+	ewarn "See upgrading.txt for upgrading instructions."
+}
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
new file mode 100644
index 000000000000..62e87835d3f1
--- /dev/null
+++ b/www-apps/rt/Manifest
@@ -0,0 +1,13 @@
+AUX config.layout-gentoo 741 SHA256 1a880f8fd268519371b5321c5a80db30c0da07c2ab474e773141953403e8ae03 SHA512 d3cb968a528ccb19f64ef249f2df503e82d1763a22ea939cd202b9a0626c1d335e2b8a8db65b191e2cff105926e422670c6d435b579069a10d9c433e6bd1e0fb WHIRLPOOL e707ac51542c6b65747c20d148a45d6f33776312c19772bc54fe49c73873f5215e05987e3008940d75d3b4b2996ae75a763aa3cd0b3cf01dc65dea503fba6525
+AUX postinstall-en.txt 620 SHA256 ac1d1fba05ce479b40e5248042b3e1da8d5695b5382d04e4082063c199a13a82 SHA512 473acd53f962299a96b012b6c6e044590feb347efed208158ac8a1d4722c673fcddde2487556cf40fb97d201608fe066a9c243cd3f1682bea5e4039a4b5fb8dd WHIRLPOOL b905ef6ec00028efdc2ddee839989796c3386e71dcf990cae6251103d618d79243edfbd75bb6100598bcb98d14bf22e7dcea5424b292f636bb2832ca1702460f
+AUX reconfig 2133 SHA256 82743e18319eafecf66c5b804c193d9ca3c72d8fc41a9493b1ae91b8e14b5fe3 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56 WHIRLPOOL 9e9c4138dc4337174e3f67813d1926c7c88228bdd5747af8df15e6dee4547bdd165f19df25dce4fd523a9fdc6bbd389eee4495146bbb055fdcaab0c384317579
+AUX rt-makefile-serialize-install-prereqs.patch 596 SHA256 2fb732ffb622e2c6d8a96d6bfce895c58436bb8aa9830b6fe693ed19d5e68bfb SHA512 0ae2ad3ac5faf7ecc65545cfbba210034a2f532c4b1fa82b37956731b35d7e42e3d3ca4714834f2797ecec7292f19dca0be295ad92ed3931374d07af02ed10a1 WHIRLPOOL b849522781db1bc71a0be48c0d351e4a13eb4811d632e79896f375ce3e72e940eebffca15ae3a53f10762056537593b7d9e89b02eba10105b12d30fe9aa6502a
+AUX rt.conf.d.2 229 SHA256 73988366beb98516b12c842f51e322d95317c1d2d10fb292fcc0b97a34ccd6ee SHA512 4823a8241837d3b642149f3f81c16258811132bdcc515096de347ca1da14cf18d7791f10851682e55205e206f335c322926c4dd01ace30f7cb254995b48ea8e9 WHIRLPOOL aa6fa30dacd16d795ade86469ec3de7ebbe910eb9f863e2bba1c8ec118d19000b300b47a489c57e51f573ef79a3edbde18c9d08c8dc0cb9dff91dd95fb3defd6
+AUX rt.init.d.2 1318 SHA256 bbcf2e95cbcae37a240e9ae30b016d9dccd857f27367a34bf343e47be77df9b4 SHA512 ec7249e73e9efdcb1716e8ba3bf33d4791bf4e386b3c60207f5c1a37b8b456be8c0cd550bbe0645a9aa46afeb1c3331b3425bb9f5ef8b95b71f52f99f1244b91 WHIRLPOOL 06a5edb36eeacf105ab2e0f67c6505f8eb310a5ed12fd1f7b48ecdab473a3d276b11b28a71ebe6d207b8e23c410375c5305f97087a93505e65698f85e30176ee
+DIST rt-4.2.12.tar.gz 7537620 SHA256 e21220c609706dc9977a13309d78a4d9171455ae823cf549311342cedd837264 SHA512 e816c5481bdb158209bd78bc82af4abc0243af500abe55ae3aac666259e983282d82577de6207899745b4781fb0a50d3094901a248e7ac958dd852343b6f2676 WHIRLPOOL 726d6f7c92bdd120ae3c0463181cef3ade9c705ac23dbb93bf1a262ebc4d0d2f07144a67d04a06c3127dead7ad7e6b50f3966e2969bc8c0199507af4af854fec
+DIST rt-4.4.1.tar.gz 9057212 SHA256 f87329911020e01b39948070aec2bd7abf0c81641f0cf2f25e01c690a19f24f5 SHA512 2cb797e013b14201ececec2c408257fe3a998fefdafd0944efda0236caac40be4cc45878cbda7bf9ae82b3757de6167263db2b90331d925db1f916a8420adf94 WHIRLPOOL 2d5530cc57a1a02a2429b59c07459da3cd71b3b9596588f8f6010c67e74a56bde9793c0fd2d8c6d0bf2171930e0352fd723a40fa0d5bd815c1d596ba9802c450
+EBUILD rt-4.2.12-r1.ebuild 7508 SHA256 e9877fe3b9dda989e026a2570e3450457a092e10a4dbfa65cf12167f5c004b97 SHA512 1627e7017e512c1016689c34d3a2edd0a41461ffa2ce27f76428afdcc68876998c397edcdc8c6383677975fdbead35680d4a770142f4ec5540c81314018ed550 WHIRLPOOL 698657baedd7f2f196e405ee0555835258e4d692da7ace317809de326af15c3c2bfb7752733ba9b58479f290f08404ca64d80c6436a92664ced455bd26dfd2f2
+EBUILD rt-4.4.1.ebuild 7629 SHA256 e99b3546c915f373abcec8df33656ba5eb75d6d211b4539d5b3926261bd30d0b SHA512 8a2f291926499e5df9f4a60351ffea0aa9d92534c13ae54fcc3d8a4c9e37d46989be43d6f3f06d1641bb88e6feb5df707b892063064927b9ff5971b9f41e2db5 WHIRLPOOL 8d35dab50459db7483d7dbb053ef5ec4bb6e3d461c5d8b01f8c21d81ba308dd78bf33a526479f7ed2e3826f64043dc281d0268984c37dc677a5d5c640474a2e1
+MISC ChangeLog 5643 SHA256 86dac0e4e5f704cca8d46acd354d7d62ffc13acb8acaa3c17b609c337d9b7baa SHA512 1db44fdc3c4f6bd24ff2413bae3ddb58642d16387baa5133a6cb65cc07566877a589ef6f3e1c3d8501b9775b956094646ba5b71f1e375f53af3fcdcbf339a7cc WHIRLPOOL 1b69c1f95ea6c29a784936b6efb7339a8b091632a6fd5f113cfd23400683896318250c47c2a5e4a8555e4cea6a4b6f2b6d48c6abfafdf703247f6ad80a452c9c
+MISC ChangeLog-2015 15966 SHA256 c34772eb85e51a1ec90b625a870670bcd6dc912dd2ae583eddc93a01d8e650dd SHA512 fbf740b91a1f93c53f02c492121158696ec7ea82c491823929c7e4552ff0cae4a7498b1771f3e6903383672804170392948e7e981aa29f018e849c3c103b8737 WHIRLPOOL 57608c0a0a052d3e47b3b014b9e9c65c8be20fa13f639de8c7bc276418b8f08b093d8bda6d9406f29de87610bc8d11f2bc192b76b487ecd13598096fb07ca9e0
+MISC metadata.xml 767 SHA256 59ad02388643162eb8663e16a2d10d7f394d06213a5dc955736f7000d494517e SHA512 b74eee6a8e221bff8d7512aacf7ae8ddc01b4aa9fd3b8ceb000d399f4516dddb8db6f602c8e0311d3624b09501660f6121c0d98f1ee0c22e26f2aa587df44e82 WHIRLPOOL 1ecacafed294df79bbc43d8479669d81dbc59e7ee99d47ab0a6d06926f77967febb8f0e98818c42007d756b2563649b7cb6cd7f75cbb18cff635b85c932de700
diff --git a/www-apps/rt/files/config.layout-gentoo b/www-apps/rt/files/config.layout-gentoo
new file mode 100644
index 000000000000..39dde0a3a7ba
--- /dev/null
+++ b/www-apps/rt/files/config.layout-gentoo
@@ -0,0 +1,26 @@
+
+<Layout Gentoo>
+  prefix:		PREFIX
+  exec_prefix:		${prefix}
+  bindir:		${exec_prefix}/bin
+  sbindir:		${exec_prefix}/sbin
+  sysconfdir:		${prefix}/etc
+  mandir:		${prefix}/man
+  libdir:		${prefix}/lib
+  datadir:		${prefix}/share
+  htmldir:		HTMLDIR
+  fontdir:		${datadir}/fonts
+  lexdir:		${datadir}/po
+  manualdir:		${datadir}/doc
+  staticdir:		${datadir}/static
+  localstatedir:	${prefix}/var
+  logfiledir:		${localstatedir}/log
+  masonstatedir:	${localstatedir}/mason_data
+  sessionstatedir:	${localstatedir}/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customstaticdir:	${customdir}/static
+  customlibdir:		${customdir}/lib
+</Layout>
diff --git a/www-apps/rt/files/postinstall-en.txt b/www-apps/rt/files/postinstall-en.txt
new file mode 100644
index 000000000000..daa11ed9d14c
--- /dev/null
+++ b/www-apps/rt/files/postinstall-en.txt
@@ -0,0 +1,19 @@
+Please follow the Gentoo install guide found at:
+
+    https://wiki.gentoo.org/wiki/Request_Tracker
+
+Your local config files are located here:
+
+    ${VHOST_ROOT}/${PN}-${PVR}/etc
+
+************************************************************************
+*    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE    *
+************************************************************************
+
+Some file locations have changed. Everything is now installed, for real
+this time, into:
+
+    ${VHOST_ROOT}
+
+RT executables are no longer in /usr/bin. You may need to modify your
+existing configuration files accordingly.
diff --git a/www-apps/rt/files/reconfig b/www-apps/rt/files/reconfig
new file mode 100644
index 000000000000..9a1919965386
--- /dev/null
+++ b/www-apps/rt/files/reconfig
@@ -0,0 +1,56 @@
+#!/bin/bash
+PF=${PN}-${PVR}
+
+die() {
+    echo "#####"
+    echo $1
+    echo "#####"
+    exit 1
+}
+
+if [ $1 = "install" ]; then
+    # So, some craziness happens during the install process. First, we
+    # have doubled slashes, which the ebuild dutifully removes, but
+    # then, at some point, ${ED} is removed including its trailing
+    # slash, which leaves us with relative path references. That's why
+    # we remove the leading slash instead of the trailing slash in the
+    # variables below so that the sed statement will actually match
+    # what we mean.
+    echo "Replacing ${ROOT#/}${MY_HOSTROOTDIR#/} with ${VHOST_ROOT}/${PF}"
+    echo "Replacing ${ROOT#/}${MY_HTDOCSDIR#/} with ${MY_INSTALLDIR}"
+    echo "Replacing RT_DIR with ${VHOST_ROOT}/${PF}"
+
+    for file in $(find ${VHOST_ROOT}/${PF} -type f) ; do
+        sed -e "s|${ROOT#/}${MY_HOSTROOTDIR#/}/${PF}|${VHOST_ROOT}/${PF}|g" \
+            -e "s|${ROOT#/}${MY_HTDOCSDIR#/}|${MY_INSTALLDIR}|g" \
+            -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g" \
+            -i "${file}" || die
+    done
+
+    echo
+    echo "If you're upgrading RT, you may need to update your database."
+    echo "Take a look in:"
+    echo
+    echo "  ${VHOST_ROOT}/${PF}/upgrade"
+    echo
+    echo "Iterate through each sub-directory, in order, whose name is greater"
+    echo "than your previously installed RT version, and run the following"
+    echo "commands:"
+    echo
+    for step in schema acl insert ; do
+        echo "  ${VHOST_ROOT}/${PF}/sbin/rt-setup-database \\"
+        echo "    --action ${step} --dba DBSUPERUSER --prompt-for-dba-password \\"
+        echo "    --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> "
+        echo
+    done
+    echo "Note that some upgrade directories don't have all 3 items (schema,"
+    echo "acl, insert) and you can skip them safely."
+    echo
+    echo "Don't forget to read the online installation guide for more details"
+elif [ $1 = "clean" ]; then
+    echo "Please examine the contents of the following directories and delete"
+    echo "anything that is no longer necessary:"
+    echo
+    echo "  ${VHOST_ROOT}/${PF}"
+    echo "  ${MY_INSTALLDIR}"
+fi
diff --git a/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch b/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
new file mode 100644
index 000000000000..d0488918d5f9
--- /dev/null
+++ b/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
@@ -0,0 +1,12 @@
+diff -Naruw rt-4.2.11.orig/Makefile.in rt-4.2.11/Makefile.in
+--- rt-4.2.11.orig/Makefile.in	2015-04-27 20:56:16.000000000 -0400
++++ rt-4.2.11/Makefile.in	2015-05-14 13:50:05.279292835 -0400
+@@ -359,6 +359,8 @@
+ 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
+ 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
+ 
++.NOTPARALLEL: testdeps config-install dirs files-install fixperms instruct
++
+ install: testdeps config-install dirs files-install fixperms instruct
+ 
+ files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install static-install
diff --git a/www-apps/rt/files/rt.conf.d.2 b/www-apps/rt/files/rt.conf.d.2
new file mode 100644
index 000000000000..d5bc65394734
--- /dev/null
+++ b/www-apps/rt/files/rt.conf.d.2
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/rt
+
+RTUSER=rt
+RTGROUP=lighttpd
+
+# set RTPATH to rt's root
+RTPATH=/var/www/localhost/@@PF@@
diff --git a/www-apps/rt/files/rt.init.d.2 b/www-apps/rt/files/rt.init.d.2
new file mode 100644
index 000000000000..84e304efe17d
--- /dev/null
+++ b/www-apps/rt/files/rt.init.d.2
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use mysql postgresql lighttpd
+}
+
+FCGI_SOCKET_PATH=${RTPATH}/var/appSocket
+PIDFILE=${RTPATH}/var/pid
+
+start() {
+	checkpath -d "${RTPATH}/var" -m 0755 -o "${RTUSER}:${RTGROUP}"
+
+	ebegin "Starting RT"
+	rm -f ${FCGI_SOCKET_PATH}
+        start-stop-daemon --start \
+	    --exec ${RTPATH}/bin/mason_handler.fcgi \
+	    --pidfile ${PIDFILE} --user "${RTUSER}:${RTGROUP}" \
+            --background --make-pidfile --chdir ${RTPATH}  \
+            --stdout "${RTPATH}/var/service.log" \
+            --stderr "${RTPATH}/var/service.log" \
+            --env "PATH=$PATH" --env "FCGI_SOCKET_PATH=${FCGI_SOCKET_PATH}" \
+            --wait 1500
+
+        if [ "$?" != "0" ]; then
+            eerror "${SVCNAME} failed to start. Please see ${RTPATH}/var/service.log for the reason."
+            eend 1
+            return 1
+        fi
+
+	# make sure lighttpd can use the socket
+        for i in {0..10}; do
+		[ -a ${FCGI_SOCKET_PATH} ] && break
+		sleep 1
+	done
+
+        if [ -a ${FCGI_SOCKET_PATH} ]; then
+	    chmod g+rwx ${FCGI_SOCKET_PATH}
+            eend 0
+        else
+            eend 1
+        fi
+}
+
+stop() {
+	ebegin "Stopping RT"
+	start-stop-daemon --stop --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
new file mode 100644
index 000000000000..f1d1d6173dc8
--- /dev/null
+++ b/www-apps/rt/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+	<email>titanofold@gentoo.org</email>
+	<name>Aaron W. Swenson</name>
+	</maintainer>
+ 	<maintainer type="person">
+		<email>eric.joshua.martin@gmail.com</email>
+		<name>Eric Martin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+ 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+ 	</maintainer>
+	<use>
+		<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
+	</use>
+	<longdescription>RT is an enterprise-grade ticketing system</longdescription>
+</pkgmetadata>
diff --git a/www-apps/rt/rt-4.2.12-r1.ebuild b/www-apps/rt/rt-4.2.12-r1.ebuild
new file mode 100644
index 000000000000..011c42d01899
--- /dev/null
+++ b/www-apps/rt/rt-4.2.12-r1.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils depend.apache user
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+IUSE="mysql +postgres fastcgi lighttpd"
+REQUIRED_USE="^^ ( mysql postgres )"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1
+
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/CGI-4
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
+	>=dev-perl/DBI-1.37
+	>=dev-perl/Date-Extract-0.02
+	>=dev-perl/DateTime-Format-Natural-0.67
+	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/HTML-FormatText-WithLinks-0.14
+	>=dev-perl/HTML-Mason-1.43
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/HTTP-Server-Simple-0.34
+	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Locale-Maketext-Lexicon-0.32
+	>=dev-perl/Log-Dispatch-2.410.0
+	>=dev-perl/MIME-tools-5.425
+	>=dev-perl/MailTools-1.60
+	>=dev-perl/Module-Versions-Report-1.05
+	>=dev-perl/Role-Basic-0.12
+	>=dev-perl/Symbol-Global-Name-0.04
+	>=dev-perl/Text-Quoted-2.80.0
+	>=dev-perl/Text-WikiFormat-0.76
+	>=dev-perl/Tree-Simple-1.04
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/DBIx-SearchBuilder-1.660.0
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
+	>=virtual/perl-File-Spec-0.8
+	>=virtual/perl-Getopt-Long-2.24
+	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
+	dev-perl/CGI-Emulate-PSGI
+	dev-perl/CGI-PSGI
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
+	dev-perl/Convert-Color
+	dev-perl/Crypt-Eksblowfish
+	dev-perl/Crypt-SSLeay
+	dev-perl/Crypt-X509
+	dev-perl/DBD-SQLite
+	dev-perl/Data-GUID
+	dev-perl/Data-ICal
+	dev-perl/Date-Manip
+	dev-perl/Devel-GlobalDestruction
+	dev-perl/Email-Address
+	dev-perl/Email-Address-List
+	dev-perl/File-ShareDir
+	dev-perl/File-Which
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/GD[png,gif]
+	dev-perl/GnuPG-Interface
+	dev-perl/GraphViz
+	dev-perl/HTML-Format
+	dev-perl/HTML-FormatText-WithLinks-AndTables
+	dev-perl/HTML-Mason-PSGIHandler
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Quoted
+	dev-perl/HTML-RewriteAttributes
+	dev-perl/HTML-Tree
+	dev-perl/IPC-Run3
+	dev-perl/JSON
+	dev-perl/JavaScript-Minifier
+	dev-perl/MIME-Types
+	dev-perl/Module-Refresh
+	dev-perl/Mozilla-CA
+	dev-perl/Net-CIDR
+	dev-perl/PerlIO-eol
+	dev-perl/Plack
+	dev-perl/Regexp-Common-net-CIDR
+	dev-perl/Regexp-IPv6
+	dev-perl/Starlet
+	dev-perl/String-ShellQuote
+	dev-perl/TermReadKey
+	dev-perl/Text-Autoformat
+	dev-perl/Text-Password-Pronounceable
+	dev-perl/Time-ParseDate
+	dev-perl/TimeDate
+	dev-perl/UNIVERSAL-require
+	dev-perl/libwww-perl
+	dev-perl/Locale-Maketext-Fuzzy
+	dev-perl/Net-Server
+	dev-perl/Regexp-Common
+	dev-perl/Text-Template
+	dev-perl/Text-Wrapper
+	virtual/perl-Digest
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/perl-libnet
+
+	fastcgi? (
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+	)
+	!lighttpd? (
+		dev-perl/Apache-DBI
+		!fastcgi? ( >=www-apache/mod_perl-2 )
+	)
+	lighttpd? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	!lighttpd? ( ${APACHE2_DEPEND} )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		sys-apps/openrc
+	)
+"
+
+need_httpd_cgi
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	elog " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	ewarn
+	ewarn "If you are upgrading from an existing RT installation"
+	ewarn "make sure to read the related upgrade documentation in"
+	ewarn "${ROOT}usr/share/doc/${PF}."
+	ewarn
+
+	enewgroup rt
+	add_user_rt || die "Could not add user"
+}
+
+src_prepare() {
+	# add Gentoo-specific layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|g' \
+		-i ./config.layout || die 'config sed failed'
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
+}
+
+src_configure() {
+	local web
+	local myconf
+	local depsconf
+
+	if use mysql ; then
+		myconf="--with-db-type=mysql --with-db-dba=root"
+		depsconf="--with-MYSQL"
+	elif use postgres ; then
+		myconf="--with-db-type=Pg --with-db-dba=postgres"
+		depsconf="--with-PG"
+	else
+		die "Pick a database backend"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-FASTCGI"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-FASTCGI"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-MODPERL2"
+	fi
+	# Any loading Date::Manip from here on
+	# may fail if TZ=Factory as it is on gentoo install
+	# media ( affects install as well )
+	export TZ=UTC
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web} \
+		${myconf}
+
+	# check for missing deps and ask to report if something is broken
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat "${T}"/t | grep MISSING
+		ewarn
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
+		die "Missing dependencies."
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+	emake install
+
+	dodoc -r docs/*
+	# Disable compression because `perldoc` doesn't decompress transparently
+	docompress -x /usr/share/doc
+
+	# make sure we don't clobber existing site configuration
+	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# fix paths
+	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
+
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
+
+	if use lighttpd ; then
+		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
+		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
+	fi
+
+	# require the web server's permissions
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/rt/rt-4.4.1.ebuild b/www-apps/rt/rt-4.4.1.ebuild
new file mode 100644
index 000000000000..352322924004
--- /dev/null
+++ b/www-apps/rt/rt-4.4.1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils depend.apache user
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+IUSE="mysql +postgres fastcgi lighttpd"
+REQUIRED_USE="^^ ( mysql postgres )"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1
+
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/CGI-4
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
+	>=dev-perl/DBI-1.37
+	>=dev-perl/Date-Extract-0.02
+	>=dev-perl/DateTime-Format-Natural-0.67
+	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/HTML-FormatText-WithLinks-0.14
+	>=dev-perl/HTML-Mason-1.43
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/HTTP-Server-Simple-0.34
+	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Locale-Maketext-Lexicon-0.32
+	>=dev-perl/Log-Dispatch-2.410.0
+	>=dev-perl/MIME-tools-5.425
+	>=dev-perl/MailTools-1.60
+	>=dev-perl/Module-Versions-Report-1.05
+	>=dev-perl/Role-Basic-0.12
+	>=dev-perl/Symbol-Global-Name-0.04
+	>=dev-perl/Text-Quoted-2.80.0
+	>=dev-perl/Text-WikiFormat-0.76
+	>=dev-perl/Tree-Simple-1.04
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/DBIx-SearchBuilder-1.660.0
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
+	>=virtual/perl-File-Spec-0.8
+	>=virtual/perl-Getopt-Long-2.24
+	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
+	dev-perl/Business-Hours
+	dev-perl/CGI-Emulate-PSGI
+	dev-perl/CGI-PSGI
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
+	dev-perl/Convert-Color
+	dev-perl/Crypt-Eksblowfish
+	dev-perl/Crypt-SSLeay
+	dev-perl/Crypt-X509
+	dev-perl/CSS-Minifier-XS
+	dev-perl/Data-Page-Pageset
+	dev-perl/DBD-SQLite
+	dev-perl/Data-GUID
+	dev-perl/Data-ICal
+	dev-perl/Date-Manip
+	dev-perl/Devel-GlobalDestruction
+	dev-perl/Email-Address
+	dev-perl/Email-Address-List
+	dev-perl/File-ShareDir
+	dev-perl/File-Which
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/GD[png,gif]
+	dev-perl/GnuPG-Interface
+	dev-perl/GraphViz
+	dev-perl/HTML-Format
+	dev-perl/HTML-FormatText-WithLinks-AndTables
+	dev-perl/HTML-Mason-PSGIHandler
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Quoted
+	dev-perl/HTML-RewriteAttributes
+	dev-perl/HTML-Tree
+	dev-perl/IPC-Run3
+	dev-perl/JSON
+	dev-perl/JavaScript-Minifier-XS
+	dev-perl/MIME-Types
+	dev-perl/Module-Refresh
+	dev-perl/Mozilla-CA
+	dev-perl/Net-CIDR
+	dev-perl/PerlIO-eol
+	dev-perl/Plack
+	dev-perl/Regexp-Common-net-CIDR
+	dev-perl/Regexp-IPv6
+	dev-perl/Scope-Upper
+	dev-perl/Starlet
+	dev-perl/String-ShellQuote
+	dev-perl/TermReadKey
+	dev-perl/Text-Autoformat
+	dev-perl/Text-Password-Pronounceable
+	dev-perl/Time-ParseDate
+	dev-perl/TimeDate
+	dev-perl/UNIVERSAL-require
+	dev-perl/libwww-perl
+	dev-perl/Locale-Maketext-Fuzzy
+	dev-perl/Net-IP
+	dev-perl/Net-Server
+	dev-perl/Regexp-Common
+	dev-perl/Text-Template
+	dev-perl/Text-Wrapper
+	virtual/perl-Digest
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/perl-libnet
+
+	fastcgi? (
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+	)
+	!lighttpd? (
+		dev-perl/Apache-DBI
+		!fastcgi? ( >=www-apache/mod_perl-2 )
+	)
+	lighttpd? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	!lighttpd? ( ${APACHE2_DEPEND} )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		sys-apps/openrc
+	)
+"
+
+need_httpd_cgi
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	elog " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	ewarn
+	ewarn "If you are upgrading from an existing RT installation"
+	ewarn "make sure to read the related upgrade documentation in"
+	ewarn "${ROOT}usr/share/doc/${PF}."
+	ewarn
+
+	enewgroup rt
+	add_user_rt || die "Could not add user"
+}
+
+src_prepare() {
+	# add Gentoo-specific layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|g' \
+		-i ./config.layout || die 'config sed failed'
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
+}
+
+src_configure() {
+	local web
+	local myconf
+	local depsconf
+
+	if use mysql ; then
+		myconf="--with-db-type=mysql --with-db-dba=root"
+		depsconf="--with-MYSQL"
+	elif use postgres ; then
+		myconf="--with-db-type=Pg --with-db-dba=postgres"
+		depsconf="--with-PG"
+	else
+		die "Pick a database backend"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-FASTCGI"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-FASTCGI"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-MODPERL2"
+	fi
+	# Any loading Date::Manip from here on
+	# may fail if TZ=Factory as it is on gentoo install
+	# media ( affects install as well )
+	export TZ=UTC
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web} \
+		${myconf}
+
+	# check for missing deps and ask to report if something is broken
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat "${T}"/t | grep MISSING
+		ewarn
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
+		die "Missing dependencies."
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+	emake install
+
+	dodoc -r docs/*
+	# Disable compression because `perldoc` doesn't decompress transparently
+	docompress -x /usr/share/doc
+
+	# make sure we don't clobber existing site configuration
+	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# fix paths
+	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
+
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
+
+	if use lighttpd ; then
+		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
+		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
+	fi
+
+	# require the web server's permissions
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
new file mode 100644
index 000000000000..6c450479dc8b
--- /dev/null
+++ b/www-apps/rutorrent/Manifest
@@ -0,0 +1,6 @@
+DIST plugins-3.4.tar.gz 674444 SHA256 d8e8e4b2887fb15e97c7ecdfe5c76039d55fab7dc40f27655229e96e43bb507c SHA512 85d9ada4bd07cd50fdf88f4ae1a1bc682b6e54d5600356be73481094111cc21fad6fb2acac4b854ba815f986b3859caf824bc55c5bbac68872db8920e0c5fd9f WHIRLPOOL 312a27d986142087db6269af96a148761687e0eb295a3924319abf91a75ba1cb0d24f09f73bbbbfd6afa2a02ef99f22281187a479d26e84cf8ad11074dd93de5
+DIST rutorrent-3.4.tar.gz 241253 SHA256 358c19f439ed9eb27318d5cc04f467e8b894ee2752c12946ef6f9226466f1629 SHA512 2fee5dd21e0d63fa9059c96ad3e8d09f3ce556adbfd1cb148224af998edcdb82c2fe05cb56daac0cdb8c3d50346536611d019fddb1833b06fa2ebc30cd884a0a WHIRLPOOL b9ae1160cc8bd056e2db2e9207ecefdfa2fa9b5f0ef1e597ba49d2821471385c0c1ee52470849785c3d5e2840955e22946e7a03e4f188fe212e51269f691d239
+EBUILD rutorrent-3.4-r1.ebuild 1334 SHA256 73fa8d2239f1321e4d17fdacbb0c84e21ab0c1c96a7d9a4c92b5c9e68d2bb674 SHA512 02b3325e7ebfab527cb23ca49dce90517094e549fc5cb0f5b3a15394a66295032ad1aeae9ec9c6d2f580d173d741869e200201d8f7e2790571c638b47110fc03 WHIRLPOOL f6ad9cef0f71384cb6ef72900f9640d3f33be6818da0557aac2a398bb472a621e8d26adc55f893772be84e239d47941da91230adeeef15d616336cad36adf9dd
+MISC ChangeLog 3392 SHA256 ded35b7b1bd53ec06ca36ac0011c9c9b66944be7512fa4cf74450059719ad7f2 SHA512 a7d2386c35bbbe8d5d307df1d161195b9d504fcdd736a1b2512cbac6919b6044f9561bcb3efd1376b6d2757d3ce875c077b07d9b14425bd702a65ea22cf695c9 WHIRLPOOL 5c1666f6e6ec5b88f5c8e5f881be70e0252bf7af717048a675f4683159e318c7116508a7678b3aa2144f055e3a7f5b0cf4f4ab1172cf0e3368e2870fd0827353
+MISC ChangeLog-2015 1310 SHA256 08df01d928c110790e5e71ad269f90066ee84273e0426ba8dbe66d00384001b9 SHA512 10f289e5e291dd68d99b55ed568d81dc9c693d3399620901d0682c474858318d22991bf60e92c97d4117518cf5ea3866861727bdecaf63b9f17ebe9cefb0cb42 WHIRLPOOL 616c9f8cc498fddf94c5c707ba4f5d82605623a6b5e4d323f39be7e2500e67322ce97c723190412ab2f84a0dacccc6f5e19d1654f28f30c29cd1b51e574f9b60
+MISC metadata.xml 384 SHA256 5dce89dcd6e78742f74082fb3bfd95a35b36615679bccb123f43be05229bb403 SHA512 4ce6c3cdef62943df6a9071634912c9686317111dae1936fa765aba03808b286e90bb69ca3f79a263dc6a9913399645890481131bfe5071eb3bd7f7d6c7c42d3 WHIRLPOOL d26e90ca4ae5440f0ed64b53dd086cebc8513f0e2f55771089f91675723bd5c32b0eedbdc4ed10160b07233f82a03783ad50ea507c9a735295cf90cfe6e6c483
diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
new file mode 100644
index 000000000000..80f67343220e
--- /dev/null
+++ b/www-apps/rutorrent/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">rutorrent</remote-id>
+		<remote-id type="github">Novik/ruTorrent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/rutorrent/rutorrent-3.4-r1.ebuild b/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
new file mode 100644
index 000000000000..2837a1ea1407
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-3.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit webapp eutils
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+SRC_URI="
+			https://rutorrent.googlecode.com/files/${P}.tar.gz
+			https://rutorrent.googlecode.com/files/plugins-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+need_httpd_cgi
+
+DEPEND="
+	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+"
+RDEPEND="virtual/httpd-php"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	mv plugins rutorrent
+	cd rutorrent
+	doins -r .
+
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/share
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/scgi/Manifest b/www-apps/scgi/Manifest
new file mode 100644
index 000000000000..860766ae63a3
--- /dev/null
+++ b/www-apps/scgi/Manifest
@@ -0,0 +1,5 @@
+DIST scgi-1.14.tar.gz 29406 SHA256 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75 SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a WHIRLPOOL 969babed626fba1280f46eee7c620c9d42da1ffdabbf7752b849a26704f214773f07aae41849c873ba22f8bdc0c4c7f54455c130ec2992a943accfb328a183c5
+EBUILD scgi-1.14-r1.ebuild 641 SHA256 0e2b1761293a5b1d03d23f05cf5a0a21478005bd63928e19ca2b783a178ce2e9 SHA512 a9b6e3083ef84337ffc9c8213d4d52284548d9b6cb9eb0eace97a81d99cabfa9e2524aa9cc3d7e0ae3fa968e3597d3245acc9fe9e99471898346055b39e49509 WHIRLPOOL 56da75dfdae4f42a5061baa40b6a99e0f5de91d61c063635b3c63602f8aa7f8e081a86a47787f044bae6889c383f6814c79a93559f853e3292061feb5a0a05bb
+MISC ChangeLog 2650 SHA256 2ceebe1a67afd24e5246706171530dc5e866607f46fe9b1132b29633f8817252 SHA512 d023d8d5fe91ceed663791f3024f0208e05c4e37ba2321fdc4183ee89650c060af6ba1169151e076519d9f6a30fa591b731e9278fb89fa90eb0ef05f50eed9cf WHIRLPOOL ac4ddf85bee0cf4d8d3415bfc1338b9ebed80585afc79cede2ca20b4260c5f7ca440c7a6967774b28cd13f2ce19115d3c81c806b3e6c9d1a029ca16ee6575731
+MISC ChangeLog-2015 3049 SHA256 11fccc5bd8e8fee4de0ceb49155e383c0c54bed7a4c2380abaaf355efcadb051 SHA512 52c57d0e1f7b56b5f3d626d6373808d06f86166483e18ebbfdd99b1a20692faf6c745be6934263a5a3ddf68e7a41d8b287088622411e31c75f3ca0bf37488882 WHIRLPOOL 4b6cf85333c6c90fea5eba1d1a75f4db092e393e7ac5a0e2143bd79505ee44e0e98126a0cd76bc2a9854ad8bc4eade4a57ccdb7172dfa0c257934e90369d536b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apps/scgi/metadata.xml b/www-apps/scgi/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apps/scgi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apps/scgi/scgi-1.14-r1.ebuild b/www-apps/scgi/scgi-1.14-r1.ebuild
new file mode 100644
index 000000000000..68172fcfa083
--- /dev/null
+++ b/www-apps/scgi/scgi-1.14-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for implementing SCGI servers"
+HOMEPAGE="https://pypi.python.org/pypi/scgi http://python.ca/scgi/ http://www.mems-exchange.org/software/scgi/"
+SRC_URI="http://python.ca/scgi/releases/${P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_postinst() {
+	elog "This package does not install mod_scgi!"
+	elog "Please install www-apache/mod_scgi if you need it."
+}
diff --git a/www-apps/sitebar/Manifest b/www-apps/sitebar/Manifest
new file mode 100644
index 000000000000..ccabcc354b44
--- /dev/null
+++ b/www-apps/sitebar/Manifest
@@ -0,0 +1,13 @@
+AUX inc_writer.inc.php.diff 329 SHA256 ba4730c408946a453f02d59c6bb913b84bc84afcc41bf93443d67f05d0d985b0 SHA512 128a6afcca78fbbe9ceb242a956fc77edc958247e2981b486e3a6a57754f9c4dcdaa6c9ecd589d3ac22e1defc4e25911471f5cda1903c9e85ecd66fc8f304d96 WHIRLPOOL 6e15d01a4f99cbd4431ff839c6396659bcafa9fd85480d6aee88967d3c59eb0c84bc4ed07e3382ab089dcb80cef3a67d36145bd1490e0b3ba902f8b61ee69edf
+AUX postinstall-en.txt 93 SHA256 281af23fe8b57b34c44c47bb1d25a5c6ab1e6926386e4cab12ff615bba772831 SHA512 15d3c1a7acc7882c8971c6ada33a48605b63045902dd43d0bd30902c62360f30918686f73c2620a09e849559dcb6a0e6426327678cc76671518b0f07afab414f WHIRLPOOL 0644f325a6f7db8d384e408433b4aa7a6b21cf7b64582d7c04138cdf7d948b6c5f09f5821d0a3361170fb8a100186ce653ed7505ae09f94069a2a4784850d309
+DIST SiteBar-3.3.9.tar.bz2 526092 SHA256 6232ecbb4216117cf3bafa3746e51c14204f744804dfa75094a43d305dbcb355 SHA512 bcca2e654f86bac0e82f69932b8d1a7f3caaf5054731af70451f7423fd7d616c58663e7ff08e05183e37d0fa71880dbed16b8469b9759901aaa90cac998e2014 WHIRLPOOL 6ef998d690567fb6b33f8aae0a7b5a361809f0fade8f3eaa41e78a2b01b7675dc406829057c8b1dc49f7dd6126b8323cd09c7b8f777cc1bc0c8a4f096cbc92b5
+DIST SiteBarPluginIMAP_3.3.7_1.1.zip 9575 SHA256 34bcb35d124417fee0f4df8684f12fb61798f58cd4d2edb3da875aa313229b30 SHA512 27554658610f3ced7d3068d67eeabbc8c5eca3bfc15d858203f2a9ae6652f1be595ffe0b7b5ecc61026bf67301a50437dc20aef95c3e23cc266f08379432b995 WHIRLPOOL 86b98b26c354c6a41cd6caf12cd9ceb4cfa88cfc9c7d4451875176565e481c9a36832e612a252bff0a3e7512183858d8ba20103b136092b0fb3e0d07324ea35d
+DIST SiteBarPluginLDAP_3.3.7_1.1.zip 10036 SHA256 4a4bd8f65b6abbf2bf185e25002e7318b20cbbe28fe0113eccd11a7d39290aeb SHA512 99eb6749707125e62e5f4feb2ec6f8f0b6bc3ea39ffcc03182dbeb3dfbec7f151968f9c2559489ab34b0a16de0cac6333963f265ac1192fe72c605c6a6c71dcf WHIRLPOOL 2cb80ca58c0229ad5415558cbe93185b7162265d07413e37979d0f4bc2100d64d378e15e37cc87364c70e30b2072462cfafea6cef9d047196c51e275bd10591f
+DIST SiteBarPluginMailGate_3.3.7_1.0.4.zip 15685 SHA256 8b7ff5a960c9934353bb76c650527b8aecdf76c0493d8ca5597c4c07248544a9 SHA512 3e27d31c62bd7cadd734740247a8e94066d3787f7a19208f1630bc85720ddf9bcada5392aa654103c756780c92178d3df0d2ea0d3dd8ba63ccb77410a507e5c7 WHIRLPOOL 1f2d75cd49f9924aef2e8daca4297a38e90d306a26508cc7f1e0fbe0015ebff0cafdcb672b574e582256418422ef4b36425cd6dc9b13f007bae2b41e99291100
+DIST SiteBarPluginMessenger_3.3.7_1.2.zip 19406 SHA256 f57eada4d2954ed20587cee4f9d2cb8a17c4630224df30c0d09a42877e4b7f3a SHA512 eee9c2be52472972e454de49210f884a6436ccdaaf1ecedc59b25aa83a40ffa695ece645db65a5bcf246621de54d2f510a8e6a5e9f3b059ee0aa0c677a9b739c WHIRLPOOL 75170407262e8f7bbbd2b63cc8b5d4ae55f9f804ada76a7aea308f29d80efd718b559479ffa9b92fc7cf8f4d189c337308f62b2a414329413e9b7a2e2a02d429
+DIST SiteBarPluginXBELSync_3.3.7_1.1.zip 16487 SHA256 6f7c588bd910e7fa8983cc5a6e1a4ce7c713c997384ea1822475c6533e298fc6 SHA512 9ad4924912befec47851aba3ad3f9c13ef94db6de09b56c6c75c10e76ac44e54b7d07303936aef70bd720a15e8a3569af49bec92aa68eedf05d49389c4c0cbf5 WHIRLPOOL 58764c4a89ea3cbd180b53df63d82ad6969eeaeaf58fe219bb6465490b7f05871c9b2f6729214d572d6ab1977850dc7471211deaced7eca30bbb5ff1d595439b
+EBUILD sitebar-3.3.9-r1.ebuild 763 SHA256 fe75973c631ef773879ed8ed469510298c95a19a3bd5731dc4300d945d7e9a7c SHA512 090925624c7019b250556aeaffcd99eff8b30bd00e173dc7791fcc75b63cc00951d339db31e07585733a160758092841a4614ed2128b64efd82071fd7b2de365 WHIRLPOOL d3f88f624b59f3d023a38ba580877c18304beed60e94790fd11ca80ebeacacb51a99e7e82cad9407aacf08d18a280b8d4d04662963db847acbf5f853180b3065
+EBUILD sitebar-3.3.9-r2.ebuild 1284 SHA256 942f7361bd4191aa0fe26d4d6e9ca03e5e0bdb3157dd39d0e7722cfefbcecd01 SHA512 59e83208fb66244ae580934dde47a98e0821325b7b0ab547223dba019b1534720d74e6eb9481b1901f4cfe211fcfcc0d301b30e5a81e0f8928320a428fb690f5 WHIRLPOOL 7ea8e15cab1644cf1168c50f7f483bee7080933bd98e964e63e3454647f2149f28c20d7fac987b47a839c569099f9ecdf5b4d76f598a1d2b94f0f182bbaa57aa
+MISC ChangeLog 2552 SHA256 3d89b8c1cd1d07ade263e80a9f2f9ca7cfe086f03a41d70080b4648cc494b134 SHA512 10c2febd2cd3a6f31c41d5f9dbb81ef47a7f68ade5a2b0a911af41c3db1a5f9d64c3bacc3e3bb6a49b4b2c9f46c8d32b7668aa6d4531e2e80dbeaeeba9bc63a7 WHIRLPOOL dd63ea72e6e642d18a67c58f7ce9f067a6df276a63f225f2afaef13d43dbaad9d0e638b11503f803eb3ab075b8f24ad29fa2dd4055bbeda1f1e2700c7ede0201
+MISC ChangeLog-2015 3971 SHA256 7e607b1f8cd4f8feefea8415e13a7c31aaecec7b9e640d5c51e81b5d05b4779f SHA512 abed82ad716326b299e3ccab74f39f733c979f399d3ec35d1599690c096cf705d0a0d1c4ef2996dd00879aca9313aff17a13250ecf35e0bdd3e9dfd74799cc6e WHIRLPOOL e1449831bfd222208a5862d26e3f4d2a37b0e44bd05f1ae49cb6a18151e9a73ed84f8042152239ff936144830db7081f1848c20a515bff3f66c2d3cf878fcd03
+MISC metadata.xml 397 SHA256 1fa024ab94f9f091774df6fc2f51996dac6c7d0795ec835cdc83e80340903d7a SHA512 e7eaac481d5b669270adda58bff95be6428c3b7eb6c8a2d6da48d60c1b2a59f0dda5ad51a82367c148b5cb8470ef4e4dae378826228d46dc365582e6d834f06f WHIRLPOOL de4ca283d697fbd3c04ca99ba141bf832b80a86c747b312350fdac82c6372151e983f5268e7cb65ca85d80cbbfda4f20a1278ef172e8a1604bd0700f8c60ec7c
diff --git a/www-apps/sitebar/files/inc_writer.inc.php.diff b/www-apps/sitebar/files/inc_writer.inc.php.diff
new file mode 100644
index 000000000000..65b6e82b148a
--- /dev/null
+++ b/www-apps/sitebar/files/inc_writer.inc.php.diff
@@ -0,0 +1,11 @@
+--- inc/writer.inc.php.orig	2010-03-07 19:20:51.000000000 +0100
++++ inc/writer.inc.php	2011-10-07 15:30:29.000000000 +0200
+@@ -624,7 +624,7 @@
+ 
+ class SB_WriterInterfaceXML extends SB_WriterInterface
+ {
+-    function SB_WriterInterface()
++    function SB_WriterInterfaceXML()
+     {
+         $this->SB_WriterInterface();
+     }
diff --git a/www-apps/sitebar/files/postinstall-en.txt b/www-apps/sitebar/files/postinstall-en.txt
new file mode 100644
index 000000000000..2e7b45dd6e3b
--- /dev/null
+++ b/www-apps/sitebar/files/postinstall-en.txt
@@ -0,0 +1 @@
+Now go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/sitebar.php to complete the installation.
diff --git a/www-apps/sitebar/metadata.xml b/www-apps/sitebar/metadata.xml
new file mode 100644
index 000000000000..bc8f9fcabf1a
--- /dev/null
+++ b/www-apps/sitebar/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<use>
+		<flag name="plugins">Install optional plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sitebar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/sitebar/sitebar-3.3.9-r1.ebuild b/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
new file mode 100644
index 000000000000..ef0c74bbf1cb
--- /dev/null
+++ b/www-apps/sitebar/sitebar-3.3.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp eutils
+
+MY_P=SiteBar-${PV}
+
+DESCRIPTION="The Bookmark Server for Personal and Team Use"
+HOMEPAGE="http://sitebar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/httpd-php"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	webapp_src_preinst
+	dodoc readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt
+	cp -R . "${D}/${MY_HTDOCSDIR}"
+	rm -rf "${D}/${MY_HTDOCSDIR}/doc" "${D}/${MY_HTDOCSDIR}/readme.txt"
+
+	webapp_serverowned "${MY_HTDOCSDIR}/inc"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	webapp_src_install
+}
diff --git a/www-apps/sitebar/sitebar-3.3.9-r2.ebuild b/www-apps/sitebar/sitebar-3.3.9-r2.ebuild
new file mode 100644
index 000000000000..f5a808632f8b
--- /dev/null
+++ b/www-apps/sitebar/sitebar-3.3.9-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base webapp
+
+MY_P="SiteBar-${PV}"
+
+DESCRIPTION="The Bookmark Server for Personal and Team Use"
+HOMEPAGE="http://sitebar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	plugins? (
+		mirror://sourceforge/${PN}/SiteBarPluginIMAP_3.3.7_1.1.zip
+		mirror://sourceforge/${PN}/SiteBarPluginLDAP_3.3.7_1.1.zip
+		mirror://sourceforge/${PN}/SiteBarPluginMailGate_3.3.7_1.0.4.zip
+		mirror://sourceforge/${PN}/SiteBarPluginMessenger_3.3.7_1.2.zip
+		mirror://sourceforge/${PN}/SiteBarPluginXBELSync_3.3.7_1.1.zip
+	)"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="plugins"
+
+DEPEND="virtual/httpd-php"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/inc_writer.inc.php.diff" )  # PHP 5.3 patch
+DOCS=( readme.txt doc/history.txt doc/install.txt doc/troubleshooting.txt )
+
+src_install() {
+	webapp_src_preinst
+	base_src_install_docs
+	cp -R . "${D}/${MY_HTDOCSDIR}"
+	use plugins && cp -R "${WORKDIR}/plugins/." "${D}/${MY_HTDOCSDIR}/plugins/."
+	rm -rf "${D}/${MY_HTDOCSDIR}/doc" "${D}/${MY_HTDOCSDIR}/readme.txt"
+
+	webapp_serverowned "${MY_HTDOCSDIR}/inc"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	webapp_src_install
+}
diff --git a/www-apps/sugarcrm/Manifest b/www-apps/sugarcrm/Manifest
new file mode 100644
index 000000000000..2e9090d6d6e6
--- /dev/null
+++ b/www-apps/sugarcrm/Manifest
@@ -0,0 +1,8 @@
+AUX postinstall-en.txt 240 SHA256 8ca0520434fde44cf6c78f88fc37062f34cad1d8add4b4f75c36436fdfa02b8b SHA512 3368dbfd0bbda16a27a974cbb23ea0e54bce2b3a72cb312392a9617d4a2da8cbb318bace2a8e3f5de6d4f7fa0cc95831077ac728ab3de8453a0f13e4aaa5f424 WHIRLPOOL 5f8883e1d90051f6305fc9fef008c75d6a2ab6a2e63f694fc2f2b744014b93569bd5291afd3ebf047c4b459d2680c3a608e6b5468bf751d64a4d7e2489761c4a
+DIST SugarCE-6.5.10.zip 21240061 SHA256 1abf786c0bbff683fe68dfdc59f7993df1de130c23fb786a9e8bad48d6bd1333 SHA512 f65c4230c25cd8b6c6f8dc0d9ec195fd7853589c4e83ea8d474401fc8a3fee625948208de01b8fb2f24ef6c79626092a0e171f8326c5c63b290c93162a534a18 WHIRLPOOL 7da16164fdb4e8e078ad67df7ae3763930c14de2da408498aac8d6930f1912874028282e34f5059881c578b73c2013f99eb6251a5afe6f32331bce0bce5a070a
+DIST SugarCE-6.5.9.zip 21183945 SHA256 fa469eeadad26a5ce235aefbc97876aac08dc34c411162a73088875679bbced0 SHA512 2cc190a17c4f0103ecc7d3f260d5b3387b9cf2af50f119218292100246fb524f22b3a9ced9fc73c28ac9af1e9e516f17ca23d10d4e32bd82a7bb5475ce37f2a2 WHIRLPOOL eacaa4e9c4042b71b70e2a00b1c8fb76531a8e8665deb6bed72001988fefd5a181cc84e6bf249d6927ec101ce2b21bf3f8f06c1231c1d28e0b7172ac056a4f3c
+EBUILD sugarcrm-6.5.10.ebuild 1650 SHA256 1ac37d0263eb6ec8fbd3f0b6f63324b31078c0ec39a5e6b879d85c162fe06416 SHA512 8519e697bd5b28c9179cb8b6f024daac21da373ab8c15617b9bca4b04796d136583b7731eb1baca051b218f2d76f406dac85acb82c3698c70004f6247f34f8d7 WHIRLPOOL 66e59712d8ad15054620ccb1263ccda017d74c5d28cd26fe2795f58fc61def2361d4a9d18c6dbc545794c265ac3830bb0e08fcf2c9e7133248416f674183ff83
+EBUILD sugarcrm-6.5.9.ebuild 1582 SHA256 d76b8fa5cadc139c81b9390a51c7261a1ff72603b42b48e7f5d49d8d870a89f2 SHA512 b74ca219096a32254691b70331d29704d65efa48572e90e6a78bba7fc696ce136f9fb9493a6b967885ab775ee65647f2af97255af99f8185502fed6a7276d0dd WHIRLPOOL 6ce35b294baef75ffaaef005adb25d19160bfd2922239986790202c99892567500f364ece5c55839e294b5c230f8d337d7781349b0ae26974f56b6646725dfc8
+MISC ChangeLog 2614 SHA256 90af62986bf6672d2287852b0635c4deccf7ecfe32be6096b70d19ea9d12216f SHA512 d3a3ebcb29556167f71f0840e1fc0b9e50ac9017ca24845ff43006d727ed446561d08f96f5b94838479b7a6db4c93d71b00098c553abf7e2625782945243aef7 WHIRLPOOL f62e2bc1e5ce6c7413390e73ac0d1a523e09dc9a4274edd9fccf46e57fb1587065bdc54b566524047c4f9a11a79ff5d279124dbc9d660e5bfb3ec2964c3426f5
+MISC ChangeLog-2015 1408 SHA256 191afa2f08682fe679f4c8c4a972ac7e8008c7c4a03becd0da476acff3fd382d SHA512 5f84fe6405aafb5436a0fd856316656a9e7ca34656340f79b81f249eb02a8a2c04725d2ebaa72c7ef57377a6a817abc0cd3392d1b32cf756c50aeb808b8a61fe WHIRLPOOL dc3df3a09c5e1007e47020e0d7c530a518601e7f157b9ddd8bb868a8929face10b9b27ddc85ee05995584a8ae3823a28fe79836f0993ddb14fe3459dbd14489a
+MISC metadata.xml 415 SHA256 cf426c977900a96b3ddad647ff663c0e1b36a90b118eebc46b0600f30b371984 SHA512 ae36d195bb4953d359d9e4c4684ecdaf8700f12b26ae1e183fdbfd7a0b357840a289e031134d2287fffbf056bb76c044ccebf4c602702ff01e348bfc166a06be WHIRLPOOL 4806b8561e47450670ea4494d32035b879393b9287ac11d841067d230fa4f5fcf0d561634bbfebe600ed66e9d2690843ddc1dd30dc9bfe02a84ae87872dc77f0
diff --git a/www-apps/sugarcrm/files/postinstall-en.txt b/www-apps/sugarcrm/files/postinstall-en.txt
new file mode 100644
index 000000000000..2f3b8942f10b
--- /dev/null
+++ b/www-apps/sugarcrm/files/postinstall-en.txt
@@ -0,0 +1,6 @@
+Point your browser to http:///
+to complete the install. Use web installer.
+
+Please change the permission for ".htaccess" and "config.php" to
+world writable, before doing the setup. After the setup you can
+change the permission back to 640.
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
new file mode 100644
index 000000000000..acd97dd407c8
--- /dev/null
+++ b/www-apps/sugarcrm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sugarcrm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild b/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild
new file mode 100644
index 000000000000..3017a6afafa4
--- /dev/null
+++ b/www-apps/sugarcrm/sugarcrm-6.5.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="SugarCE"
+
+inherit webapp eutils
+
+DESCRIPTION="A complete CRM and groupware system for businesses of all sizes"
+HOMEPAGE="http://www.sugarforge.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X/SugarCE-${PV}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl imap +json +zlib +mysql +mysqli freetds ldap mssql"
+
+DEPEND=">=dev-lang/php-5.2.10[ssl,soap,unicode,xml,session,tokenizer,zip,ldap?,mssql?,mysql?,mysqli?,zlib?,curl?,imap?,json?]
+		dev-php/PEAR-DB
+		dev-php/PEAR-Cache_Lite
+		dev-php/PEAR-Mail_Mime
+		virtual/httpd-cgi
+		freetds? ( >=dev-db/freetds-0.64
+					mssql? ( >=dev-db/freetds-0.64[mssql] ) )
+		app-arch/unzip"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-Full-${PV}"
+
+src_install () {
+	webapp_src_preinst
+
+	cd "${S}"
+	einfo "Installing main files"
+	cp -R . "${D}/${MY_HTDOCSDIR}"
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	for foo in cache custom data modules include upload; do
+		webapp_serverowned -R "${MY_HTDOCSDIR}"/"${foo}"  || die
+
+	done
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config_override.php
+
+	elog "Please make adjustment of your php.ini or .htaccess file"
+	elog "Change value \"session.path = \"  according to your desire"
+	elog "Files of sessions are stored in this directory"
+	elog "For more info see http://developers.sugarcrm.com/documentation.php"
+
+	webapp_postinst_txt en "${FILESDIR}/"postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/sugarcrm/sugarcrm-6.5.9.ebuild b/www-apps/sugarcrm/sugarcrm-6.5.9.ebuild
new file mode 100644
index 000000000000..59753a24f63e
--- /dev/null
+++ b/www-apps/sugarcrm/sugarcrm-6.5.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="SugarCE"
+
+inherit webapp eutils
+
+DESCRIPTION="A complete CRM and groupware system for businesses of all sizes"
+HOMEPAGE="http://www.sugarforge.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X/SugarCE-${PV}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl imap +json +zlib +mysql +mysqli freetds ldap mssql"
+
+DEPEND=">=dev-lang/php-5.2.10[ssl,soap,unicode,xml,session,tokenizer,ldap?,mssql?,mysql?,mysqli?,zlib?,curl?,imap?,json?]
+		dev-php/PEAR-DB
+		dev-php/PEAR-Cache_Lite
+		dev-php/PEAR-Mail_Mime
+		virtual/httpd-cgi
+		freetds? ( >=dev-db/freetds-0.64
+					mssql? ( >=dev-db/freetds-0.64[mssql] ) )
+		app-arch/unzip"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-Full-${PV}"
+
+src_install () {
+	webapp_src_preinst
+
+	cd "${S}"
+	einfo "Installing main files"
+	cp -R . "${D}/${MY_HTDOCSDIR}"
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	for foo in cache custom data modules include ; do
+		webapp_serverowned -R "${MY_HTDOCSDIR}"/"${foo}"  || die
+
+	done
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	elog "Please make adjustment of your php.ini or .htaccess file"
+	elog "Change value \"session.path = \"  according to your desire"
+	elog "Files of sessions are stored in this directory"
+	elog "For more info see http://developers.sugarcrm.com/documentation.php"
+
+	webapp_postinst_txt en "${FILESDIR}/"postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/trac-accountmanager/Manifest b/www-apps/trac-accountmanager/Manifest
new file mode 100644
index 000000000000..1d62cf913697
--- /dev/null
+++ b/www-apps/trac-accountmanager/Manifest
@@ -0,0 +1,7 @@
+DIST TracAccountManager-0.4.2.tar.gz 157706 SHA256 4f527394db9316e1f826b1bd0fb8d97253516daf35c6d5f71a016df317a57d74 SHA512 b73046dd15cefbe4d7854107af1bdf372ab5c2c6e83855395383b4a894d85325d867eaa1e9013f41ffcf8907baf3ea64873ac1b6c3b333af6dfd6480ab4016b4 WHIRLPOOL 5607957625a104596975fdf0283d9ae1c85a2f5c4a309aff0a04475e7f5123c8c53e45ba0f7d69a4bbe1e7c62912490356e5c48220d51ebbc9497b160f2bfac6
+DIST TracAccountManager-0.4.4.tar.gz 157666 SHA256 64b238e8a435156a08aeee64705b2cb60382132f022b3327d681b179680fdf4b SHA512 622e011c5cd956c3e32fe578b60d0cc060b109893a6bbd5ea12dea36373a9a47a8a226ae6a297d69a22f9d1d1deae686ccdf2258623877ee794febb99c9a99e4 WHIRLPOOL 1f38ce9672c7633920041dbd73c0a61e5358b7c70d0ab70a23baac224f4a72ca2c4056171bc3a95b5dc5e3de6e1afe0eb8b74df23537564d60332d4b682f4d8f
+EBUILD trac-accountmanager-0.4.2-r1.ebuild 533 SHA256 dd8a043fc94548be4d6a15d538e53a2974c36db4fa746db8bfde166efd36a689 SHA512 09b18fe054486d0b7cf3c4a8b7e701114911e2ea17f5da10edba745ac33099af602dd31ce8ee8924b626b728b7ad5518f1172a48c99fec961b8c6991b446961d WHIRLPOOL 834e34462c02071c8c8013738cfb8a79f31f53743921ddc22ec52005acfc52175235998b68fd660e165591ccb009eaa2e0baf28962d15fc58d5629e582324815
+EBUILD trac-accountmanager-0.4.4.ebuild 533 SHA256 7c5f924ffa81a12f92ff444b04c9facde0fac104923d36fac8f15637844d604a SHA512 ec9319060b7b405ddf30fa9431751252ce484ab2ee0a01b3410248d749058cb8d64854bb182effa581504847c7975174a5afe1b9c0af06a455c4957caf66e5bb WHIRLPOOL c01059e0243b731107a68c7328ab9460cbe7228b704124c0789148f0ef843cbb8bcc0dfcf82edcd72c58db2068841179199affb01511f7a363a2ba4aa5969c94
+MISC ChangeLog 3006 SHA256 522bb6bed9bf5bf7012b103c0562f6f193c45cee9e14419bc5396b41a7629403 SHA512 1cf09613b64b99333f4177323858d08a6a05549eee8b43412e0dc02385030cf0c426797c4ea2b49e5b07f0fff4f5bfc30222aec5b0748f98d5d814dc8bd808c9 WHIRLPOOL b5a891151e357dca820239cb21f36bc052f13070e7a6db5390ba857b33a22160317d063600b65655e7b0b82b7ccaa3cf70d65c7c1b25f91751d48c573bec00f5
+MISC ChangeLog-2015 1133 SHA256 9209b3d0a4f8f928efa266c689be303b012da2b30dc8af347b8f59f6b0f46a06 SHA512 9054ce35d228ab8fe618b3ee2f4c9fc81a0f8e20c9498b357fa9fb0279f8c63fad6cb3fecf13c077bf777964e2a6fc227b54ed8c6ed872955a042a52b6a36d0b WHIRLPOOL 117bf59c1a3c47436218ccf9b41891b0835c5746e7729787c78fcbf1cce9f5d364acfb2964362da314a9a7b69e711ff2a2e814d4c3c81e9c358df57dd21e2a76
+MISC metadata.xml 669 SHA256 28e26fc3bef4bdc767b2fdaa89024617e55420d156902250c952b0cc63122911 SHA512 d121b051a295cecb74d6d7be1f2e9a29edaed80511614aa42cf771bc49e02b99e0020df2edeec53db0da2620639bbe691d9cca5ae9a5288569beff8707f980d3 WHIRLPOOL 83444555cc9d3a1432a4de60ad9829edee07c537b1ff5bb02d0673ba7c08b34f82c55500067c9a73ccf4bbf5987b7b589aca3e4e92ee625f706831caa91b1255
diff --git a/www-apps/trac-accountmanager/metadata.xml b/www-apps/trac-accountmanager/metadata.xml
new file mode 100644
index 000000000000..78b3261059ae
--- /dev/null
+++ b/www-apps/trac-accountmanager/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+  <longdescription lang="en">
+    The AccountManagerPlugin offers several features for managing user accounts:
+
+    * allow users to register new accounts
+    * login via an HTML form instead of using HTTP authentication
+    * allow existing users to change their passwords or delete their accounts 
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">TracAccountManager</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.4.2-r1.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..badb4847741c
--- /dev/null
+++ b/www-apps/trac-accountmanager/trac-accountmanager-0.4.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Trac plugin for manage user accounts"
+HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
+SRC_URI="mirror://pypi/T/TracAccountManager/TracAccountManager-${PV}.tar.gz"
+
+LICENSE="BSD BEER-WARE"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12"
+
+S="${WORKDIR}/acct_mgr-${PV}"
diff --git a/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild b/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild
new file mode 100644
index 000000000000..d36113c20396
--- /dev/null
+++ b/www-apps/trac-accountmanager/trac-accountmanager-0.4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Trac plugin for manage user accounts"
+HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
+SRC_URI="mirror://pypi/T/TracAccountManager/TracAccountManager-${PV}.tar.gz"
+
+LICENSE="BSD BEER-WARE"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12"
+
+S="${WORKDIR}/acct_mgr-${PV}"
diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
new file mode 100644
index 000000000000..1b2864287079
--- /dev/null
+++ b/www-apps/trac-mercurial/Manifest
@@ -0,0 +1,6 @@
+DIST TracMercurial-0.12.0.29dev-r10899.tar.gz 26248 SHA256 1584326134a67feb3e1b66443b5ba68e561dd7002e54f233a14cdb1194264929 SHA512 bc2ea9676dadc926cb9caf65219924953e36ccdfd2d4a6a8f1fdedc05486578b16972f4cb66bf948737e08160ebe366193a5071f293927f573c940c92fa7e31d WHIRLPOOL 1e3496644581ac583922abf2f8a54ef036c1b2450bc491c15d62853bdc6f0f9e7102ce139502e6b4b5612a38d1764d6dab14066a4fcde355e5dfc3bb810f20da
+EBUILD trac-mercurial-0.12.0.29_pre10899-r1.ebuild 598 SHA256 13267e1c7eedbb477b0dd3f6ef2081619329ab14797821dac8fe882abf6af191 SHA512 b0f59a6abefec46871fd52b429a0d9133d1fb5a1d48d283a247449a999463e3513b39aac2351c36e3392694598932b6f0eac7b2bcd39c2f0dbc7815c1aa7b733 WHIRLPOOL 3e071ba6fe08e841e6c493b873905f01f6917b9e21665b29395731cd773ee0678ee2eec33375ea0d585b3931b3c0b9675e85c9bde8f402931fb5abfe09856da1
+EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 626 SHA256 9f3f31e3549980dd4c6ad85a028f432703af18fd2a870f4102f62ec5b2e1460b SHA512 7661e92f7579a02436748716d2f22ddfa3a2ff90f98dd857441a9a491e43807a73626e6faefa9ace633c9e7293777efeb71964b770fdcda91de90ce43909662c WHIRLPOOL 3160b1f2b82e41bdc1dd9eff1f877b56b6d09ebc0a0cbdd76d7e6c40430343d18001246afb8766eb2f0a5be1daa49cb84c60f7f23ecfc30d5b6442c63a64e1e2
+MISC ChangeLog 2883 SHA256 60ecdbd8ad7ce30cb3eb0adb8349a037af99612821f4fd2ce7c53e7901a09241 SHA512 8424fa121460e65ea7ccabcbed2186364c31c2af27be28f51ef52a0ac76969c20343f3aa9f24a3f18e3cf943da893d3b7a4ccf481a8ff16d3e2682b2c579e1c1 WHIRLPOOL 049fe55c67563eff09ffda209dbb923904d96f31fc6378e5b1a47d276a66294d34fc97fc08825499d0de15c85fdfd7c55bbb667f5442e5d01fa36d0862f79c08
+MISC ChangeLog-2015 1220 SHA256 93639bd5a1ed4f4d7a9b74611fb362e94af544c504914d8830ed1681eeb1c6e0 SHA512 858bf49f427e036c07d49e1d7cbc6f6482929851857576501a8ab95bbf171e031b254c329a321a1b20d2a584b4fdd95069e12f46decaa1bb49a25f0086e7d510 WHIRLPOOL 81af121bee02cb2a658fd8e9d538b8a3c1df9ca2c3191555e0675b1ef2a7ce0493e4e5d229f3d8444d90f70fc148f101ec79ed31c9fd505d4573f0cdcdd0cdfb
+MISC metadata.xml 263 SHA256 3ccb1d7c7f0292504ee8d589048acc8e4d98218d2943ac44e59acddd9e21d6bb SHA512 cf4145b49583a7ebcd1c698cf499f89db8afbcfbb8edcb6a28ba361b1427f68c20cf3b673c4cbd5bed97e799be988e2cac67be72e8ac54052d68ceda5c270708 WHIRLPOOL 4d084ed3ff07f17035c154c68a9d590addcb65502a1961a7a93a8282518b1a2f419c925b553b2f6d8f0a1e0dd72aaa43e217b599209a1951f1a73125769afd20
diff --git a/www-apps/trac-mercurial/metadata.xml b/www-apps/trac-mercurial/metadata.xml
new file mode 100644
index 000000000000..c194f2fc320f
--- /dev/null
+++ b/www-apps/trac-mercurial/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
new file mode 100644
index 000000000000..e661cc957b68
--- /dev/null
+++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="TracMercurial"
+MY_P="${MY_PN}-${PV/_pre/dev-r}"
+
+DESCRIPTION="A Mercurial plugin for Trac"
+HOMEPAGE="http://trac.edgewall.org/"
+SRC_URI="https://dev.gentoo.org/~rafaelmartins/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
new file mode 100644
index 000000000000..9b4f678dd53a
--- /dev/null
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 mercurial
+
+MY_PN="TracMercurial"
+MY_P="${MY_PN}-${PV/_pre/dev-r}"
+
+DESCRIPTION="A Mercurial plugin for Trac"
+HOMEPAGE="http://trac.edgewall.org/"
+EHG_REPO_URI="https://hg.edgewall.org/trac/mercurial-plugin"
+EHG_REVISION="8df754d9b36a"
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}]
+		>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-tags/Manifest b/www-apps/trac-tags/Manifest
new file mode 100644
index 000000000000..f5526f02bd91
--- /dev/null
+++ b/www-apps/trac-tags/Manifest
@@ -0,0 +1,5 @@
+DIST trac-tags-0.6.zip 50426 SHA256 93f37c9e557f3224ac35627dbd56cbe96b8aa11171a5287091f00fcf04a5ea22 SHA512 7fb82a5eeaf267defaac24a1b886b0f4be00ee78c39120a4e3703d78aa41a9328a483682826d74ec87bde897d269ed0e96d37ca07c0fe96abd79bdae59ac763b WHIRLPOOL b4b6f92402e9b4811c765d16566cded1716fd0464083265847d2c5f6f0808b883a46eb065d9d36a4e1b7b8fe05467819ca286a43193d95635db77a240d7d0fe0
+EBUILD trac-tags-0.6-r1.ebuild 668 SHA256 989cfaf305780c0d05551fdb29016f5e7c988c074976f31ac4efdaeb20e99791 SHA512 c2d37bc4ddd51fce6d7584d2bd7e2a9cbebc0bfd9d65f28f33e6f149dce421ce94b36f4b075b418062feda0456927bdc3c420e43389c6389ad57d3d9c23193e1 WHIRLPOOL 5f8e7f6476680265058192556b9046911e65adde867f9fad4e33fc07afcfd1a274b4ad4d7442db876965f0facb0124fbf7aee85b0fc3817f11bc6d2dcd6a24d0
+MISC ChangeLog 2571 SHA256 0207a0c502b881a74f227c7bd2a1b284a4fcf60b82d396fbe3f8dfb988d3c6cc SHA512 5a4257e9ed93c5e11fbb8c43d6cf8988239bf4e0342910d0449bcf9e3b13fe8b8bde1bd754370fe5d0d71428dd8f9543ce4a1bf39d3071c85055ce92634f6142 WHIRLPOOL 9714ad331a7904e6ed5706d47ebe7b6fb26016304d27616521a2100e7e39b84e2c6800b49806feea288968116a3af479cf17860ada9b3ea35d56ee42c8b57cec
+MISC ChangeLog-2015 578 SHA256 c3e2957f11600783096c88d4f1205c766123fedb8614ddb38cc5a46b44142f7f SHA512 1ab4362ab58ca6951a2303fdcc66f4d72cc7e727528f3e42c5c9b29f3ddbff8dbd1dbd205cd54f75f679dec4c3cedca34eeffd9238c62b0765e1fe214e5d542f WHIRLPOOL de5e86e29ba5c2d2793ca7cde4a7d4a68b576b3b7c9b8f286da74f9b406acd05f4ce143b1e474bb4c0187f756cfeeb5e3a696d000ef7c40cd5595e344934a672
+MISC metadata.xml 263 SHA256 3ccb1d7c7f0292504ee8d589048acc8e4d98218d2943ac44e59acddd9e21d6bb SHA512 cf4145b49583a7ebcd1c698cf499f89db8afbcfbb8edcb6a28ba361b1427f68c20cf3b673c4cbd5bed97e799be988e2cac67be72e8ac54052d68ceda5c270708 WHIRLPOOL 4d084ed3ff07f17035c154c68a9d590addcb65502a1961a7a93a8282518b1a2f419c925b553b2f6d8f0a1e0dd72aaa43e217b599209a1951f1a73125769afd20
diff --git a/www-apps/trac-tags/metadata.xml b/www-apps/trac-tags/metadata.xml
new file mode 100644
index 000000000000..c194f2fc320f
--- /dev/null
+++ b/www-apps/trac-tags/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild b/www-apps/trac-tags/trac-tags-0.6-r1.ebuild
new file mode 100644
index 000000000000..43896d792b6f
--- /dev/null
+++ b/www-apps/trac-tags/trac-tags-0.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_REV="9901"
+MY_DIR="tagsplugin/tags/${PV}"
+
+DESCRIPTION="Tags plugin for Trac"
+HOMEPAGE="http://trac-hacks.org/wiki/TagsPlugin"
+SRC_URI="http://trac-hacks.org/changeset/${MY_REV}/${MY_DIR}?old_path=%2F&format=zip
+	-> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/genshi-0.6[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip"
+RDEPEND="${CDEPEND}
+	>=www-apps/trac-0.11[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
new file mode 100644
index 000000000000..205af169f54d
--- /dev/null
+++ b/www-apps/trac/Manifest
@@ -0,0 +1,16 @@
+AUX postinst-en.txt 1331 SHA256 1799cf63e70e2ed7c3b1a1148b29ce456dda8e84ef137605549de7f1e2856a95 SHA512 6bde40a16545462ef0d8654ffc860e031f5978a253b0fe68df24b18a281f396fd560e4b39a6c53ecee52c9be941ca83dccd1aee9a98dccf570a9f5b0f0c6bbaf WHIRLPOOL d082aec44d057e3e0a7ccae6989a09c6c2e259bcc896cdd2bbea650c69c069fb9cbae7abd0db46f6c1cf6888cc36656a6a7271e2dfc962e21c5fa74708740ad8
+AUX postupgrade-en.txt 665 SHA256 aec1179a04056a650a4f7429a927f510cd0e7256f889fdae2575ef471634ba41 SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f WHIRLPOOL 512578b971cee45e0699e7461dd12ee37844bda48e69018d8956f81768e13a31ff30f91421697228410e61fa7159dc1a07e0831d8f4941e6d1bf1855d8d08207
+AUX tracd.confd 359 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1 WHIRLPOOL 591394e732d39bc13f97004cfb3c18128aa16a55557172d872797b5ca5c69e5f15d1420e697a4e40215b2a893ed684ba6b6388abacd97874fd6f04953b579e1a
+AUX tracd.initd 823 SHA256 e36edaface1199cb677184815876de1778695b136580e0de294150b932d17495 SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6 WHIRLPOOL b10df072a219c73b8498129826c7664ae0f0f8aab756f3ab229168d16d9d318b1871afdb90fe68428d49256acdd6e6058e436ae27a1cef618f711d800fbe429d
+DIST Trac-1.0.13.tar.gz 3671741 SHA256 48ea3a9a23bb6bc7a9a643b90a7d7d274affedd344f21b73b81b421841cd527d SHA512 b4b2066482bdd6ba16183f2021bc069d1054177462726de1d844a28eccdc0b32405a0c510143f6ff84caaebebc571114e81cc0acc679ce94f8046b49d6854c1e WHIRLPOOL fc4151b5dc375a93413e3e1f23109644221eee6d741e442d03bccff6492c9cb816644783ec663b460279661fa8b50111456041094e531c8f24588af362ec4357
+DIST Trac-1.0.9.tar.gz 3642845 SHA256 9ed3f0a2039c46132d10f35c211f9f6ee953339cc08492a41d1bf8741d6eebfa SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304 WHIRLPOOL 4005102b1109aac94728d22151c2192a38f9ab91af0227a24dff1a2e2097e67ceafa0cef0f307f1a1ddb1999c109d142bbb739107d4047dc296e6a8396a9427a
+DIST Trac-1.2.1.tar.gz 6212917 SHA256 0af71c555f4617849432bba1fc59c1654cd13d030ebbcdbef814d82d7a8bb0c3 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f WHIRLPOOL e2b17393dea34f39a030099b3fd02c68bfacfb7a7247008cc84cda5bc5807752dcef52ae345b39ab2aee02eef4aab04477d5b76d30bcf649991c2a53f5a7dd6c
+DIST Trac-1.2.tar.gz 3821867 SHA256 fd3cf3a9d2113d94f4f153995e737bc747e8d48cc40ac5171a114266ba4d2b0b SHA512 0655723a6727df389d66bb9c752436a81c820750659e5bf7a64485c4362fa1b1c1cb6dcdaa9936003838ce5874b20bbc5a8d8fc1034b96ff31b3bbc6f7fca105 WHIRLPOOL d347dac1eeb426d25b15a7c0f34da4363fb9f5d424d3be311750dfae9dbd515d54ab8c72b408ae6f7fe2182da10b9c4f0057b28bc3b52c7fd2ca7bfaa00f14a6
+EBUILD trac-1.0.13.ebuild 2949 SHA256 0d89de16312e81875bff972d395ca789023b5a4ae55889e4b5b95b9e4679d3ce SHA512 6fd1b0d2cb2df809849934db5b925c151d28b62963a7223d2c4bae24304f1c856a98679eb008841aaefbb849a7ed66ef4d7743fb653c6dc559c28d54b47c4372 WHIRLPOOL 61fb5946c779731c14372c955a0193eb5f1910c6aff1c266bb7d4ad1770d3bba64fd441189da2cf9fdaba202373984446c6e743dff7f88e2abd2928a12c4008a
+EBUILD trac-1.0.9.ebuild 2960 SHA256 98714bdb22e723dd73284a127e01130d54b953333a949941174e0806d55e54dd SHA512 9c6a0c4d20adc5cf4164894883088580fd5eac246def41535bda9b19f7661c5559150cbd28fec1ce0ad592061a7ef1b9ce247e89ba68929c5162995e1f033602 WHIRLPOOL e23a658d2408d5285e5e7d84d0761a565d58296095a1e7161fc08a58c2f2d7e49c7df000e59ae5a256ecac87fd66d0d6d199a7343f23195b64798007f42c1612
+EBUILD trac-1.2-r1.ebuild 2623 SHA256 4b50880204f586f1d36db9d08175fadd911b1332ad75bd1ae62817532e6d0d46 SHA512 65260592ffb0460e74324f9f588de53185896c154dac5cefed88b9bb304e03af76496352d7d5bc5f3b5144680274ad877328d30d8cd7bcca57730e0070c2e9a3 WHIRLPOOL e21a155c7f83874bd1a6edc2e2cd77ffcc3b9fedb44e2ab858c930d431b48a681d1320017c01cdd7f38f904fb7b5a98040498dfe88c5e257956e740360d86514
+EBUILD trac-1.2.1.ebuild 2623 SHA256 867baa5503c07ddb7e5d0876fc9016b314a6626511e6b329e1866b3048dba4af SHA512 c7f70dcc0b23d169b087e6aee3d65e1fbb14f9c5038f1aca60d5c9480364c98aa5ac4dc2f3ed8352539d2c4a4cd7b742743f2113670d94581526b81b16b09967 WHIRLPOOL 415febe373c73a21e59a60a1a75024c47e7a99c4e00ee9defd1e19558da8fae12e8ac1efae46eb25c00dd1ee7a565e6cd5d4b0bc718e5335a1792c0f2b7b55ac
+EBUILD trac-1.2.ebuild 2949 SHA256 0d89de16312e81875bff972d395ca789023b5a4ae55889e4b5b95b9e4679d3ce SHA512 6fd1b0d2cb2df809849934db5b925c151d28b62963a7223d2c4bae24304f1c856a98679eb008841aaefbb849a7ed66ef4d7743fb653c6dc559c28d54b47c4372 WHIRLPOOL 61fb5946c779731c14372c955a0193eb5f1910c6aff1c266bb7d4ad1770d3bba64fd441189da2cf9fdaba202373984446c6e743dff7f88e2abd2928a12c4008a
+MISC ChangeLog 5309 SHA256 b8179be3cd2f0b269f9664f4dea4824c632b29ecc90e657f375348ce45313286 SHA512 81ec4a6926212ae6b9a77b1c011606f17b7118c176180a246eae7ea968fcd1e1e0c5570a945c5c3dfefd9ee523bc10bfbce709505a8e42a482630cd6345d6805 WHIRLPOOL 42bfc195e656dfa2c1b6db2587ff022fb13ec569e5fe68a6524ada1757f51b31887219fa0c2238ab6c5c2cac3738c6cf8dac9e9ecfad41e47e2f69a6ef718595
+MISC ChangeLog-2015 22580 SHA256 4a955291ff7f4745ebb548b91c7cc5c870dfe2eb1845d9ab91fb5efaab428f10 SHA512 920c010085427f38e2912b5bad9abb6e6b4dbc5bd2d646eb3de022a2f1b62d607a8576156504c8dd7dfc1cd42fd6efb60b734111ddbe88debb9918d574411ca3 WHIRLPOOL c3c2eb32bee587963a9bb531def1cc1096716640f3db27eb19bc9862f540a4019038d26b7c6b1462ee052d14ad36a20ae0652562080b289ec787d6939d3fca77
+MISC metadata.xml 618 SHA256 c9f47f62c8a0e8165a449c61615714af03243180643d19d60a8d7901d02100a6 SHA512 aaaf6264f4d7a7a61ae01757f270d248574f8e30da18bc84be33c5ac54441933c419fd309c9d9beb439112189de860043f045cd0f0ceb0f6100e0583ff99d8c5 WHIRLPOOL 391921bbbb204ac77047f0c0d216a97506e5b5957ab2908dec6621deb5651495cf1fecb433f1531cf4903c9c450627ffd5183e7190aa356248e7895a67156e0e
diff --git a/www-apps/trac/files/postinst-en.txt b/www-apps/trac/files/postinst-en.txt
new file mode 100644
index 000000000000..2a4012b9034d
--- /dev/null
+++ b/www-apps/trac/files/postinst-en.txt
@@ -0,0 +1,41 @@
+Install Instructions
+====================
+
+This is brief and generic information about Trac.
+
+See the releases notes at http://trac.edgewall.org/wiki/TracDev/ReleaseNotes
+for the Trac version you have installed to learn about software changes and
+possible caveats.
+
+Web Server
+----------
+
+Trac installation depends on the web server you are using.
+
+FastCGI users: see http://trac.edgewall.org/wiki/TracFastCgi
+
+CGI users: see http://trac.edgewall.org/wiki/TracCgi
+
+Apache 2 and mod_python users: you have to manually emerge
+www-apache/mod_python. See http://trac.edgewall.org/wiki/TracModPython
+
+You can also use Trac without having to install a web server. See
+http://trac.edgewall.org/wiki/TracStandalone to know more.
+
+Trac relies on the web server for users authentication. Please refer to the
+Trac wiki and to your web server documentation to set up authentication.
+
+Trac environments
+-----------------
+
+To complete the install, create your first Trac environment by running this
+command:
+
+	trac-admin /var/lib/trac/<project-name> initenv
+
+Don't forget to review the configuration file! It is located at
+/var/lib/trac/<project-name>/conf/trac.ini. Consult its reference at
+http://trac.edgewall.org/wiki/TracIni
+
+See http://trac.edgewall.org/wiki/TracEnvironment to know more about Trac
+environments and how to configure them.
diff --git a/www-apps/trac/files/postupgrade-en.txt b/www-apps/trac/files/postupgrade-en.txt
new file mode 100644
index 000000000000..1f5c8ea21a05
--- /dev/null
+++ b/www-apps/trac/files/postupgrade-en.txt
@@ -0,0 +1,19 @@
+Upgrade Instructions
+====================
+
+This is brief and generic information about Trac.
+
+See the releases notes at http://trac.edgewall.org/wiki/TracDev/ReleaseNotes
+for the Trac version you have installed to learn about software changes and
+possible caveats.
+
+If you are upgrading from a previous Trac version, please follow the
+instructions here:
+
+	http://trac.edgewall.org/wiki/TracUpgrade
+
+You will need to run trac-admin commands (upgrade, wiki upgrade...) for each
+Trac environment you have.
+
+You might also want to check for new configuration options by comparing trac.ini
+file with trac.ini.sample file in the conf/ directory in each Trac environment.
diff --git a/www-apps/trac/files/tracd.confd b/www-apps/trac/files/tracd.confd
new file mode 100644
index 000000000000..2cb9d292a7cb
--- /dev/null
+++ b/www-apps/trac/files/tracd.confd
@@ -0,0 +1,13 @@
+# The commented variables in this file are the defaults that are used
+# in the init-script.  You don't need to uncomment them except to
+# customize them to different values.
+
+# Port for tracd
+#TRACD_PORT="8000"
+
+# Options for tracd
+#TRACD_OPTS="--env-parent-dir /var/lib/trac/"
+
+# User and group as which to run tracd
+#TRACD_USER="tracd"
+#TRACD_GROUP="tracd"
diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd
new file mode 100644
index 000000000000..c5a5432f2c06
--- /dev/null
+++ b/www-apps/trac/files/tracd.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting tracd"
+	# tracd fails to create pidfile if started as non-root user, thus we are asking
+	# s-s-d to do that. To have correct pid we avoid -d option of tracd and use
+	# --background option of s-s-d.
+	start-stop-daemon --start --user ${TRACD_USER:-tracd} --group ${TRACD_GROUP:-tracd} \
+                --pidfile /var/run/tracd.pid --make-pidfile --background \
+		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
+		--exec /usr/bin/tracd -- \
+		-p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tracd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid
+	eend $?
+}
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
new file mode 100644
index 000000000000..56eb0c0a14f4
--- /dev/null
+++ b/www-apps/trac/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
+  <use>
+    <flag name="i18n">Enable support for i18n with dev-python/Babel</flag>
+    <flag name="highlight">Enable syntax highlighting</flag>
+    <flag name="restructuredtext">Enable support for reStructuredText for wiki formatting</flag>
+  </use>
+</pkgmetadata>
diff --git a/www-apps/trac/trac-1.0.13.ebuild b/www-apps/trac/trac-1.0.13.ebuild
new file mode 100644
index 000000000000..3520f7bc0ea5
--- /dev/null
+++ b/www-apps/trac/trac-1.0.13.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
new file mode 100644
index 000000000000..3e262e03464f
--- /dev/null
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.2-r1.ebuild b/www-apps/trac/trac-1.2-r1.ebuild
new file mode 100644
index 000000000000..ebdc5c23e93f
--- /dev/null
+++ b/www-apps/trac/trac-1.2-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1.ebuild
new file mode 100644
index 000000000000..f11b18c6bc42
--- /dev/null
+++ b/www-apps/trac/trac-1.2.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.2.ebuild b/www-apps/trac/trac-1.2.ebuild
new file mode 100644
index 000000000000..3520f7bc0ea5
--- /dev/null
+++ b/www-apps/trac/trac-1.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
new file mode 100644
index 000000000000..0c40bdc5f896
--- /dev/null
+++ b/www-apps/tt-rss/Manifest
@@ -0,0 +1,12 @@
+AUX postinstall-en-with-daemon.txt 717 SHA256 293295489050c5dc772630d591cbcbb68205612fb256562d13f5b9e4a94fcb2a SHA512 ccda24aa1f3e2a9cf1acf26f814f6d6261ab830691141e72c298d09967bf3e560ef4aa27d0c4ac6f3ece8525ca74f7c88a2bf1e431c750d92c55bafe49f3bd05 WHIRLPOOL 0c55e5b40e56e7587735c61cd56a20b629c6edab59e35e97e3f7e4067889a7dd1bc90abcc1e90bff254af88982ca57a9954fbdbd8c14ec0d9102f02d17797f58
+AUX postinstall-en.txt 330 SHA256 21e5793a75517fbc66787954c9ee3c47d57d913407dcb5db331fd7e4d4525b43 SHA512 13affa8082e89c108dcc96257c1f4cddfdbf795514d7f81dab38ec21415ab87c4c908aa55cd475b295afba6707c40b76ed3be81c8897aef88cbd509c6c45bf4f WHIRLPOOL 6412e30a3e5a18d8ef690c2b3ef49e175d7c660a459170d404d8fca2560275f6aa95e838bf865acf9993d6d9fce5607d96d1b9b93dda94f1e9ee2056053505df
+AUX ttrssd.confd-r1 534 SHA256 339e009d8efa915eb4cfa8345606915879b53ea90b4fa1feaf4f3051ba9e68f7 SHA512 989ae279a7f384d8870ed78e85350a64bf169d8cfc4decada3fa44820fa49385558b0ae3468404b51e8dc75d5ef48732c8e456fcd405f2b2e0892e3172003479 WHIRLPOOL 7bf969cddb6ac1aab3625ef83426712e7c86a64e6a703b8864abfb5f3bb2a7b83e82bfd50874f3805429180cab76926f4f2d8a832ded4b41bdcd5151403abd8f
+AUX ttrssd.initd-r2 2383 SHA256 9327d5b67e126ba0884a12ee132215a25be69320d139c1a92436d50e738bea4e SHA512 082c904db5463ce6f16cc35167283a8bb1962fb16dbafcaa168caf1c13afc9bf59d082c90c681f7649fc1d1586eb5ebbb2563014d78440c4f5254b7a7052cbaf WHIRLPOOL b7aacbca8152f461b1eaf74da030cfbe596d137ce5d1dd8d95a688df68ec2661e67abb7ce5d60075d09e7254412b03486588c84662598e208a927b2d0041c959
+AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
+DIST tt-rss-20160527.tar.bz2 2064633 SHA256 fd0beae76848eff39d9413820f9c575baf41283d2635bdb0e37cfc286bcc3a2c SHA512 8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89 WHIRLPOOL 247ef0bc9d2049936a16340f2a5f26be8eb2d4d072d290d254ebc9666c81456f7d59271813be1ed3963537e6f86cf2b28f4447af8bcc559a64d8f2ce0d7f6952
+DIST tt-rss-20160930.tar.bz2 2072888 SHA256 5a7ff9d2e71cca0afb534558f4069264433eeaccf5cb02f425f06bbb7870d8db SHA512 d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2 WHIRLPOOL 0da0f79cedda6be728f03a0e626cad610576cfad0165ad0e2ddbc54ee0ba778a935be131265874ee0e63cee8fcf620fd275d0588534f9cd5bc4505afe032d663
+EBUILD tt-rss-20160527.ebuild 2156 SHA256 09b1c02472f30b39fbb83295bf36755770722d532096a1f17d1e9eea40bac7b7 SHA512 5f21268c529b8980c8da26142fe85ec7e3dde38d68f3c57e832dc519436483400a51566ad9ed652b75780d925c4c7d0d7c8f938a57878c4b5e08263f21626c1f WHIRLPOOL 24bf57ac88bc0d82c790c039242c6c7e16b870b4bdafaa4dca71aa607b7ecc99e2e677f06ebe1ffe916f68801f2bd16b8aec966e8fad690e7d64d011a1bb8afc
+EBUILD tt-rss-20160930.ebuild 2156 SHA256 09b1c02472f30b39fbb83295bf36755770722d532096a1f17d1e9eea40bac7b7 SHA512 5f21268c529b8980c8da26142fe85ec7e3dde38d68f3c57e832dc519436483400a51566ad9ed652b75780d925c4c7d0d7c8f938a57878c4b5e08263f21626c1f WHIRLPOOL 24bf57ac88bc0d82c790c039242c6c7e16b870b4bdafaa4dca71aa607b7ecc99e2e677f06ebe1ffe916f68801f2bd16b8aec966e8fad690e7d64d011a1bb8afc
+MISC ChangeLog 4122 SHA256 91af2771560faf6a53d1a28d723c6493de9df41fbb351870ca6f55f91b41eb31 SHA512 1d1bb2a400672800a9f8e3839d893c804f1889e7ccd124d702be2e418cc737ed625c151cac3a6840a56c9a5ae92c5a8a048898dae82c2b61803b00ed45564e70 WHIRLPOOL 600ce41b695ee2b73fb5d68e1cc8ff8af454d638799e385dedfb065d6f35a2d5c49f697eaeb3125f0bc4bad3528e57acba71d4c11a890182595760399a86dd4b
+MISC ChangeLog-2015 6949 SHA256 a7c58eaa6f1fa36480bc6ec1a2123d4acee23cf560c356f8af2ccbb793f1b1b4 SHA512 7c605901c6e9774c198eb5a067facb44597737f0894ef1f5ed19132b98c5da0339c5c5ed8ec16b32b6eb4d289413072375a613e4d1a7be29cba441b4f99d636b WHIRLPOOL 96f3ae7db09e70d391a838b2dc72096072542cc8f197d74684c924eefebc96062a9dc3cd055bcee2f37be90db217fb5b7b84eefc5fe1f15821d21d45b65830df
+MISC metadata.xml 393 SHA256 ab1ba0a0670c308b44c226ca85218498aaf7f64ec09b6b91de7c5848b5caf843 SHA512 7804a8ce1ed7e67d52339e64d88c2835e5735bab38bac83152ce65be2ef54e49557b8fbc4c118bcdd85dc82a225b6b09f6466e1eb28ae35eaf09181c1327dcf3 WHIRLPOOL 8c70f7493445cf179f0cbac3a428093630422ecfa3fe481211b703a9c7679bfb45f682ae006cbd92af6c57e32693af3bf153bc695b35bfcdd7e9f2229231bfe0
diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
new file mode 100644
index 000000000000..7d269d7165f2
--- /dev/null
+++ b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
@@ -0,0 +1,19 @@
+Please read http://tt-rss.org/redmine/projects/tt-rss/wiki/InstallationNotes
+
+Once you have configured TT-RSS, put the path to this instance into
+the INSTANCE_DIRS variable in /etc/conf.d/ttrssd. Make sure that
+the ttrssd user can access the path, and then start the update daemon
+with
+
+  /etc/init.d/ttrssd start
+
+to get your feeds updated. Add the daemon to your default runlevel,
+so that it gets launched after a system restart:
+
+  rc-update add ttrssd default
+
+
+With the update to 1.7.0 the 'magpie' RSS parser has been removed.
+That means TT-RSS will use the 'simplepie' parser. If you have been
+using 'magpie' so far, the switch might cause lots of duplicate
+articles - it's a one-time thing for each instance.
diff --git a/www-apps/tt-rss/files/postinstall-en.txt b/www-apps/tt-rss/files/postinstall-en.txt
new file mode 100644
index 000000000000..7b4b279e5be4
--- /dev/null
+++ b/www-apps/tt-rss/files/postinstall-en.txt
@@ -0,0 +1,6 @@
+Please read http://tt-rss.org/redmine/projects/tt-rss/wiki/InstallationNotes
+
+With the update to 1.7.0 the 'magpie' RSS parser has been removed.
+That means TT-RSS will use the 'simplepie' parser. If you have been 
+using 'magpie' so far, the switch might cause lots of duplicate
+articles - it's a one-time thing for each instance.
diff --git a/www-apps/tt-rss/files/ttrssd.confd-r1 b/www-apps/tt-rss/files/ttrssd.confd-r1
new file mode 100644
index 000000000000..cf74794e22d6
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.confd-r1
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Path to TT-RSS instances which should have running update daemon.
+# EXAMPLE: INSTANCE_DIRS="/some/webhost/htdocs/tt-rss /some/otherwebhost/htdocs/newsreader"
+INSTANCE_DIRS=""
+
+# Path to log file. Remember to alter logrotate file if you change it here.
+LOGFILE="/var/log/ttrssd.log"
+
+# User and group which run the update daemon.
+# NOTE: you should really avoid running it as root.
+TTRSSD_USER="ttrssd"
+TTRSSD_GROUP="ttrssd"
diff --git a/www-apps/tt-rss/files/ttrssd.initd-r2 b/www-apps/tt-rss/files/ttrssd.initd-r2
new file mode 100644
index 000000000000..d46d5890a1f2
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.initd-r2
@@ -0,0 +1,83 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need logger net
+	after postgres mysql
+}
+
+LOGFILE=${LOGFILE:-"/var/log/ttrssd.log"}
+TTRSSD_USER=${TTRSSD_USER:-"ttrssd"}
+TTRSSD_GROUP=${TTRSSD_GROUP:-"ttrssd"}
+INSTANCE_FOLDERS="cache lock feed-icons"
+BASE_PID="/run/ttrssd"
+
+checkconfig() {
+	local instance instancepidname dir
+
+	# check instances
+	if [ -z "${INSTANCE_DIRS}" ]; then
+		eerror "There is no defined instance directory in /etc/conf.d/ttrssd"
+		return 1
+	fi
+
+	# verify log file accessibility
+	if [ ! -e "${LOGFILE}" ]; then
+		touch "${LOGFILE}" || return 1
+	fi
+	chown "${TTRSSD_USER}":"${TTRSSD_GROUP}" "${LOGFILE}" || return 1
+
+	mkdir -p "${BASE_PID}"
+
+	# check instances for errors
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+
+		if [ ! -f "${instance}/update_daemon2.php" ]; then
+			eerror "\"${instance}\" does not contain update_daemon2.php script."
+			eerror "Please check your installation or the INSTANCE_DIRS variable."
+			return 1
+		fi
+
+		# NOTE: This can't be done by webapp-config if we want runtime configurable TTRSSD_GROUP
+		for dir in ${INSTANCE_FOLDERS}; do
+			if [ -d "${instance}/${dir}" ]; then
+				chown -R ":${TTRSSD_GROUP}" "${instance}/${dir}" || return 1
+				chmod -R g+w "${instance}/${dir}" || return 1
+			fi
+		done
+	done
+}
+
+start () {
+	local instance instancepidname
+
+	checkconfig || return 1
+
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+		mypid="${BASE_PID}/${instancepidname}"
+		ebegin "Starting TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --start --user "${TTRSSD_USER}":"${TTRSSD_GROUP}" --background \
+			--stdout "${LOGFILE}" --stderr "${LOGFILE}" \
+			--make-pidfile --pidfile "${mypid}" \
+			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
+		eend $?
+	done
+}
+
+stop() {
+	local instance instancepidname
+
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+		mypid="${BASE_PID}/${instancepidname}"
+		ebegin "Stopping TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --stop \
+			--pidfile "${mypid}" \
+			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
+		eend $?
+		rm -f ${instance}/lock/*.lock
+	done
+}
diff --git a/www-apps/tt-rss/files/ttrssd.logrotated b/www-apps/tt-rss/files/ttrssd.logrotated
new file mode 100644
index 000000000000..9616a98c3029
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.logrotated
@@ -0,0 +1,8 @@
+/var/log/ttrssd.log {
+	daily
+	missingok
+	notifempty
+	postrotate
+		/etc/init.d/ttrssd restart > /dev/null
+	endscript
+}
diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
new file mode 100644
index 000000000000..4c4d366632e2
--- /dev/null
+++ b/www-apps/tt-rss/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+     <email>chewi@gentoo.org</email>
+     <name>James Le Cuirot</name>
+     <description>Maintainer</description>
+</maintainer>
+<use>
+	<flag name="daemon">Install additional init scripts for automated RSS updates</flag>
+</use>
+</pkgmetadata>
diff --git a/www-apps/tt-rss/tt-rss-20160527.ebuild b/www-apps/tt-rss/tt-rss-20160527.ebuild
new file mode 100644
index 000000000000..5803aae4ddba
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20160527.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user eutils webapp vcs-snapshot
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="http://tt-rss.org/"
+SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="daemon +mysqli postgres"
+
+DEPEND="
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
+	virtual/httpd-php:*
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mysqli postgres )"
+
+need_httpd_cgi  # From webapp.eclass
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+			enewgroup ttrssd
+			enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_prepare() {
+	# Customize config.php-dist so that the right 'DB_TYPE' is already set (according to the USE flag)
+	einfo "Customizing config.php-dist..."
+
+	if use mysqli && ! use postgres; then
+			sed -i \
+				-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
+				config.php-dist || die
+	fi
+
+	sed -i \
+		-e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \
+		config.php-dist || die
+
+	# per 462578
+	epatch_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "/${MY_HTDOCSDIR}"
+	doins -r *
+	keepdir "/${MY_HTDOCSDIR}"/feed-icons
+
+	for DIR in cache lock feed-icons; do
+			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
+	done
+
+	# In the old days we put a config.php directly and tried to
+	# protect it with the following which did not work reliably.
+	# These days we only install the config.php-dist file.
+	# webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	if use daemon; then
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
+			newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd
+			newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd
+			insinto /etc/logrotate.d/
+			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
+
+			elog "After upgrading, please restart ttrssd"
+	else
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php and config.php-dist manually now."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/tt-rss-20160930.ebuild b/www-apps/tt-rss/tt-rss-20160930.ebuild
new file mode 100644
index 000000000000..5803aae4ddba
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20160930.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user eutils webapp vcs-snapshot
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="http://tt-rss.org/"
+SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="daemon +mysqli postgres"
+
+DEPEND="
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
+	virtual/httpd-php:*
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mysqli postgres )"
+
+need_httpd_cgi  # From webapp.eclass
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+			enewgroup ttrssd
+			enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_prepare() {
+	# Customize config.php-dist so that the right 'DB_TYPE' is already set (according to the USE flag)
+	einfo "Customizing config.php-dist..."
+
+	if use mysqli && ! use postgres; then
+			sed -i \
+				-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
+				config.php-dist || die
+	fi
+
+	sed -i \
+		-e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \
+		config.php-dist || die
+
+	# per 462578
+	epatch_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "/${MY_HTDOCSDIR}"
+	doins -r *
+	keepdir "/${MY_HTDOCSDIR}"/feed-icons
+
+	for DIR in cache lock feed-icons; do
+			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
+	done
+
+	# In the old days we put a config.php directly and tried to
+	# protect it with the following which did not work reliably.
+	# These days we only install the config.php-dist file.
+	# webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	if use daemon; then
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
+			newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd
+			newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd
+			insinto /etc/logrotate.d/
+			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
+
+			elog "After upgrading, please restart ttrssd"
+	else
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php and config.php-dist manually now."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/venus/Manifest b/www-apps/venus/Manifest
new file mode 100644
index 000000000000..8f6e813f2dfd
--- /dev/null
+++ b/www-apps/venus/Manifest
@@ -0,0 +1,9 @@
+AUX postinstall-en.txt 192 SHA256 f95f32190fbae2a42332277007c7b4e70da89b3cb861a1cc798b11787776adfe SHA512 6185dc665439d4d5d877501a60566f04bc40bf43e568ab158a20aec68902104662129e945129d7914bfcb20e804b0484686893d11deb2310fcc9f097bc7cd2ee WHIRLPOOL 425f4a2809f0b99cdac83a4c3db367cb837c2b65708327df10f9eebbd47807c76a4cf7cb8614596e5cf314c630851b9fdc3d044ff39052f73ab79484e5a64a1a
+AUX venus-bsddb3.patch 1366 SHA256 c6d1ddf3c250179777136bffa2f8e23c1eefd93a346179e06073e110ffc81b1d SHA512 cb3cca0415a9d12356dd85aa1434270612e09153c443a2f207af8d0be53c64e8a87bdd10b3e89b4d5a3fa56334cc691f3c44221078fbe2931c99b6215fc1925d WHIRLPOOL 1258715aef9c2243b7f6440ff7b9fca92beb63af054645b80322b1ac9f977faa0da8d1eded5f2360f1aee042968d4705caf9fd7876f76cf9580835292bbbe90c
+AUX venus-xml-utf8.patch 4058 SHA256 e4e68e630ad229c958dfcf8d77cc0a47ba1061fca3297e8c67eb6ce1f280efe8 SHA512 1466ec1fabaef90b7907cc7587ff994a8a9d8935eed77c725ebb65b9b86f3daa15d6e0da907ce84ce7090d14c82e1c96739b3a4a7c862bcc22af60cb74e0ad6c WHIRLPOOL 464e808585a5ae1645311b2852195fe3fd0f3d582476c75d0601782d4cebb4a7bc966571f68ac0b136cd93dcd622bb827806b62a61c9b8b1be66600bb26bea3b
+DIST venus-20100911.tar.bz2 349639 SHA256 72e19495518ade6641a3c50346374b4868b232d58a32fa18be387ae4a151dc03 SHA512 516a503e1e43e4bf694f007382603d6415bf508f79feb8db55dba533ca9b8b367f922ede84b2ef4ec74684f81ad17919ba754abfe5e79aac51da732ceb8c2897 WHIRLPOOL 745973c2ebf4e49ed7823c468478f1b118159d955b9bd076f79c4d9d4cca89971297c74a89a01b80bd7d242a69a4ac8914e5af01b7ed59e0189362e2a6092fd8
+EBUILD venus-20100911-r1.ebuild 1534 SHA256 62a9ead6076798b305b2897b952ba9f37709967ebacb52028ccd5fdeaa026a1d SHA512 87547404d5b23373882eae3a6b3314030ec8e802b242acbabb9fe505cdf38e768b2f2e30bca0ac8362bdf6b0dd911a8130606fc128e25b38382ba147a8825f22 WHIRLPOOL 548e2755baa5b5fc0f325b4aa70f2a0bff958dfaaa1114c25cba0e37c448bc9c3eae3d9c1ccef6373b54122d8399d3b5f331208c190977f8987eb3daf2fa5ee8
+EBUILD venus-20100911-r2.ebuild 1586 SHA256 015e842dd668ec7a88b6f453892e4f50e1a7c7af24edaac6db311dbba171a188 SHA512 d1ed382fc803c2312defa3ebfb7e23323282d430d5781166ee2e1d3dff73d4848c26ea2ae2b5fb1771fff17909e4f4fb21b55aeec802cb4445c577e19311b4fb WHIRLPOOL 66cf2b6780ba2ffa814f26c1dda263ee97eb09bd8541ee6a87dcbe867fdf820066ea9470a4aa20d8bb8110e87a2a7d5c5868cdbe8eb16c16920f458c76c20dee
+MISC ChangeLog 2971 SHA256 2638b08fe30813d485881968d1c02fbf13492bd32696957a9a0cb133e109a9b8 SHA512 1fdaf9dac43cb5751ab22d3fa4103801786d0cf84a7524ca3214dd327dd3ba5a9b479c0b129698138043b497cd5f1eaa7b3e9db1913e3512b4305f9532cc8a1d WHIRLPOOL 33f7ca7f63f008e821d7fca2733bac50c6f78b932200986b6a108af041e85b08a41be536ed177053fc2ea4f0275d8813a49399fa97e343483994303e49cc1b47
+MISC ChangeLog-2015 945 SHA256 fe23dc2ab96065dcea619e6312a7230a084762d3142264fdc72f9be425c5fa96 SHA512 3e73f58d85462d0e2b5f5f32b63dc0a6223c36dd33eda30f6c566d36d4f22bda4c64925a0f6a7f11dec07dc647a0ccab410992e4cb17294dbac58e71fcf58916 WHIRLPOOL 14cd1e0e1695a8425bae119722fec50b9b88a3f7ed7137fa10e5429d7b7788dcfd6ad6d9c9c26d946e2c6d3ccdd1dd900a115c2b4143499d38a28c51eaedcd58
+MISC metadata.xml 480 SHA256 9f929d5141950c439856be954fdf5f193976f4ab4e19e81c34f7c1c9153471be SHA512 0caa5f4788096b3eaaa02c6cbc2f0685975e25f95ce1775e330acae28c708a0cf1bf38f31c8384068da0258948ada6ce09c6c864dac680753fb83a0d272d3bc9 WHIRLPOOL 0b12f116cbaafc0058ae5ac2a01ddc054329edb88a07f15bb08d1c544d7972eda4742bf49610828d27dce09d23a3a038dc87eb2d98c3240aa445906f8c59b5e5
diff --git a/www-apps/venus/files/postinstall-en.txt b/www-apps/venus/files/postinstall-en.txt
new file mode 100644
index 000000000000..37427c4a8d5a
--- /dev/null
+++ b/www-apps/venus/files/postinstall-en.txt
@@ -0,0 +1,10 @@
+INSTALLATION
+
+Installation instructions can be found at:
+
+http://intertwingly.net/code/venus/docs/
+/usr/share/doc/\${PF}/html
+
+Example configuration files can be found at:
+
+${VHOST_ROOT}/conf
diff --git a/www-apps/venus/files/venus-bsddb3.patch b/www-apps/venus/files/venus-bsddb3.patch
new file mode 100644
index 000000000000..b57499c23698
--- /dev/null
+++ b/www-apps/venus/files/venus-bsddb3.patch
@@ -0,0 +1,39 @@
+Use bsddb3 instead of deprecated python[berkdb]. Patch by Arfrever.
+
+--- a/planet/idindex.py
++++ b/planet/idindex.py
+@@ -13,8 +13,8 @@
+         cache = config.cache_directory()
+         index=os.path.join(cache,'index')
+         if not os.path.exists(index): return None
+-        import dbhash
+-        return dbhash.open(filename(index, 'id'),'w')
++        import bsddb3
++        return bsddb3.hashopen(filename(index, 'id'),'w')
+     except Exception, e:
+         if e.__class__.__name__ == 'DBError': e = e.args[-1]
+         from planet import logger as log
+@@ -35,8 +35,8 @@
+     cache = config.cache_directory()
+     index=os.path.join(cache,'index')
+     if not os.path.exists(index): os.makedirs(index)
+-    import dbhash
+-    index = dbhash.open(filename(index, 'id'),'c')
++    import bsddb3
++    index = bsddb3.hashopen(filename(index, 'id'),'c')
+ 
+     try:
+         import libxml2
+--- a/tests/test_idindex.py
++++ b/tests/test_idindex.py
+@@ -67,8 +67,8 @@
+         self.assertEqual(12,len(doc.getElementsByTagName('planet:name')))
+ 
+ try:
+-    module = 'dbhash'
++    import bsddb3
+ except ImportError:
+-    planet.logger.warn("dbhash is not available => can't test id index")
++    planet.logger.warn("bsddb3 is not available => can't test id index")
+     for method in dir(idIndexTest):
+         if method.startswith('test_'):  delattr(idIndexTest,method)
diff --git a/www-apps/venus/files/venus-xml-utf8.patch b/www-apps/venus/files/venus-xml-utf8.patch
new file mode 100644
index 000000000000..f7c29782ff46
--- /dev/null
+++ b/www-apps/venus/files/venus-xml-utf8.patch
@@ -0,0 +1,80 @@
+diff -Nuar --exclude '*~' venus.orig/themes/common/atom.xml.xslt venus/themes/common/atom.xml.xslt
+--- venus.orig/themes/common/atom.xml.xslt	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/atom.xml.xslt	2017-03-17 17:24:51.668976850 -0700
+@@ -1,3 +1,4 @@
++<?xml version="1.0" encoding="UTF-8"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                 xmlns:access="http://www.bloglines.com/about/specs/fac-1.0"
+                 xmlns:atom="http://www.w3.org/2005/Atom"
+@@ -7,6 +8,7 @@
+                 xmlns="http://www.w3.org/1999/xhtml"
+ 		exclude-result-prefixes="planet xhtml">
+ 
++  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
+   <!-- strip planet elements and attributes -->
+   <xsl:template match="planet:*|@planet:*"/>
+ 
+diff -Nuar --exclude '*~' venus.orig/themes/common/foafroll.xml.xslt venus/themes/common/foafroll.xml.xslt
+--- venus.orig/themes/common/foafroll.xml.xslt	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/foafroll.xml.xslt	2017-03-17 17:25:01.477165384 -0700
+@@ -1,3 +1,4 @@
++<?xml version="1.0" encoding="UTF-8"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+ 	        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ 	        xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+@@ -8,7 +9,7 @@
+                 xmlns:planet="http://planet.intertwingly.net/"
+                 exclude-result-prefixes="atom planet">
+  
+-  <xsl:output indent="yes" method="xml"/>
++  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
+ 
+   <xsl:template match="atom:feed">
+     <rdf:RDF>
+diff -Nuar --exclude '*~' venus.orig/themes/common/opml.xml.xslt venus/themes/common/opml.xml.xslt
+--- venus.orig/themes/common/opml.xml.xslt	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/opml.xml.xslt	2017-03-17 17:26:20.930692531 -0700
+@@ -1,9 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                 xmlns:atom="http://www.w3.org/2005/Atom"
+                 xmlns:planet="http://planet.intertwingly.net/"
+                 exclude-result-prefixes="atom planet">
+  
+-  <xsl:output indent="yes" method="xml"/>
++  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
+ 
+   <xsl:template name="rfc822" xmlns:date="http://exslt.org/dates-and-times">
+     <xsl:param name="date"/>
+diff -Nuar --exclude '*~' venus.orig/themes/common/rss10.xml.tmpl venus/themes/common/rss10.xml.tmpl
+--- venus.orig/themes/common/rss10.xml.tmpl	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/rss10.xml.tmpl	2017-03-17 17:26:18.558646942 -0700
+@@ -1,4 +1,4 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
+ <rdf:RDF
+ 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ 	xmlns:dc="http://purl.org/dc/elements/1.1/"
+diff -Nuar --exclude '*~' venus.orig/themes/common/rss20.xml.tmpl venus/themes/common/rss20.xml.tmpl
+--- venus.orig/themes/common/rss20.xml.tmpl	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/rss20.xml.tmpl	2017-03-17 17:26:16.718611577 -0700
+@@ -1,4 +1,4 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
+ <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+ 
+ <channel>
+diff -Nuar --exclude '*~' venus.orig/themes/common/validate.html.xslt venus/themes/common/validate.html.xslt
+--- venus.orig/themes/common/validate.html.xslt	2010-09-11 06:41:53.000000000 -0700
++++ venus/themes/common/validate.html.xslt	2017-03-17 17:26:58.275410251 -0700
+@@ -1,8 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                 xmlns:atom="http://www.w3.org/2005/Atom"
+                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
+                 xmlns:planet="http://planet.intertwingly.net/"
+                 xmlns="http://www.w3.org/1999/xhtml">
++  <xsl:output indent="yes" method="html" encoding="UTF-8"/>
+  
+   <xsl:template match="atom:feed">
+     <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
new file mode 100644
index 000000000000..1f74e9175222
--- /dev/null
+++ b/www-apps/venus/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+   <email>web-apps@gentoo.org</email>
+   <name>Gentoo Webapps</name>
+ </maintainer>
+ <use>
+   <flag name="django">Support for django template style to config files</flag>
+   <flag name="genshi">Support for genshi style to config files</flag>
+   <flag name="redland">Enable support for Redland RDF</flag>
+ </use>
+</pkgmetadata>
diff --git a/www-apps/venus/venus-20100911-r1.ebuild b/www-apps/venus/venus-20100911-r1.ebuild
new file mode 100644
index 000000000000..8136fe627ae8
--- /dev/null
+++ b/www-apps/venus/venus-20100911-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit webapp python-single-r1
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="A feed aggregator application"
+HOMEPAGE="http://intertwingly.net/code/venus/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="PSF-2.2"
+KEYWORDS="amd64 x86"
+IUSE="django genshi redland test"
+SLOT="0"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/utidylib[${PYTHON_USEDEP}]
+	django? ( dev-python/django[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${PN}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/venus-bsddb3.patch
+	eapply_user
+	python_fix_shebang .
+}
+
+src_test() {
+	"${PYTHON}" runtests.py || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc AUTHORS README TODO
+	dodoc -r docs
+
+	python_moduleinto venus
+	python_domodule *.py filters planet
+
+	insinto "${MY_APPDIR}"
+	doins -r themes
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins -r examples
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
+		or http://intertwingly.net/code/venus/docs/index.html"
+}
diff --git a/www-apps/venus/venus-20100911-r2.ebuild b/www-apps/venus/venus-20100911-r2.ebuild
new file mode 100644
index 000000000000..2ca1b2e96206
--- /dev/null
+++ b/www-apps/venus/venus-20100911-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit webapp python-single-r1
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="A feed aggregator application"
+HOMEPAGE="http://intertwingly.net/code/venus/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="PSF-2.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="django genshi redland test"
+SLOT="0"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/utidylib[${PYTHON_USEDEP}]
+	django? ( dev-python/django[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${PN}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/venus-bsddb3.patch
+	"${FILESDIR}"/venus-xml-utf8.patch
+)
+
+src_prepare() {
+	default_src_prepare
+	python_fix_shebang .
+}
+
+src_test() {
+	"${PYTHON}" runtests.py || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc AUTHORS README TODO
+	dodoc -r docs
+
+	python_moduleinto venus
+	python_domodule *.py filters planet
+
+	insinto "${MY_APPDIR}"
+	doins -r themes
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins -r examples
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
+		or http://intertwingly.net/code/venus/docs/index.html"
+}
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
new file mode 100644
index 000000000000..c42a483bd1a6
--- /dev/null
+++ b/www-apps/viewvc/Manifest
@@ -0,0 +1,5 @@
+DIST viewvc-1.1.26.tar.gz 616103 SHA256 9d718237df7fc04d511302812c0bec0363cf6b8334ab796953a764c2de426e43 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e WHIRLPOOL d8d6348d9d4c48176ff71af6aec74c4d3d73a58217b7b6b23f27d47503548df66cb0121b7d17d89c2a9a0524280b22960fcbf3a7b11a35c8411626f8759c2d50
+EBUILD viewvc-1.1.26.ebuild 2581 SHA256 91076be4ef5a1ae2783b01e6bbbb8012d0f185703aaefcd0122608fe2e5c46ab SHA512 a764d406fd20279ae6af58b9f727b5677619d79e3ac274cf8aea27700352939027bcc128fbb1cb9f58540d4158907ba5856be1da836eaec6e772b407822e9c0f WHIRLPOOL e4c8e6c449054d701c027c45911ed6e91227c33b3de7d33d7f16ec80ff467efbed34c0c4c4096e573d7a393b8cc7cf8a07287dec8ec33d8157bd654895ff59f7
+MISC ChangeLog 2426 SHA256 92cddc5815b2106861a6d816614dcb10134248c32546a9b756e5530e0fab9da4 SHA512 87809d0c92360193408fa63578ce3a2d2ad4fb56dab89d2bd889ceed200f8d05168e73af63c2a776af78e06495d6f4a6fc623f1dea342dc0019a0f6dfbd88eae WHIRLPOOL 87eb44f7a844569a56c7b5096c5914d41d4b30d7e8ed16fdc0f5d1d1b1c616a661af19a3b8b7b55bb11e281c1b5049902ee4f92e6b9ddb9814997cdfe2e493f5
+MISC ChangeLog-2015 12030 SHA256 9a61dbb8ba35f28b6af2940eb6ee2d9858dc997d44a548272a3bdf3589966fca SHA512 43d25ca30c91c802671758f672d3beaee5da8ab2d7c583ba3b0b89747de41866f7072086bfb12f327f48187e35d1a56fdd208bad9d9328b72dad799eaf162c3c WHIRLPOOL 63d99ce3c4e8e6319f6e4452e9c635a7cfb32cc04cf2a298f8a1ede027d78160cda5c058c40c08660cfb65ac7cc42f6fad32e24bc30ed1446e64c5bd801a122f
+MISC metadata.xml 558 SHA256 1e54064260e5aaa74b19ea4f09bad5e19b44b3f36afc78dd4110e3b938191db2 SHA512 9623aa98ccf5ab79b5784e6cf7773ffb769ebd2c73847df3be6f0caa1cfaa59c73b5f820b13a02ccbf0398e3e33e20174f5d81c279ec707d5a574fa0cdde24db WHIRLPOOL 1ebd3d758eac5c00cdfe7d3d92539dbe2d1509867fbc9cc294689fdc77fd52e17b7ecda7230913cc5d1f96a8955681707ae534fc64a60a0b0de69b47f835e5d6
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
new file mode 100644
index 000000000000..e3f695364293
--- /dev/null
+++ b/www-apps/viewvc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<use>
+		<flag name="cvsgraph">Add <pkg>dev-vcs/cvsgraph</pkg> support to show graphical views of revisions and branches</flag>
+		<flag name="mod_wsgi">Add <pkg>www-apache/mod_wsgi</pkg> support</flag>
+		<flag name="pygments">Add <pkg>dev-python/pygments</pkg> support for syntax highlighting</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
new file mode 100644
index 000000000000..d0627301f127
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.26.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	cvs? ( dev-vcs/rcs )
+	subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
+
+	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
+	!mod_wsgi? ( virtual/httpd-cgi )
+
+	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
+	mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
+	pygments? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		app-misc/mime-types
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( cvs subversion )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+
+	find bin/ -type f -print0 | xargs -0 sed -i \
+		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
+
+	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
+		lib/config.py || die
+
+	sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
+	sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
+	mv conf/viewvc.conf{.dist,} || die
+	mv conf/cvsgraph.conf{.dist,} || die
+
+	python_fix_shebang .
+}
+
+src_install() {
+	webapp_src_preinst
+
+	newbin bin/standalone.py viewvc-standalone-server
+
+	dodoc CHANGES COMMITTERS INSTALL README
+
+	python_moduleinto viewvc
+	python_domodule lib/.
+
+	insinto "${MY_APPDIR}"
+	doins -r templates/ || die "doins failed"
+	doins -r templates-contrib/
+
+	if use mysql; then
+		exeinto "${MY_HOSTROOTDIR}/bin"
+		doexe bin/{*dbadmin,make-database,loginfo-handler}
+	fi
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins conf/{viewvc,cvsgraph}.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe bin/cgi/viewvc.cgi
+	if use mysql; then
+		doexe bin/cgi/query.cgi
+	fi
+
+	exeinto "${MY_CGIBINDIR}"
+	if use mod_wsgi; then
+		doexe bin/wsgi/viewvc.wsgi
+		if use mysql; then
+			doexe bin/wsgi/query.wsgi
+		fi
+	else
+		doexe bin/wsgi/viewvc.fcgi
+		if use mysql; then
+			doexe bin/wsgi/query.fcgi
+		fi
+	fi
+
+	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
new file mode 100644
index 000000000000..6ca2a95d7938
--- /dev/null
+++ b/www-apps/webdavcgi/Manifest
@@ -0,0 +1,18 @@
+AUX 0.8.3-logout-var-expansion.patch 612 SHA256 606e3b10563b11069dfd5c3ece18cb3e5ace6c3f64271616769e06f0da42307d SHA512 8089e9f3614739c98b710da3c873f6667a012b16bbcfc13cb04707cdf9603677294d45a76d82a0c1e194dc15d4d8b09709448187f010181d86fcc68aae104943 WHIRLPOOL 9d1fec10272bea5e5cc657a803051e20fb98f63db6fbb5ecc312542a975355603ddc398b3e40d406a48217445826ae752e7227f2607232f8fe3e5d240dae64fb
+AUX apache-webdavcgi-0.8-example.conf 2406 SHA256 0500c09343b5e0795e3287415940b67a96a8e86f6810f4e999bbac4eaa1cf267 SHA512 9d7f521e00056836b54f3d664b837a1048b3e5dce027cd079a4b1ae2d0cdff0fe6387180f3d54ccd53c36b1c19298a27375ebd9ab4bb00bd7d0194800c0994a0 WHIRLPOOL 98ad7b11e6aee4c2d90270463b4784491e448b9aa468a8a56656244f4dfc417a22249d4f847bf0b3cbf1fcee44f58f8f58cd850e5bb61814161e026ff92a6ed4
+AUX apache-webdavcgi-1.1-example.conf 2621 SHA256 356764698bdc572d2df41f5c18a050e3f9f6f0df18fb82c59c2c2cca8ed7cc6e SHA512 36e440c8274a46c3e415291f08eb1263694bcb512c9c5bfe6b58f8c24b4d665672788500fc31d87b104c4a654458572798a2e92ab913bd4a438e39b4e90e6ac8 WHIRLPOOL 0e3c51a0e844471214faa67fc11f117017b5f299cc020c87bcda549213fe8944c53e2e85e5d36cccf550f15670f218ced8a38178a5248bb8a5ecdb43b986be7f
+AUX postinstall-en.txt 1133 SHA256 0c749d3de883357c4bd7beee1dfbe9ce1410a56726079c0286a35f5dc84b009e SHA512 207132fd11a1df46e2198fe7134da5db7a15de9b0778481059b088c41d5d8c7bcf2b39d4675cd8a9e65cd546f85693b1ab4ae9b64737985180eb3ff18d292c96 WHIRLPOOL 9f231bce94dfc2effa5cc254eb7e2bebc758b9b502fd1bdced07830b95c3e579234d36a4346771dd8924f3207e5cae7ebcdbb1922754e1d68a97ecda2158233b
+AUX postinstall-webdavwrapper-en.txt 1279 SHA256 d3aafde60e52fe3506cc5c6d3fdc5d4b1b20d1a26b054cdaaaffe29b88b42ea3 SHA512 b670dba1bbd11e764bf7244c0b2194de475c16228ec7c7b0864b0131c0a9a10c2a2980df9caecabfa7252a4024c6976ee7060ef94bb2d5b6e3f985d3fa9ab031 WHIRLPOOL b589e1bc128ab2bb9735a837b5ea15e525f63ce93088e43d84961a10fe56b495101361b5257569456c8c4564474d2ec9afac62592d5a15b3869af277746627a1
+AUX reconfig 784 SHA256 4a5a7689b82e55fd9abf25f2abd52e26d3396b67c15360923695ed4791fee854 SHA512 415c692c26693296fc23161d70521d233543f37aeadfc12992cf4b36ee0f25c7c2eed354831767ccf2a386d4479c53534c23800c756cc7b678ef1f5ed60e32f4 WHIRLPOOL 2786c586fd1931c57548c60146c29c3acf35b781e6ec80f69e004a92cdf60ded6e9db78e0079f29fbb5e2ce6bedd981b6fc5b514eaa794910c46c1f75d3a8485
+AUX reconfig-suid 602 SHA256 dcb3e341cfd4bffe52adfa687b603043d73c989724a3a25b9abcd72166372759 SHA512 aa1563edce254668fb43110dc7d24293e926a6d5083da4a3879bcd5b4d205f1f9feae7bd6e0e00bda5303143346f6951e65318276720013ed7744a6d2c609eb2 WHIRLPOOL e09f6845fd0550a781845d5b0a5d8280e647531fa5c61c7184a1c4dd01734c999bcca9d175342559a50eaa3eb47f2325775eef85114ceb4394a83b4b37385eee
+AUX webdav-0.8.conf 2872 SHA256 abc1831ad50a8ee44ee324b428aaf6ec1ede9353d631999dbb39ee0c1c6d4841 SHA512 1b1d8c1eb53689e02180fb0e59b0ec992da4f6656d0f9965ebeb483bf4f829da6971273d368b0a1cf8bf9df65089720bc57db76f7f8a8b85e0cf645662a2b869 WHIRLPOOL 9b8308ad7911a9da2a0fc124cbb12ce9194bb8545fbb3bb08a914b4bbafe37f43619eb748f9300e78fd1e5efb3057e9490b9e43e3e50b1a992b6cf40b1d54dcd
+AUX webdav-1.1.conf 4450 SHA256 6a05f9197579ce757847db4ae565c88ece7e2782e4718afb1b5e555f71613dbd SHA512 4e867f9d8de4eb3f864ddc0671bf048d1a8daa9e01c830045a7adb5ac712c46925f0ed60d5aeba9acb3f9c3fd259411af23c41476f06d38f3d8f3cb2027c51c8 WHIRLPOOL 11ef850d122316c6d5c32068523cde8a8b5bb8fea7f6433e0922fc3289e18090fc6bd847c44705bb2de5f457c768d7bf7f0f8b01d927f2e4fc8e4b0c51b15887
+DIST webdavcgi-0.8.3.tar.bz2 1190975 SHA256 d8ca7feb1f25f6acce67a5ea769a089edd404660c85633dfbd6303696f1cd294 SHA512 f50e6bb1e78a88ab6bc6452c04f2e5d0cec86f6641d1813556ae3b06c33e2c9250e623926bf1a71ea10f6ca3912e708cb54cd0956b344329de1499887e48e784 WHIRLPOOL e05d0b2e5d6905d3c86e807c1f6b7544c1fa9629f310496648088c2a1a5bb491e507e492b80fa4beb6ab43f9f1d1bbfd095d1b670e3ca88e89b3605f5d790743
+DIST webdavcgi-0.8.4.tar.bz2 1195935 SHA256 d04438a515a770502117b4219ebb5406ed1ab949420802d0ce623fe3f61038ef SHA512 17d9dcfe68012820bf809bc3bd54a881fc9e66a9ddfd87d9381ec0cb08abe3f81638afba4d28ab3079ed56cf1e263b4a764b8348691f17a06743bb1ddf3a2a4e WHIRLPOOL 86d65aad94cd6461f72c39d39f1beb0c24b049a50072ef3b4e16629b388ec562136ee0cb2f93674eaf9342feac077540e98f78b22ad186cf4592cf8d53cbc530
+DIST webdavcgi-1.1.1.tar.bz2 11623234 SHA256 0806ac2c80ad1aba9e8bf9a562ee7884601ece7a59728a91dd83ca542255f0b8 SHA512 660b3e54d72c5b96c1fb329d8e0838b1dbf68e1671af3880f7e096bfdfe559909cf3e1e3069fe4877e0ffbd67d24dc4a38c3db8baaae6d62db05bde31cea789f WHIRLPOOL 952a98c2a15db429ecc3f01f526212d8f4940149ce8585bfb2aa43c0378a8036700c46cd3e1d43a1af9763a665f49e8effbe5e9472a673b8a3e1acdd0ce4220d
+EBUILD webdavcgi-0.8.3.ebuild 2766 SHA256 f6bf4a4c2a4dbc46665d81ae79732542ce15b67b50056706550a46a09482439e SHA512 500f6552ca5daaf7595ff3c18ed361015bb191a48705212ab5b74c9b289c15b50a24a604322b3d1b8faa5438c381815b6e9ac5a56f1ccd5dbb2e9805763a8542 WHIRLPOOL 4f18a44398083fd258dccc5eaf7c838e147e5eb860708e77440046ec843a5f652f6f21aae0c5741538bf4b8009b6b7bf9ecb7c38bdb4b27423f38c0d8e4770fb
+EBUILD webdavcgi-0.8.4.ebuild 4781 SHA256 37f2015efc4091efa21ee9fee88135a7e6ed3293df13b15723f5a7ea7496f790 SHA512 4a5ca82beca219929bd9190d18eb92a648e8eb68fc2dc91f514f2fb598b7eaeee29cf97a8f233425f7bd0662699a533b19f6f70cd6d0ccd6afa957d05bb86d9d WHIRLPOOL d8c1d0d45ce524b211ebc17e525227e804aa6b985329cbc868c2341e8939f580830a7939f7eafb0a56a1e8c47710246b0486eb60f422970379370938903ad5d4
+EBUILD webdavcgi-1.1.1.ebuild 5736 SHA256 99dd508177bd32d433efeaf91edd1cb73dd28c49dde80ff18b68c7e58ab597f5 SHA512 e4fb54e0f2fee21772eae95816a4b9fca5179a5231606f904db5f61d50ecab7d1ad6922dc87d022dc199b8af5ff7b642148cc662c1413c73ae378648cc94ac8e WHIRLPOOL 7168d93a21091e2b0c8308b634546d7b143d44760530f91d300ea6a99629af128a06f2c23964af19018abaf85b10b72554740dca1f5703b2abd3ec5fb5ae1d60
+MISC ChangeLog 3742 SHA256 d95e2c6afe62e48d3fedf9e7574c2248792e3f0ab57949e01b0356ae271e2b4b SHA512 318817d95cd0d3e136e9335cd539493b17724557ae1f9aebc63758abb81cf61ae43f6482ab55dad888ec0212cf4cb46d71486952b4fa8a966e612493d0c2d814 WHIRLPOOL 4cb3f81017608ac2c6fcec4728b9d87dfee67f5803c0bc04bb4bd510900e767b66648362089fa4ad263c91d66d7e849def60accce7bd0477d76fbb6855b9b1f7
+MISC ChangeLog-2015 1978 SHA256 e2a39719fcf914428621008401a76bc5e12cc77c4688f606251abc29a08759d0 SHA512 2354fd7fbad9f75c8414b879f435d83f04536beca1241cec686c06780f7140e605268bf5dcedc7dbe2257f905f7c50d447ab52ee9685843b3722d2f856e1c528 WHIRLPOOL e57e1bacc674ba6d32cd316b23e9ef4084475b94fbca6a80ec6bc43fa4000b7f819f69434ebb9b2b423d6267e9899168ab5744334bf103bf1ba73e6983093f72
+MISC metadata.xml 1206 SHA256 debe05964cd06d79fabb0c6ba9f95c93cb4d71bc37473f313c6e91e04b58b878 SHA512 054f61a47b0aab4430620fe1a218d701c0fce3b510eb2759b36f01e65abaf3626983a68addc0429df74d1975e6961331df1d686a6512932b232ccae6c51d692c WHIRLPOOL 4815a015530d64764bd9e9e6c29752676562927fb40c2fdb20840c58d501adbdd0d46a1fdea538751b3d47df54eb532a6fdf61275a48e4beb0248411d5ad15a2
diff --git a/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch b/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
new file mode 100644
index 000000000000..739ff7f4c79b
--- /dev/null
+++ b/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
@@ -0,0 +1,21 @@
+diff -ru cgi-bin.orig/logout-dist cgi-bin/logout-dist
+--- cgi-bin.orig/logout-dist	2011-03-22 17:25:52.000000000 +0100
++++ cgi-bin/logout-dist	2012-10-03 21:44:35.057437306 +0200
+@@ -34,13 +34,13 @@
+ # -----
+ ### REALM: the basic authentication realm 
+ ### (must be equal to your AuthName value for Apache)
+-REALM="Change Me"
++REALM="${REALM:=Change Me}"
+ 
+ ### HOMEURL: the home URL
+-HOMEURL="/changemyhomeurl"
++HOMEURL="${HOMEURL:=/changemyhomeurl}"
+ 
+-### TIMEOUT: the refresh timeout for the logut page
+-TIMEOUT=0
++### TIMEOUT: the refresh timeout for the logout page
++TIMEOUT=${TIMEOUT:=0}
+ 
+ # SETUP END
+ 
diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
new file mode 100644
index 000000000000..cf1d4d4dafe0
--- /dev/null
+++ b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
@@ -0,0 +1,59 @@
+# Example Apache HTTP server configuration snippet for WebDAV CGI
+#
+# Add the following lines to the Apache HTTP virtual host which should run
+# WebDAV CGI.
+#
+# WebDAV CGI will be accessible via http://www.example.com/webdav/ and uses
+# basic HTTP authentication (by default). For this to work, you need to add all
+# valid users to the AuthUserFile with the help of the htpasswd command:
+#
+# htpasswd -c /etc/webdavcgi-0.8/default/users.htpasswd user1
+# htpasswd /etc/webdavcgi-0.8/default/users.htpasswd user2
+#
+# Note, that if you have the UID/GID wrapper enabled (USE=suid), WebDAV CGI will
+# switch to the login user after a successful login, thus the users within the
+# AuthType need to present on the system as well.
+#
+# You probably want to review and change the following settings:
+# - /webdavcgi should point to your desired webdavwrapper, which is either
+#   webdavwrapper, webdavwrapper-afs, webdavwrapper-krb or in case you disabled
+#   the UID/GID wrapper (USE=-suid), webdav.pl
+#
+# - The /webdav location
+#   If you change this location, make sure to reflect the new path within the
+#   WebDAV CGI configuration (WEBDAVCONF -> $VIRTUAL_BASE) as well.
+#
+# - The authentication provider and/or AuthUserFile
+#
+# - The HOMEURL environment variable. After a user logs out, the browser will
+#   be redirected to this URL.
+#
+# - The WEBDAVCONF environment variable has to point to your configuration
+#
+# For further informations and other configuration possibilities consult the
+# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
+# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
+#
+    ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-0.8/cgi-bin/webdavwrapper"
+    ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-0.8/cgi-bin/logout"
+
+    <Location /webdav>
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+    <Location /webdavcgi>
+        AuthType Basic
+        AuthName "WebDAV-CGI"
+        AuthUserFile /etc/webdavcgi-0.8/default/users.htpasswd
+        Require valid-user
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+
+    RewriteEngine On
+
+    RewriteRule ^/webdav/logout -  [L,E=REALM:WebDAV-CGI,E=HOMEURL:/webdav,E=TIMEOUT:5]
+
+    RewriteRule ^/webdav        /webdavcgi [PT,L,E=WEBDAVCONF:/etc/webdavcgi-0.8/default/webdav.conf,E=PERLLIB:/usr/share/webdavcgi-0.8/lib/perl,E=LOGOUTURL:/webdav/logout]
diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf
new file mode 100644
index 000000000000..4ee926fbd7c7
--- /dev/null
+++ b/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf
@@ -0,0 +1,63 @@
+# Example Apache HTTP server configuration snippet for WebDAV CGI
+#
+# Add the following lines to the Apache HTTP virtual host which should run
+# WebDAV CGI.
+#
+# WebDAV CGI will be accessible via http://www.example.com/webdav/ and uses
+# basic HTTP authentication (by default). For this to work, you need to add all
+# valid users to the AuthUserFile with the help of the htpasswd command:
+#
+# htpasswd -c /etc/webdavcgi-1.1/default/users.htpasswd user1
+# htpasswd /etc/webdavcgi-1.1/default/users.htpasswd user2
+#
+# Note, that if you have the UID/GID wrapper enabled (USE=suid), WebDAV CGI will
+# switch to the login user after a successful login, thus the users within the
+# AuthType need to be present on the system as well.
+#
+# You probably want to review and change the following settings:
+# - /webdavcgi should point to your desired webdavwrapper, which is either
+#   webdavwrapper, webdavwrapper-afs, webdavwrapper-krb or in case you disabled
+#   the UID/GID wrapper (USE=-suid), webdav.pl
+#
+# - The /webdav location
+#   If you change this location, make sure to reflect the new path within the
+#   WebDAV CGI configuration (WEBDAVCONF -> $VIRTUAL_BASE) as well.
+#
+# - The authentication provider and/or AuthUserFile
+#
+# - The HOMEURL environment variable. After a user logs out, the browser will
+#   be redirected to this URL.
+#
+# - The WEBDAVCONF environment variable has to point to your configuration
+#
+# For further informations and other configuration possibilities consult the
+# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
+# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
+#
+    ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-1.1/cgi-bin/webdavwrapper"
+    ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-1.1/cgi-bin/logout"
+
+    <Location /webdav>
+        Require all granted
+        # Disable the line above and enable the two lines below
+        # if you're still on Apache 2.2
+        #Order Allow,Deny
+        #Allow from all
+    </Location>
+
+    <Location /webdavcgi>
+        AuthType Basic
+        AuthName "WebDAV-CGI"
+        AuthUserFile /etc/webdavcgi-1.1/default/users.htpasswd
+        Require valid-user
+        # Also enable the following two lines if you're still on Apache 2.2
+        #Order Allow,Deny
+        #Allow from all
+    </Location>
+
+
+    RewriteEngine On
+
+    RewriteRule ^/webdav/logout -  [L,E=REALM:WebDAV-CGI,E=HOMEURL:/webdav,E=TIMEOUT:5]
+
+    RewriteRule ^/webdav        /webdavcgi [PT,L,E=WEBDAVCONF:/etc/webdavcgi-1.1/default/webdav.conf,E=PERLLIB:/usr/share/webdavcgi-1.1/lib/perl,E=LOGOUTURL:/webdav/logout]
diff --git a/www-apps/webdavcgi/files/postinstall-en.txt b/www-apps/webdavcgi/files/postinstall-en.txt
new file mode 100644
index 000000000000..8aa6f95d87a2
--- /dev/null
+++ b/www-apps/webdavcgi/files/postinstall-en.txt
@@ -0,0 +1,29 @@
+Before you can run WebDAV CGI you need to configure your web server and WebDAV
+CGI itself.
+
+The following configuration snippet serves as an example for the Apache HTTPD
+web server. You will have to adapt it to suite your own server and configuration
+needs.
+
+    ScriptAlias  /cgi-bin/ "${VHOST_CGIBINDIR}/"
+
+    <Location /${VHOST_CGIBINDIR##*/}/>
+        AuthType Basic
+        AuthName "WebDAV-CGI"
+        AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
+        Require valid-user
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+    RewriteEngine On
+    RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
+    RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdav.pl [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
+
+
+Afterwards you need to copy the default configuration file and edit it:
+cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
+\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
+
+For further informations study the online documentation which is located at:
+http://webdavcgi.sourceforge.net/doc.html
diff --git a/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt b/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
new file mode 100644
index 000000000000..5f30d81be7b6
--- /dev/null
+++ b/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
@@ -0,0 +1,32 @@
+Before you can run WebDAV CGI you need to configure your web server and WebDAV
+CGI itself.
+
+The following configuration snippet serves as an example for the Apache HTTPD
+web server. You will have to adapt it to suite your own server and configuration
+needs.
+
+    ScriptAlias  /cgi-bin/ "${VHOST_CGIBINDIR}/"
+
+    <Location /${VHOST_CGIBINDIR##*/}/>
+        AuthType Basic
+        AuthName "WebDAV-CGI"
+        AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
+        Require valid-user
+        Order Allow,Deny
+        Allow from all
+    </Location>
+
+    RewriteEngine On
+    RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
+    RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdavwrapper [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
+
+
+Afterwards you need to copy the default configuration file and edit it:
+cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
+\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
+
+Also make sure that all system users which should be able to login to WebDAV CGI
+are able to access the installed files below ${VHOST_ROOT}.
+
+For further informations study the online documentation which is located at:
+http://webdavcgi.sourceforge.net/doc.html
diff --git a/www-apps/webdavcgi/files/reconfig b/www-apps/webdavcgi/files/reconfig
new file mode 100644
index 000000000000..07710dd7c3e9
--- /dev/null
+++ b/www-apps/webdavcgi/files/reconfig
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+confDir="etc"
+distConfFile="webdav.conf-dist"
+
+sedCmd="/bin/sed"
+
+
+function die ()
+{
+	echo "reconfig error: $1" >&2
+    	exit 1
+}
+
+
+if [ $1 != "install" ]; then
+	# nothing to be done, exit
+	exit 0
+fi
+
+# Set the correct path within the config file
+distConfFilePath="${VHOST_ROOT}/${confDir}/${distConfFile}"
+if ! ${sedCmd} -i -e "s|^\(\$INSTALL_BASE\)=.*|\1='${VHOST_ROOT}/';|" \
+         ${distConfFilePath}
+then
+	die "Setting INSTALL_BASE path in ${distConfFilePath} failed"
+fi
+
+
+# Adding logout support
+# see: http://webdavcgi.sourceforge.net/doc.html#logout
+echo "\$HEADER = '<div class=\"header\">WebDAV CGI - Web interface: You are logged in as <span title="'.`id -a`.'">' .\$ENV{REMOTE_USER}.'</span> (<a href="/logout">Logout</a>).</div>';" >> ${distConfFilePath}
diff --git a/www-apps/webdavcgi/files/reconfig-suid b/www-apps/webdavcgi/files/reconfig-suid
new file mode 100644
index 000000000000..d7fb87722614
--- /dev/null
+++ b/www-apps/webdavcgi/files/reconfig-suid
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+webDavWrapper="webdavwrapper"
+webDavWrapperPath="${VHOST_CGIBINDIR}/${webDavWrapper}"
+
+chmodCmd="/bin/chmod"
+chownCmd="/bin/chown"
+
+
+function die ()
+{
+	echo "reconfig error: $1" >&2
+    	exit 1
+}
+
+if [ $1 = "install" ]; then
+	# In order to change the user and group ID at runtime, the webdavwrapper
+	# needs to be run as root (set-user-ID and set-group-ID bit)
+	if ! ${chownCmd} root:root ${webDavWrapperPath}; then
+		die "Chown for ${webDavWrapperPath} failed"
+	fi
+
+	if ! ${chmodCmd} 6755 ${webDavWrapperPath}; then
+		die "Setting SUID and SGID bit on ${webDavWrapperPath} failed"
+	fi
+fi
diff --git a/www-apps/webdavcgi/files/webdav-0.8.conf b/www-apps/webdavcgi/files/webdav-0.8.conf
new file mode 100644
index 000000000000..8563df7ad617
--- /dev/null
+++ b/www-apps/webdavcgi/files/webdav-0.8.conf
@@ -0,0 +1,88 @@
+## -- INSTALL_BASE
+## folder path to the webdav.conf, .css, .js, and. msg files for the Web
+## interface
+## (don't forget the trailing slash)
+$INSTALL_BASE='/usr/share/webdavcgi-0.8/';
+
+## -- VIRTUAL_BASE
+## only neccassary if you use redirects or rewrites from a VIRTUAL_BASE to
+## the DOCUMENT_ROOT;
+## regular expressions are allowed
+## EXAMPLE: $VIRTUAL_BASE = '/';
+$VIRTUAL_BASE = '/webdav';
+
+## -- DOCUMENT_ROOT
+## by default the server document root
+## (don't forget a trailing slash '/'):
+$DOCUMENT_ROOT = '/home/';
+
+## -- UMASK
+## mask for file/folder creation 
+## (it does not change permission of existing files/folders):
+$UMASK = 0007;
+
+## -- ENABLE_DAVMOUNT
+## enables DAV mount button in the folder navigation of the Web interface
+$ENABLE_DAVMOUNT = 1;
+
+## -- ENABLE_COMPRESSION
+## enables/disables gzip content encoding for the Web interface
+$ENABLE_COMPRESSION = 0;
+
+## -- PAGE_LIMIT
+## limits number of files/folders shown in the Web interface
+$PAGE_LIMIT=100;
+
+## -- PAGE_LIMITS
+## allowed selectable limits (-1 = show all)
+@PAGE_LIMITS = ( 5, 10, 15, 20, 30, 50, 100, -1);
+
+## -- DBI_(SRC/USER/PASS)
+## database setup for LOCK/UNLOCK/PROPPATCH/PROPFIND data
+##
+## SQLite config
+## If users share the same folder they should use the same database
+## in this case you have to use a single file writeable for all users.
+#$DBI_SRC='dbi:SQLite:dbname=/var/lib/webdavcgi/0.8/default/webdav.db';
+#$DBI_USER='';
+#$DBI_PASS='';
+#$CREATE_DB = !-e '/var/lib/webdavcgi/0.8/default/webdav.db';
+
+## MySQL config
+#$DBI_SRC='DBI:mysql:database=webdavcgi;host=localhost;port=3306';
+#$DBI_USER='mysqluser';
+#$DBI_PASS='changeme';
+#$CREATE_DB=0;
+
+## PostgreSQL config
+#$DBI_SRC='dbi:Pg:dbname=webdavcgi;host=localhost;port=5432';
+#$DBI_USER='pguser';
+#$DBI_PASS='changeme';
+#$CREATE_DB = 0;
+
+## -- HEADER
+## content after body tag in the Web interface
+$HEADER = '<div class="header">WebDAV CGI - Web interface: You are logged in as <span title=.`id -a`.>' .$ENV{REMOTE_USER}.'</span> (<a href="'.$ENV{LOGOUTURL}.'">Logout</a>).</div>';
+
+## -- ENABLE_CALDAV
+## Disable CalDAV support for Lightning/Sunbird/iCal/iPhone calender/task
+## support
+$ENABLE_CALDAV = 0;
+
+## -- ENABLE_GROUPDAV
+## Disables GroupDAV (http://groupdav.org/draft-hess-groupdav-01.txt)
+$ENABLE_GROUPDAV = 0;
+
+## -- ENABLE_THUMBNAIL
+## Disable image thumbnail support and media rss feed for folder listings of the
+## Web interface.
+## If enabled the default icons for images will be replaced by thumbnails
+## and if the mouse is over a icon the icon will be zoomed to the size of
+## $THUMBNAIL_WIDTH.
+$ENABLE_THUMBNAIL = 0;
+
+## -- THUMBNAIL_CACHEDIR
+## defines the path to a cache directory for image thumbnails
+## this is neccessary if you enable the thumbnail cache ($ENABLE_THUMBNAIL_CACHE)
+## EXAMPLE: $THUMBNAIL_CACHEDIR=".thumbs";
+$THUMBNAIL_CACHEDIR="/var/cache/webdavcgi/0.8/default/thumbnails";
diff --git a/www-apps/webdavcgi/files/webdav-1.1.conf b/www-apps/webdavcgi/files/webdav-1.1.conf
new file mode 100644
index 000000000000..60a08c819226
--- /dev/null
+++ b/www-apps/webdavcgi/files/webdav-1.1.conf
@@ -0,0 +1,125 @@
+#########################################################################
+############  S E T U P #################################################
+
+## -- INSTALL_BASE
+## folder path to the webdav.conf, .css, .js, and. msg files for the Web interface
+## (don't forget the trailing slash)
+## DEFAULT: $INSTALL_BASE=q{} # use webdav.pl script path
+$INSTALL_BASE = '/usr/share/webdavcgi-1.1/';
+
+## -- VIRTUAL_BASE
+## only neccassary if you use redirects or rewrites from a VIRTUAL_BASE to the DOCUMENT_ROOT;
+## regular expressions are allowed
+## EXAMPLE: $VIRTUAL_BASE = qr{/}xms
+$VIRTUAL_BASE = '/webdav';
+
+## -- DOCUMENT_ROOT
+## by default the server document root
+## (don't forget a trailing slash q{/}):
+$DOCUMENT_ROOT = '/home/';
+
+## -- UMASK
+## mask for file/folder creation
+## (it does not change permission of existing files/folders):
+## DEFAULT: $UMASK = oct 2; # read/write/execute for users and groups, others get read/execute permissions
+$UMASK = 0007;
+
+## -- MIMEFILE
+## path to your MIME types file
+## EXAMPLE: $MIMEFILE = '/etc/mime.types';
+$MIMEFILE = '/etc/webdavcgi-1.1/default/mime.types';
+
+## -- ENABLE_COMPRESSION
+## enables/disables gzip content encoding for the Web interface
+## EXAMPLE: $ENABLE_COMPRESSION = 1;
+$ENABLE_COMPRESSION = 0;
+
+## -- ENABLE_DAVMOUNT
+## enables DAV mount button in the folder navigation of the Web interface
+## DEFAULT: $ENABLE_DAVMOUNT = 0;
+$ENABLE_DAVMOUNT = 1;
+
+
+## -- HEADER
+## content after body tag in the Web interface
+$HEADER =
+q{<div class="header">WebDAV CGI - Web interface: You are logged in as ${USER} (<a href="$ENV{LOGOUTURL}" style="color:inherit;">Logout</a>) <div style="float:right;font-size:0.8em;">$NOW</div></div>.};
+
+## -- DBI_(SRC/USER/PASS)
+## database setup for LOCK/UNLOCK/PROPPATCH/PROPFIND data
+##
+## SQLite config
+## If users share the same folder they should use the same database
+## in this case you have to use a single file writeable for all users.
+#$DBI_SRC='dbi:SQLite:dbname=/var/lib/webdavcgi/1.1/default/webdav.db';
+#$DBI_USER='';
+#$DBI_PASS='';
+#$CREATE_DB = !-e '/var/lib/webdavcgi/1.1/default/webdav.db';
+
+## MySQL config
+#$DBI_SRC='DBI:mysql:database=webdavcgi;host=localhost;port=3306';
+#$DBI_USER='mysqluser';
+#$DBI_PASS='changeme';
+#$CREATE_DB=0;
+
+## PostgreSQL config
+#$DBI_SRC='dbi:Pg:dbname=webdavcgi;host=localhost;port=5432';
+#$DBI_USER='pguser';
+#$DBI_PASS='changeme';
+#$CREATE_DB = 0;
+
+## -- ENABLE_CALDAV
+## enable CalDAV support for Lightning/Sunbird/iCal/iPhone calender/task support
+$ENABLE_CALDAV = 0;
+
+## -- ENABLE_CARDDAV
+## enable CardDAV support for Apple's Addressbook
+$ENABLE_CARDDAV = 0;
+
+## -- ENABLE_TRASH
+## enables the server-side trash can (don't forget to setup $TRASH_FOLDER)
+$ENABLE_TRASH = 0;
+
+## -- TRASH_FOLDER
+## neccessary if you enable trash
+## it should be writable by your users (chmod a+rwxt <trash folder>)
+## EXAMPLE: $TRASH_FOLDER = '/tmp/trash';
+$TRASH_FOLDER = '/var/tmp/webdavcgi/1.1/default/trash';
+
+## -- ENABLE_GROUPDAV
+## enables GroupDAV (http://groupdav.org/draft-hess-groupdav-01.txt)
+## EXAMPLE: $ENABLE_GROUPDAV = 0;
+$ENABLE_GROUPDAV = 0;
+
+## -- ENABLE_THUMBNAIL
+## enables image thumbnail support and media rss feed for folder listings of the Web interface.
+## If enabled the default icons for images will be replaced by thumbnails
+## and if the mouse is over a icon the icon will be zoomed to the size of $THUMBNAIL_WIDTH.
+## DEFAULT: $ENABLE_THUMBNAIL = 0;
+$ENABLE_THUMBNAIL = 0;
+
+## -- THUMBNAIL_CACHEDIR
+## defines the path to a cache directory for image thumbnails
+## this is neccessary if you enable the thumbnail cache ($ENABLE_THUMBNAIL_CACHE)
+## EXAMPLE: $THUMBNAIL_CACHEDIR=".thumbs";
+$THUMBNAIL_CACHEDIR = '/var/tmp/webdavcgi/1.1/default/thumbnails';
+
+## -- OPTIMIZERTMP
+### defines absolute path to a cache directory
+$OPTIMIZERTMP = '/var/tmp/webdavcgi/1.1/default/optimized';
+
+## -- BACKEND
+## defines the WebDAV/Web interface backend (see $INSTALL_BASE/lib/perl/Backend/<BACKEND> for supported backends)
+$BACKEND = 'FS';
+
+## -- BACKEND_CONFIG
+## allowes backend specific configurations (see doc/doc.html)
+## EXAMPLE: $BACKEND_CONFIG{FS}={ fsvlink=> { '/home/testuser/' => {'testlink' => '/home/testuser/testlinkdest' } }}
+
+## -- DEBUG
+## enables/disables debug output
+## you can find the debug output in your web server error log
+$DEBUG = 0;
+
+############  S E T U P - END ###########################################
+#########################################################################
diff --git a/www-apps/webdavcgi/metadata.xml b/www-apps/webdavcgi/metadata.xml
new file mode 100644
index 000000000000..a439d73731fd
--- /dev/null
+++ b/www-apps/webdavcgi/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>c.affolter@purplehaze.ch</email>
+		<description>Maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		WebDAV CGI is a Perl CGI script that enables the WebDAV protocol
+		(class 1,2,3) for Web server to manage Web sites or to use a Web server
+		as a Web drive for files, or for calendar/addressbook sharing. If you
+		need correct permissions for files and folders you can install this
+		WebDAV CGI script and a UID/GID wrapper. The Apache module mod_dav does
+		not support UID/GID wrapping, so this implementation fills up this gap
+		as a complete replacement.
+	</longdescription>
+	<use>
+		<flag name="rcs">Adds support for a revision controlled backend with RCS (<pkg>dev-vcs/rcs</pkg>)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">webdavcgi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
new file mode 100644
index 000000000000..b2e189821039
--- /dev/null
+++ b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs webapp
+
+DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV"
+HOMEPAGE="http://webdavcgi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64"
+IUSE="mysql postgres rcs samba +sqlite +suid"
+
+DEPEND=""
+RDEPEND="dev-perl/Archive-Zip
+	dev-perl/File-Copy-Link
+	dev-perl/PerlIO-gzip
+	dev-perl/Quota
+	dev-perl/TimeDate
+	dev-perl/URI
+	dev-perl/UUID-Tiny
+	dev-perl/XML-Simple
+	media-gfx/graphicsmagick[perl]
+	mysql? ( dev-perl/DBD-mysql )
+	virtual/perl-Module-Load
+	postgres? ( dev-perl/DBD-Pg )
+	rcs? ( dev-perl/Rcs )
+	samba? ( dev-perl/Filesys-SmbClient )
+	sqlite? ( dev-perl/DBD-SQLite )
+	dev-perl/CGI
+	virtual/perl-File-Spec"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CGIBINDIR="cgi-bin"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-logout-var-expansion.patch"
+}
+
+src_compile() {
+	if use suid; then
+		# There are several webdavwrappers, TODO: make it configureable
+		export WEBDAVWRAPPER="webdavwrapper"
+
+		$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
+			-o "${CGIBINDIR}/${WEBDAVWRAPPER}" \
+			helper/webdavwrapper.c || die "compile ${WEBDAVWRAPPER} failed"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local htdocsDir='htdocs'
+	local confDir='etc'
+
+	local installDirs="$confDir lib locale"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${htdocsDir}"/*
+
+	exeinto "${MY_CGIBINDIR}"
+	newexe "${CGIBINDIR}/logout-dist" logout
+
+	doexe "${CGIBINDIR}/webdav.pl"
+	use suid && doexe "${CGIBINDIR}/${WEBDAVWRAPPER}"
+
+	local currentDir
+	for currentDir in ${installDirs}; do
+		dodir "${MY_HOSTROOTDIR}/${currentDir}"
+		insinto "${MY_HOSTROOTDIR}/${currentDir}"
+		doins -r "${currentDir}"/*
+	done
+
+	webapp_configfile "${MY_HOSTROOTDIR}/${confDir}"/{webdav.conf-dist,mime.types}
+
+	use mysql && webapp_sqlscript mysql sql/mysql.sql
+	use postgres && webapp_sqlscript postgres sql/postgresql.sql
+
+	dodoc CHANGELOG TODO
+	dohtml -r doc/*
+
+	webapp_hook_script "${FILESDIR}/reconfig"
+
+	webapp_src_install
+
+	# In order to change the user and group ID at runtime, the webdavwrapper
+	# needs to be run as root (set-user-ID and set-group-ID bit)
+	if use suid; then
+		einfo "Setting SUID and SGID bit for ${WEBDAVWRAPPER}"
+		fowners root:root "${MY_CGIBINDIR}/${WEBDAVWRAPPER}"
+		fperms 6755 "${MY_CGIBINDIR}/${WEBDAVWRAPPER}"
+		webapp_postinst_txt en "${FILESDIR}/postinstall-${WEBDAVWRAPPER}-en.txt"
+		webapp_hook_script "${FILESDIR}/reconfig-suid"
+	else
+		ewarn "You have the 'suid' USE flag disabled"
+		ewarn "WebDAV CGI won't be able to switch user ids"
+		webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	fi
+}
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
new file mode 100644
index 000000000000..45fbb4226ce9
--- /dev/null
+++ b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator
+
+DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV"
+HOMEPAGE="http://webdavcgi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+
+# Provide slotting on minor versions. WebDAV CGI is a web application which
+# can be shared by multiple instances and thus major updates shouldn't be
+# enforced to all users/instances at the same time.
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~amd64"
+IUSE="afs kerberos mysql postgres rcs samba +sqlite +suid"
+
+DEPEND=""
+RDEPEND="!www-apps/webdavcgi:0
+	afs? ( net-fs/openafs )
+	dev-lang/perl
+	dev-perl/Archive-Zip
+	dev-perl/File-Copy-Link
+	dev-perl/PerlIO-gzip
+	dev-perl/Quota
+	dev-perl/TimeDate
+	dev-perl/URI
+	dev-perl/UUID-Tiny
+	dev-perl/XML-Simple
+	kerberos? ( virtual/krb5 )
+	media-gfx/graphicsmagick[perl]
+	mysql? ( dev-perl/DBD-mysql )
+	virtual/perl-Module-Load
+	postgres? ( dev-perl/DBD-Pg )
+	rcs? ( dev-perl/Rcs )
+	samba? ( dev-perl/Filesys-SmbClient )
+	sqlite? ( dev-perl/DBD-SQLite )
+	dev-perl/CGI
+	virtual/perl-File-Spec
+	|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CGIBINDIR="cgi-bin"
+
+src_compile() {
+	if use suid; then
+		WEBDAVWRAPPERS="webdavwrapper" # Standard UID/GID wrapper
+
+		use afs      && WEBDAVWRAPPERS+=" webdavwrapper-afs"
+		use kerberos && WEBDAVWRAPPERS+=" webdavwrapper-krb"
+
+		export WEBDAVWRAPPERS
+
+		local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
+				-o "${CGIBINDIR}/${wrapper}" \
+				"helper/${wrapper}.c" || die "compile ${wrapper} failed"
+		done
+	fi
+}
+
+src_install() {
+	exeinto "/usr/libexec/${PN}-${SLOT}/${CGIBINDIR}"
+	newexe "${CGIBINDIR}/logout-dist" "logout"
+	doexe "${CGIBINDIR}/webdav.pl"
+
+	use afs   && doexe "${CGIBINDIR}/afswrapper"
+	use samba && doexe "${CGIBINDIR}/smbwrapper"
+
+	if use suid; then
+	    # In order to change the user and group ID at runtime, the webdavwrapper
+	    # needs to be run as root (set-user-ID and set-group-ID bit)
+		exeopts -o root -g root -m 6755
+
+	    local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			einfo "Installing UID/GID wrapper ${wrapper}"
+			doexe "${CGIBINDIR}/${wrapper}"
+		done
+
+		# reset install opts
+		exeopts
+	else
+		ewarn "You have the 'suid' USE flag disabled"
+		ewarn "WebDAV CGI won't be able to switch user ids"
+	fi
+
+	local confDir='etc'
+	local webdavConfDir="/etc/${PN}-${SLOT}/default"
+
+	export WEBDAVCONFIG="${webdavConfDir}/webdav.conf"
+
+	insinto "${webdavConfDir}"
+	doins "${confDir}/mime.types"
+	newins "${FILESDIR}/webdav-${SLOT}.conf" "webdav.conf"
+
+	local installBaseDir="/usr/share/${PN}-${SLOT}"
+	local currentDir
+	for currentDir in htdocs lib locale; do
+		insinto "${installBaseDir}/${currentDir}"
+		doins -r "${currentDir}"/*
+	done
+
+	if use mysql || use postgres; then
+		local sqlDir='sql'
+		insinto "${installBaseDir}/${sqlDir}"
+		use mysql    && "${sqlDir}/mysql.sql"
+		use postgres && "${sqlDir}/postgresql.sql"
+	fi
+
+	if use sqlite; then
+		# Directory where the SQLite database resides
+		local sqliteRootDir="/var/lib/${PN}/${SLOT}"
+		keepdir "${sqliteRootDir}"
+
+		# Default database directory where all users are able to create and
+		# share the databases, this can be changed within the config file and
+		# restricted to user/group only access if required.
+		export SQLITEDIR="${sqliteRootDir}/default"
+		keepdir "${SQLITEDIR}"
+		fperms 1777 "${SQLITEDIR}"
+	fi
+
+	# Default thumbnail directory, writable by all users
+	export THUMBNAILDIR="/var/cache/${PN}/${SLOT}/default/thumbnails"
+	keepdir "${THUMBNAILDIR}"
+	fperms 1777 "${THUMBNAILDIR}"
+
+	export APACHEEXAMPLECONFIG="apache-webdavcgi-${SLOT}-example.conf"
+	dodoc CHANGELOG TODO
+	dodoc "${FILESDIR}/${APACHEEXAMPLECONFIG}"
+	dohtml -r doc/*
+}
+
+pkg_postinst() {
+	ewarn "In order to allow different users to create and share files,"
+	ewarn "some directories were installed with world write access by default."
+	ewarn "To set restrictive permissions, add all WebDAV CGI users to a"
+	ewarn "common group, and allow access to the following directories by this"
+	ewarn "group only."
+	ewarn "Thumbnail directory: ${THUMBNAILDIR}"
+	use sqlite && ewarn "SQLite directory:    ${SQLITEDIR}"
+
+	ewarn
+	ewarn "Until bug #456180 is fixed, you probably have to re-emerge"
+	ewarn "media-gfx/graphicsmagick"
+
+	elog
+	elog "The WebDAV CGI config is located at ${WEBDAVCONFIG}."
+	elog
+	elog "An example Apache HTTP server configuration snippet is available in"
+	elog "/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
+
+	einfo
+	einfo "Detailed installation and configuration instructions can be found at"
+	einfo "http://webdavcgi.sourceforge.net/"
+}
diff --git a/www-apps/webdavcgi/webdavcgi-1.1.1.ebuild b/www-apps/webdavcgi/webdavcgi-1.1.1.ebuild
new file mode 100644
index 000000000000..54da3b6b4416
--- /dev/null
+++ b/www-apps/webdavcgi/webdavcgi-1.1.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs versionator
+
+DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV."
+HOMEPAGE="http://webdavcgi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+
+# Provide slotting on minor versions. WebDAV CGI is a web application which
+# can be shared by multiple instances and thus major updates shouldn't be
+# enforced to all users/instances at the same time.
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~amd64"
+IUSE="afs git kerberos ldap mysql pdf postgres rcs samba +sqlite +suid"
+
+DEPEND=""
+RDEPEND="afs? ( net-fs/openafs )
+	dev-lang/perl
+	dev-perl/Archive-Zip
+	dev-perl/CGI
+	dev-perl/DateTime
+	dev-perl/DateTime-Format-Human-Duration
+	dev-perl/File-Copy-Link
+	dev-perl/JSON
+	dev-perl/List-MoreUtils
+	dev-perl/MIME-tools
+	dev-perl/PerlIO-gzip
+	dev-perl/Quota
+	dev-perl/TimeDate
+	dev-perl/URI
+	dev-perl/UUID-Tiny
+	dev-perl/XML-Simple
+	git? ( dev-vcs/git )
+	kerberos? ( virtual/krb5 )
+	ldap? ( dev-perl/perl-ldap )
+	media-gfx/graphicsmagick[perl]
+	media-libs/exiftool
+	mysql? ( dev-perl/DBD-mysql )
+	pdf? ( app-text/ghostscript-gpl )
+	postgres? ( dev-perl/DBD-Pg )
+	rcs? ( dev-perl/Rcs )
+	samba? ( net-fs/cifs-utils dev-perl/Filesys-SmbClient )
+	sqlite? ( dev-perl/DBD-SQLite )
+	virtual/perl-File-Spec
+	virtual/perl-Module-Load
+	|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CGIBINDIR="cgi-bin"
+
+src_compile() {
+	if use suid; then
+		WEBDAVWRAPPERS="webdavwrapper" # Standard UID/GID wrapper
+
+		use afs      && WEBDAVWRAPPERS+=" webdavwrapper-afs"
+		use kerberos && WEBDAVWRAPPERS+=" webdavwrapper-krb"
+
+		export WEBDAVWRAPPERS
+
+		local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
+				-o "${CGIBINDIR}/${wrapper}" \
+				"helper/${wrapper}.c" || die "compile ${wrapper} failed"
+		done
+	fi
+}
+
+src_install() {
+	exeinto "/usr/libexec/${PN}-${SLOT}/${CGIBINDIR}"
+	newexe "${CGIBINDIR}/logout-dist" "logout"
+	doexe "${CGIBINDIR}/webdav.pl"
+
+	use afs   && doexe "${CGIBINDIR}/afswrapper"
+	use samba && doexe "${CGIBINDIR}/smbwrapper"
+
+	if use suid; then
+		# In order to change the user and group ID at runtime, the webdavwrapper
+		# needs to be run as root (set-user-ID and set-group-ID bit)
+		exeopts -o root -g root -m 6755
+
+		local wrapper
+		for wrapper in ${WEBDAVWRAPPERS}; do
+			einfo "Installing UID/GID wrapper ${wrapper}"
+			doexe "${CGIBINDIR}/${wrapper}"
+		done
+
+		# reset install opts
+		exeopts
+	else
+		ewarn "You have the 'suid' USE flag disabled"
+		ewarn "WebDAV CGI won't be able to switch user ids"
+	fi
+
+	local confDir='etc'
+	local webdavConfDir="/etc/${PN}-${SLOT}/default"
+
+	export WEBDAVCONFIG="${webdavConfDir}/webdav.conf"
+
+	insinto "${webdavConfDir}"
+	doins "${confDir}/mime.types"
+	newins "${FILESDIR}/webdav-${SLOT}.conf" "webdav.conf"
+
+	local installBaseDir="/usr/share/${PN}-${SLOT}"
+	local currentDir
+	for currentDir in htdocs lib locale templates; do
+		insinto "${installBaseDir}/${currentDir}"
+		doins -r "${currentDir}"/*
+	done
+
+	if use mysql || use postgres; then
+		local sqlDir='sql'
+		insinto "${installBaseDir}/${sqlDir}"
+		use mysql    && doins "${sqlDir}/mysql.sql"
+		use postgres && doins "${sqlDir}/postgresql.sql"
+	fi
+
+	if use sqlite; then
+		# Directory where the SQLite database resides
+		local sqliteRootDir="/var/lib/${PN}/${SLOT}"
+		keepdir "${sqliteRootDir}"
+
+		# Default database directory where all users are able to create and
+		# share the databases, this can be changed within the config file and
+		# restricted to user/group only access if required.
+		export SQLITEDIR="${sqliteRootDir}/default"
+		keepdir "${SQLITEDIR}"
+		fperms 1777 "${SQLITEDIR}"
+	fi
+
+	# Create default temporary directories, writable by all users
+	export TMPDIRS="trash thumbnails optimized"
+	for tmpDir in ${TMPDIRS}; do
+		keepdir "/var/tmp/${PN}/${SLOT}/default/${tmpDir}"
+		fperms 1777 "/var/tmp/${PN}/${SLOT}/default/${tmpDir}"
+	done
+
+	export APACHEEXAMPLECONFIG="apache-webdavcgi-${SLOT}-example.conf"
+	dodoc CHANGELOG
+	dodoc etc/webdav.conf.complete
+	dodoc "${FILESDIR}/${APACHEEXAMPLECONFIG}"
+	dodoc -r "doc/"
+}
+
+pkg_postinst() {
+	ewarn "In order to allow different users to create and share files,"
+	ewarn "some directories were installed with world write access by default."
+	ewarn "To set restrictive permissions, add all WebDAV CGI users to a"
+	ewarn "common group, and allow access to the following directories by this"
+	ewarn "group only."
+	ewarn "Temp directories:    /var/tmp/${PN}/${SLOT}/default/*"
+	use sqlite && ewarn "SQLite directory:    ${SQLITEDIR}"
+
+	elog
+	elog "The WebDAV CGI config is located at ${WEBDAVCONFIG}."
+	elog
+	elog "An example Apache HTTP server configuration snippet is available in"
+	elog "${ROOT%/}/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
+	elog
+	elog "An important note to systemd user's running the Apache HTTP server:"
+	elog "The default apache2.service will be started with private file system"
+	elog "namespaces for /var/tmp and /tmp enabled (PrivateTmp=true)."
+	elog "This means that you either need to disable PrivateTmp, relocate the"
+	elog "directories starting with /var/tmp within ${WEBDAVCONFIG}"
+	elog "or pre-create the directory structure with a user defined systemd"
+	elog "companion unit using the JoinsNamespaceOf directive."
+	elog
+	elog "To disable the private file system namespace, override the existing"
+	elog "service:"
+	elog "systemctl edit apache2.service"
+	elog "[Service]"
+	elog "PrivateTmp=false"
+
+	einfo
+	einfo "Detailed installation and configuration instructions can be found at"
+	einfo "http://webdavcgi.sourceforge.net/"
+}
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
new file mode 100644
index 000000000000..baabde5a8a75
--- /dev/null
+++ b/www-apps/webmcp/Manifest
@@ -0,0 +1,9 @@
+AUX webmcp-1.2.5-gentoo.patch 5020 SHA256 fe1e964220dba4eb0e7b3fea5b4bd92b016d5d28306a1ffc48968fad9d955f2e SHA512 91b3b2679b2254b78120d3ec360d2770aaff82a21c8aa0fa00190d4dd215d4c9d837682c3562332e24ef079fd147618c7727ba721dc4e1302c6c71c875307a60 WHIRLPOOL 87845c81963514d9d3ee892f584a3bfb7a0ce4f0555b83a3c1e45282ad8ff0be1d741f81c1c0ea889f4ea68f8f7c31c009c1d625f8e5e8581c58ee017099708e
+AUX webmcp-1.2.6-gentoo.patch 5143 SHA256 1793be45bd855fe60120e240f6da058d8d1bb3714ca2deebb2fb51a956143f5a SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10 WHIRLPOOL fce519a2bec46feefc59bd4c0771bae9e028d19defd6af89289a1c9d4b7691d8ce4adca56b96e4ef34c14c68a210f4fc61796dbb556e2c22dd8d9f670e4a93ee
+DIST webmcp-v1.2.5.tar.gz 131003 SHA256 16bf5096f4754d56a6f7e059963cd8bc759c406ab50812e49252d97007666da3 SHA512 40ce2f48c0e7362b7cb7a20a44c19d597fd919d98dbd2865aa6c1b5f9c41f593aee408309cf530a7cd0f94e2976ddda93816e723228a7285e689f13e31135589 WHIRLPOOL 51ae7aa7964da773e912ec58ac9113e51a573e6fbde4d01fac63acaaecfcf15f126164321390bf240c23baa99fe7e7e0b1f0ba2c25d70d465395c7c90c9e7432
+DIST webmcp-v1.2.6.tar.gz 132283 SHA256 a8fb516b638fab8cd50e3f9c325c7d166da2f03f3772f9678a47f68ada9f80fe SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556 WHIRLPOOL db147e55d7ff327269a112e6df28cbef8ea4398246e790619c577c2df3535bff7f8dfe27587a999c1fef53da7f6438ac2a90881960575b70fdc56b541c716339
+EBUILD webmcp-1.2.5.ebuild 1414 SHA256 2d098d8d9dffcb1542006207d1cf5f45c904a0503d6022b0086ee4b0433d3542 SHA512 b1417be89af120657ff94e8eaff7275f800a49ba5782fc99a73a5f1e36c9fb68cd6c795e896854adae16d1b689cc13f00781b8b32ea4182a93ee12b1e2737b75 WHIRLPOOL 5fe3e801b769600a55a2b218b79c2fef2e54b8b39df1f37e89e87c22d833ae2681bc276d9185d1e49653e60271d8c511df7033302505f6327aab949421ffc296
+EBUILD webmcp-1.2.6.ebuild 1414 SHA256 ac0ac26c1272be107de00831261df436759beece69603b43c89adfd465649036 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a WHIRLPOOL ab068db1cf1897380e871e617eba2746e7e8b7f02613e7b21eae0db88491ed820193f6503ada3167ba0f3308d6ff4b72f3e8d4e815fda4bef411d0d623d27dc3
+MISC ChangeLog 2293 SHA256 6542d85d7938b92ea6898c17c464686cc2227d60df3d49fb23ba37c03a0bcbd4 SHA512 606fa46184abb4049afff6c20900c9d1059cdb5908bea9037438614f6a9d34f54ee09ee4362b3f75936bec1d145f2258b25af9a13b150bad2f6c19d613c634a5 WHIRLPOOL 9ad4a33abc12ac13e5b99f6f826896bea298ef12076ce7fa4cc9f8ee390bc00b7e4b8fdd9aff472803392419e83cff7ab61292b17c029f8e51340b46019fb3c8
+MISC ChangeLog-2015 935 SHA256 9c8e30ad5646616f3b114ab6e35548a0ce8e66410a54383533c5ddfb12375612 SHA512 04cc507c6ee10769372c523996b5e181f552676c98b76f7d5e41c64d06e47ac436bd994515120df7d97dadcf6cccbc6250d74238a418529ffb602931ce958a1b WHIRLPOOL 5c528c043531e687104d37e596f5ec5f1b2e4963fd40104d235538b3681c25de73eebcb96fa3dcf79e84a75b75aedcab04cfe7f527c2a71f95abfd718f34e48a
+MISC metadata.xml 821 SHA256 fe39b881f92e5c1f3e60781ec07800dddf98455e89d9a01f64a8ed1f2eca0034 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8 WHIRLPOOL 5f0e02dfe41a9c740b15ef20eab9a9bb0ed97d75266f128b2375197befd54c9b5eccab9ec330bee3d45772fa515fa59e07fab12717ade4ba3c7b00c8008c823c
diff --git a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
new file mode 100644
index 000000000000..2cd506583e6b
--- /dev/null
+++ b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
@@ -0,0 +1,141 @@
+--- Makefile.old	2013-03-12 21:49:03.976676966 +0100
++++ Makefile	2013-03-12 21:50:02.888103540 +0100
+@@ -1,11 +1,11 @@
+ include Makefile.options
+ 
+ all::
+-	make documentation
+-	make accelerator
+-	make libraries
+-	make symlinks
+-	make precompile
++	$(MAKE) documentation
++	$(MAKE) accelerator
++	$(MAKE) libraries
++	$(MAKE) symlinks
++	$(MAKE) precompile
+ 
+ documentation::
+ 	rm -f doc/autodoc.tmp
+@@ -14,12 +14,12 @@
+ 	rm -f doc/autodoc.tmp
+ 
+ accelerator::
+-	cd framework/accelerator; make
++	$(MAKE) -C framework/accelerator
+ 
+ libraries::
+-	cd libraries/extos; make
+-	cd libraries/mondelefant; make
+-	cd libraries/multirand; make
++	$(MAKE) -C libraries/extos
++	$(MAKE) -C libraries/mondelefant
++	$(MAKE) -C libraries/multirand
+ 
+ symlinks::
+ 	ln -s -f ../../libraries/atom/atom.lua framework/lib/
+--- Makefile.options.old	2013-03-12 21:54:27.245530485 +0100
++++ Makefile.options	2013-03-12 21:55:45.756768247 +0100
+@@ -10,13 +8,13 @@
+ # C compiler flags
+ # TODO: check alternatives to -D_GNU_SOURCE -fPIC
+ #       using libtool?
+-CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
++CPPFLAGS = -D_GNU_SOURCE
+ 
+ # additional C compiler flags for parts which depend on PostgreSQL
+ CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
+ 
+ # linker flags
+-LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
++LDFLAGS += -shared
+ 
+ # additional linker flags for parts which depend on PostgreSQL
+ LDFLAGS_PGSQL =
+--- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
++++ libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ extos.so: extos.o
+-	$(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o 
++	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
+ 
+ extos.o: extos.c
+ 	$(CC) -c $(CFLAGS) -o extos.o extos.c
+--- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
++++ libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ mondelefant_native.so: mondelefant_native.o
+-	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq
++	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
+ 
+ mondelefant_native.o: mondelefant_native.c
+ 	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
+--- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
++++ libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ multirand.so: multirand.o
+-	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
++	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
+ 
+ multirand.o: multirand.c
+ 	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
+--- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
++++ libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
+@@ -12,6 +12,7 @@
+ #include <fcntl.h>
+ #include <poll.h>
+ #include <stdlib.h>
++#include <crypt.h>
+ 
+ #define EXTOS_MAX_ERRLEN 80
+ #define EXTOS_EXEC_MAX_ARGS 64
+--- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
++++ framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
+ 
+ webmcp_accelerator.o: webmcp_accelerator.c
+-	$(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o webmcp_accelerator.o webmcp_accelerator.c
+ 
+ clean::
+ 	rm -f webmcp_accelerator.so webmcp_accelerator.o
+--- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
++++ libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
+ 
+ extos.o: extos.c
+-	$(CC) -c $(CFLAGS) -o extos.o extos.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o extos.o extos.c
+ 
+ clean::
+ 	rm -f extos.so extos.o
+--- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
++++ libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
+ 
+ mondelefant_native.o: mondelefant_native.c
+-	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
+ 
+ test:: mondelefant_native.so mondelefant.lua
+ 	lua -l mondelefant
+--- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
++++ libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
+ 
+ multirand.o: multirand.c
+-	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o multirand.o multirand.c
+ 
+ clean::
+ 	rm -f multirand.so multirand.o
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
new file mode 100644
index 000000000000..2fa1eb4aff53
--- /dev/null
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
@@ -0,0 +1,143 @@
+--- Makefile.old	2013-03-12 21:49:03.976676966 +0100
++++ Makefile	2013-03-12 21:50:02.888103540 +0100
+@@ -1,11 +1,11 @@
+ include Makefile.options
+ 
+ all::
+-	make documentation
+-	make accelerator
+-	make libraries
+-	make symlinks
+-	make precompile
++	$(MAKE) documentation
++	$(MAKE) accelerator
++	$(MAKE) libraries
++	$(MAKE) symlinks
++	$(MAKE) precompile
+ 
+ documentation::
+ 	rm -f doc/autodoc.tmp
+@@ -14,12 +14,12 @@
+ 	rm -f doc/autodoc.tmp
+ 
+ accelerator::
+-	cd framework/accelerator; make
++	$(MAKE) -C framework/accelerator
+ 
+ libraries::
+-	cd libraries/extos; make
+-	cd libraries/mondelefant; make
+-	cd libraries/multirand; make
++	$(MAKE) -C libraries/extos
++	$(MAKE) -C libraries/mondelefant
++	$(MAKE) -C libraries/multirand
+ 
+ symlinks::
+ 	ln -s -f ../../libraries/atom/atom.lua framework/lib/
+--- Makefile.options.old	2015-05-26 21:43:41.354197822 +0200
++++ Makefile.options	2015-05-26 22:01:34.594735786 +0200
+@@ -14,13 +14,13 @@
+ # C compiler flags
+ # TODO: check alternatives to -D_GNU_SOURCE -fPIC
+ #       using libtool?
+-CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include -I /usr/local/include/lua52
++CPPFLAGS = -D_GNU_SOURCE
+ 
+ # additional C compiler flags for parts which depend on PostgreSQL
+-CFLAGS_PGSQL = -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
++CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server
+ 
+ # linker flags
+-LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
++LDFLAGS = -shared
+ 
+ # additional linker flags for parts which depend on PostgreSQL
+-LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
++LDFLAGS_PGSQL =
+--- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
++++ libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ extos.so: extos.o
+-	$(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o 
++	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
+ 
+ extos.o: extos.c
+ 	$(CC) -c $(CFLAGS) -o extos.o extos.c
+--- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
++++ libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ mondelefant_native.so: mondelefant_native.o
+-	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq
++	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
+ 
+ mondelefant_native.o: mondelefant_native.c
+ 	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
+--- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
++++ libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
+@@ -1,7 +1,7 @@
+ include ../../Makefile.options
+ 
+ multirand.so: multirand.o
+-	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
++	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
+ 
+ multirand.o: multirand.c
+ 	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
+--- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
++++ libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
+@@ -12,6 +12,7 @@
+ #include <fcntl.h>
+ #include <poll.h>
+ #include <stdlib.h>
++#include <crypt.h>
+ 
+ #define EXTOS_MAX_ERRLEN 80
+ #define EXTOS_EXEC_MAX_ARGS 64
+--- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
++++ framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
+ 
+ webmcp_accelerator.o: webmcp_accelerator.c
+-	$(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o webmcp_accelerator.o webmcp_accelerator.c
+ 
+ clean::
+ 	rm -f webmcp_accelerator.so webmcp_accelerator.o
+--- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
++++ libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
+ 
+ extos.o: extos.c
+-	$(CC) -c $(CFLAGS) -o extos.o extos.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o extos.o extos.c
+ 
+ clean::
+ 	rm -f extos.so extos.o
+--- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
++++ libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
+ 
+ mondelefant_native.o: mondelefant_native.c
+-	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
+ 
+ test:: mondelefant_native.so mondelefant.lua
+ 	lua -l mondelefant
+--- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
++++ libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
+@@ -4,7 +4,7 @@
+ 	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
+ 
+ multirand.o: multirand.c
+-	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o multirand.o multirand.c
+ 
+ clean::
+ 	rm -f multirand.so multirand.o
diff --git a/www-apps/webmcp/metadata.xml b/www-apps/webmcp/metadata.xml
new file mode 100644
index 000000000000..4d19ee4003bb
--- /dev/null
+++ b/www-apps/webmcp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>tupone@gentoo.org</email>
+<name>Alfredo Tupone</name>
+</maintainer>
+<longdescription lang="en">
+WebMCP is web application framework written in Lua and C. Instead of using the classical Model-View-Controller (MVC) concept, WebMCP makes use of a so-called Model-View-Action concept. The database is accessed through the Model layer, which provides an Object-Relational Mapping (ORM). HTTP-GET requests are handled by Views, which process the request data, query the database, and render the result. HTTP-POST requests are handled by Actions, which can write to the database and redirect to a View, dependent on success or failure.
+</longdescription>
+</pkgmetadata>
diff --git a/www-apps/webmcp/webmcp-1.2.5.ebuild b/www-apps/webmcp/webmcp-1.2.5.ebuild
new file mode 100644
index 000000000000..33c08e14666e
--- /dev/null
+++ b/www-apps/webmcp/webmcp-1.2.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="Web application framework written in Lua and C"
+HOMEPAGE="http://www.public-software-group.org/webmcp"
+SRC_URI="http://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+KEYWORDS="~amd64"
+SLOT=0
+IUSE=""
+
+RDEPEND="dev-lang/lua
+	dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	# Dereference symlinks
+	cd framework
+	mkdir lib.link
+	mv lib/* lib.link
+	cp lib.link/* lib
+}
+
+src_install() {
+	into /usr/lib/${PN}
+	dolib.so framework/lib/*.so
+	for subdir in "" ".precompiled"; do
+		MY_DEST=/usr/lib/${PN}/framework${subdir}
+
+		cd framework${subdir}
+		exeinto ${MY_DEST}/accelerator
+		doexe accelerator/webmcp_accelerator.so
+		insinto ${MY_DEST}
+		doins -r env js
+		exeinto ${MY_DEST}/cgi-bin
+		doexe cgi-bin/webmcp*.lua
+		into ${MY_DEST}
+		dobin bin/*
+		insinto ${MY_DEST}/lib
+		doins lib/*.lua
+		cd ..
+
+		for file in extos.so mondelefant_native.so multirand.so; do
+			dosym ../../$(get_libdir)/$file ${MY_DEST}/lib/$file
+		done
+
+		insinto /usr/share/${PN}
+		doins -r demo-app${subdir}
+	done
+	dodoc doc/*sample.conf libraries/mondelefant/example.lua
+	dohtml doc/autodoc.html
+}
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
new file mode 100644
index 000000000000..8442fcfc0a2f
--- /dev/null
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="Web application framework written in Lua and C"
+HOMEPAGE="http://www.public-software-group.org/webmcp"
+SRC_URI="http://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+KEYWORDS="~amd64"
+SLOT=0
+IUSE=""
+
+RDEPEND="dev-lang/lua
+	dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	# Dereference symlinks
+	cd framework
+	mkdir lib.link
+	mv lib/* lib.link
+	cp lib.link/* lib
+}
+
+src_install() {
+	into /usr/lib/${PN}
+	dolib.so framework/lib/*.so
+	for subdir in "" ".precompiled"; do
+		MY_DEST=/usr/lib/${PN}/framework${subdir}
+
+		cd framework${subdir}
+		exeinto ${MY_DEST}/accelerator
+		doexe accelerator/webmcp_accelerator.so
+		insinto ${MY_DEST}
+		doins -r env js
+		exeinto ${MY_DEST}/cgi-bin
+		doexe cgi-bin/webmcp*.lua
+		into ${MY_DEST}
+		dobin bin/*
+		insinto ${MY_DEST}/lib
+		doins lib/*.lua
+		cd ..
+
+		for file in extos.so mondelefant_native.so multirand.so; do
+			dosym ../../$(get_libdir)/$file ${MY_DEST}/lib/$file
+		done
+
+		insinto /usr/share/${PN}
+		doins -r demo-app${subdir}
+	done
+	dodoc doc/*sample.conf libraries/mondelefant/example.lua
+	dohtml doc/autodoc.html
+}
diff --git a/www-apps/websvn/Manifest b/www-apps/websvn/Manifest
new file mode 100644
index 000000000000..e72bb3c38d39
--- /dev/null
+++ b/www-apps/websvn/Manifest
@@ -0,0 +1,8 @@
+AUX 13_security_CVE-2013-6892.patch 1624 SHA256 ed9a4a319e4e37238e1d4dfc6251568c846cf2e29bdd6d7a1c015d33c137ae74 SHA512 93c92d09f4deb4368d78146dd5aae6ebc800974e4cf6a5ca9e2fe8a391631b6ab011fa1ba15443b27d8053f75e693c81d330db87ff533441b5381f3af9c9e43e WHIRLPOOL 4e711b69e504898964ec2a4a22e8e1ff5a4b55a197fe0fd5c477f0d58e36d4de821eacebc83e55d4488adf6f7cc7abca3ecc9676c56a6d93b75ce4fadbf8fe82
+AUX 30_CVE-2016-2511.patch 605 SHA256 164781875f08caf6863002076ac8b5cf210a621b628e4cc8a4605a838a8e5af9 SHA512 ee6f538c050d98ec058d586349ae90bc682a0e869b5bf53005e5badf6b583e697ac6411468abb218f78365ac1867a5ed576b99917ff9427740d82256d29f150b WHIRLPOOL 0f01f6b8977db21ed9cc9b119a30c7ee84db97deaacdc0098307102ce908a0c729e131f7813e96d41fa6474633d17ba370ee387cc2d774d22a4f2476d1ad08ed
+AUX 31_CVE-2016-1236.patch 2523 SHA256 ce73c20506dcafad2fc3509218df50420980cbd26b034ba403d7446d8261c009 SHA512 d41a2afe42ac520d8c2d8085f90b1dc4364d82d7fc8905e54b40cbdaa80abf902c0b37b075a78c3af30feb2a1869efb11519e7b6a42d691ecd8e51c41f8b4382 WHIRLPOOL 0863f8091e9bb9e335b81e86d6802ea5fb897c6e49d41823ad339bddd9ad964a5df4f17f95e5afabfe87a15d02d6fe215c7dd24254935b15068729effe638d78
+DIST websvn-2.3.3.tar.gz 882779 SHA256 67d5cb7ffb087f8a92e3dcad10f16612baac4d15a60d659aa8b6e06200ac8742 SHA512 8c77a9770dfc3c9487793cd71c460d4048aa4aa7b8520a53eea8ae872f30e06d885f849d63fa0e9f61ed5923f9dd9c5ef1f3c4f020afaa83d7815a99d64818a0 WHIRLPOOL efd59ddbe6a84d2b0bce9286271627e485c77b93dd0ad998ecaa4bad8bfb246f62508c3e1d6183194b9f64313f223bb44fc8d8fdf0c1f176efb808b3cbf7e7d9
+EBUILD websvn-2.3.3-r1.ebuild 1143 SHA256 7046dac3291354340d8c7e8aba0c236fd42c336e61daad58f55cd463be10e8d2 SHA512 b3bd4c4e5a7d694fbadd3ea1b01f1e1359f832b703b5aa438abd80d00c6cec314e5b851812a0238e5edaa444c4a2828366281ea41ae2dd26b6e57c0002a80ede WHIRLPOOL ea23c9bd9c1693e8a249369b555fc7f4ac6e2a4c5be834aeb9491a1cdf68e9a0fb6c67c7cea53a3d3dc7f66ea963c3e92ce42b98cd1167fef574b3cc173719c7
+MISC ChangeLog 4333 SHA256 8f73cb595d2f131bf92ceba30574f42b9cf4bb6ebe5822295e505364a5b3af74 SHA512 ebe0903a62fd4d4a6de10821a35080e131d1da8962dc1ef157b501926add6b5b90bdd1cec9bb4af71f80dd30d57ab716ebb5ccbc1cd785793f33409f35d0a3ae WHIRLPOOL 9854c4d1a1d5f640c599451e90cf95f84db86efc3d26d8d53020f83996e8de727f511b5eb7db5cc0c9d08da730794b64b895e4249901b86444a7cd7d6b03527f
+MISC ChangeLog-2015 6900 SHA256 542deadcf836d7d7adbd9231a2dee47fdb58ecd4ccb9354f34d91933936ec37d SHA512 9cc78afb963abb119d8dce23b12d0cc1e6282ce766fd3f2e2df3051d9611d50b737ff311c76c687ab066172c212c5baf92d522158b7610e66131698cbe6a8703 WHIRLPOOL a22786d1e6f494ee8ce030594c1c1a0879a1bed9be34009163b2ae1b69ed94f94de8f75b4552015ad6921611f380bee50da5a93f7f2b97e09292177e77a80d1f
+MISC metadata.xml 346 SHA256 d96a485a9a8258b8e8b75b01b70101c1887d3c05f73fa95e879b48d5b254308d SHA512 016d009e180a6bca5a0dd17a4899f36c87edba7b9463fb3058c00c2d1ba0b49e27959d1b7c0804da2ac79f24f34a774ee1bbc525336aebf6b27c07ff45879092 WHIRLPOOL 0efbb03e30b86527ab73c07158409414363977216e3d135bb2423c2100a06e23650b673b5fc5e20afdb2210a37b255fa99f11d3ef4c21e7171db8c48546607af
diff --git a/www-apps/websvn/files/13_security_CVE-2013-6892.patch b/www-apps/websvn/files/13_security_CVE-2013-6892.patch
new file mode 100644
index 000000000000..ffb14e84aa11
--- /dev/null
+++ b/www-apps/websvn/files/13_security_CVE-2013-6892.patch
@@ -0,0 +1,39 @@
+Arbitrary files with a known path can be accessed in websvn by committing a
+symlink to a repository and then downloading the file (using the download
+link).
+
+Author: Thijs Kinkhorst <thijs@debian.org>
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775682
+
+diff -ur oud/dl.php nieuw/dl.php
+--- oud/dl.php	2015-01-18 16:03:30.688791512 +0100
++++ nieuw/dl.php	2015-01-18 16:27:00.950897749 +0100
+@@ -137,6 +137,18 @@
+ 		exit(0);
+ 	}
+ 
++	// For security reasons, disallow direct downloads of filenames that
++	// are a symlink, since they may be a symlink to anywhere (/etc/passwd)
++	// Deciding whether the symlink is relative and legal within the
++	// repository would be nice but seems to error prone at this moment.
++	if ( is_link($tempDir.DIRECTORY_SEPARATOR.$archiveName) ) {
++		header('HTTP/1.x 500 Internal Server Error', true, 500);
++		error_log('to be downloaded file is symlink, aborting: '.$archiveName);
++		print 'Download of symlinks disallowed: "'.xml_entities($archiveName).'".';
++		removeDirectory($tempDir);
++		exit(0);
++	}
++
+ 	// Set timestamp of exported directory (and subdirectories) to timestamp of
+ 	// the revision so every archive of a given revision has the same timestamp.
+ 	$revDate = $logEntry->date;
+@@ -180,7 +192,7 @@
+ 		$downloadMimeType = 'application/x-zip';
+ 		$downloadArchive .= '.zip';
+ 		// Create zip file
+-		$cmd = $config->zip.' -r '.quote($downloadArchive).' '.quote($archiveName);
++		$cmd = $config->zip.' --symlinks -r '.quote($downloadArchive).' '.quote($archiveName);
+ 		execCommand($cmd, $retcode);
+ 		if ($retcode != 0) {
+ 			error_log('Unable to call zip command: '.$cmd);
diff --git a/www-apps/websvn/files/30_CVE-2016-2511.patch b/www-apps/websvn/files/30_CVE-2016-2511.patch
new file mode 100644
index 000000000000..9c270bbc4582
--- /dev/null
+++ b/www-apps/websvn/files/30_CVE-2016-2511.patch
@@ -0,0 +1,11 @@
+--- orig/include/setup.php	2016-02-19 16:02:05.674756241 +0100
++++ new/include/setup.php	2016-02-19 16:02:10.166832543 +0100
+@@ -467,7 +467,7 @@
+ $vars['validationurl'] = getFullURL($_SERVER['SCRIPT_NAME']).'?'.buildQuery($queryParams + array('template' => $template, 'language' => $language), '%26');
+ 
+ // To avoid a possible XSS exploit, need to clean up the passed-in path first
+-$path = !empty($_REQUEST['path']) ? $_REQUEST['path'] : null;
++$path = !empty($_REQUEST['path']) ? escape($_REQUEST['path']) : null;
+ if ($path === null || $path === '')
+ 	$path = '/';
+ $vars['safepath'] = escape($path);
diff --git a/www-apps/websvn/files/31_CVE-2016-1236.patch b/www-apps/websvn/files/31_CVE-2016-1236.patch
new file mode 100644
index 000000000000..13ff2be66f86
--- /dev/null
+++ b/www-apps/websvn/files/31_CVE-2016-1236.patch
@@ -0,0 +1,61 @@
+Description: CVE-2016-1236: XSS via directory or file in a repository containing XSS payload
+Origin: vendor
+Forwarded: no
+Author: Nitin Venkatesh <venkatesh.nitin@gmail.com>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2016-05-08
+
+--- a/revision.php
++++ b/revision.php
+@@ -145,7 +145,7 @@ if ($rep) {
+ 		}
+ 		$resourceExisted = $change->action == 'M' || $change->copyfrom;
+ 		$listing[] = array(
+-			'path' => $change->path,
++			'path' => escape($change->path),
+ 			'oldpath' => $change->copyfrom ? $change->copyfrom.' @ '.$change->copyrev : '',
+ 			'action' => $change->action,
+ 			'added' => $change->action == 'A',
+--- a/log.php
++++ b/log.php
+@@ -323,6 +323,9 @@ if ($rep) {
+ 					$listing[$index]['revadded'] = (isset($modpaths['A'])) ? implode('<br/>', $modpaths['A']) : '';
+ 					$listing[$index]['revdeleted'] = (isset($modpaths['D'])) ? implode('<br/>', $modpaths['D']) : '';
+ 					$listing[$index]['revmodified'] = (isset($modpaths['M'])) ? implode('<br/>', $modpaths['M']) : '';
++					$listing[$index]['revadded'] = escape($listing[$index]['revadded']);
++					$listing[$index]['revdeleted'] = escape($listing[$index]['revdeleted']);
++					$listing[$index]['revmodified'] = escape($listing[$index]['revmodified']);
+ 				}
+ 
+ 				$row = 1 - $row;
+--- a/comp.php
++++ b/comp.php
+@@ -381,7 +381,7 @@ if ($rep) {
+ 						$absnode .= $node;
+ 					}
+ 
+-					$listing[$index]['newpath'] = $absnode;
++					$listing[$index]['newpath'] = escape($absnode);
+ 
+ 					$listing[$index]['fileurl'] = $config->getURL($rep, $absnode, 'file').'rev='.$rev2;
+ 
+--- a/listing.php
++++ b/listing.php
+@@ -123,7 +123,7 @@ function showDirFiles($svnrep, $subs, $l
+ 				$listing[$index]['level'] = ($treeview) ? $level : 0;
+ 				$listing[$index]['node'] = 0; // t-node
+ 				$listing[$index]['path'] = $path.$file;
+-				$listing[$index]['filename'] = $file;
++				$listing[$index]['filename'] = escape($file);
+ 				if ($isDir) {
+ 					$listing[$index]['fileurl'] = urlForPath($path.$file, $passRevString);
+ 				} else {
+@@ -137,7 +137,7 @@ function showDirFiles($svnrep, $subs, $l
+ 				}
+ 
+ 				if ($treeview) {
+-					$listing[$index]['compare_box'] = '<input type="checkbox" name="compare[]" value="'.$path.$file.'@'.$passrev.'" onclick="checkCB(this)" />';
++					$listing[$index]['compare_box'] = '<input type="checkbox" name="compare[]" value="'.escape($path.$file).'@'.$passrev.'" onclick="checkCB(this)" />';
+ 				}
+ 				if ($config->showLastModInListing()) {
+ 					$listing[$index]['committime'] = $entry->committime;
diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
new file mode 100644
index 000000000000..23492929dea5
--- /dev/null
+++ b/www-apps/websvn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<longdescription>
+		Web based Subversion repository browser written in PHP
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/websvn/websvn-2.3.3-r1.ebuild b/www-apps/websvn/websvn-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..285fce66b2fb
--- /dev/null
+++ b/www-apps/websvn/websvn-2.3.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+MY_P="${P//_/}"
+
+DESCRIPTION="Web-based browsing tool for Subversion (SVN) repositories in PHP"
+HOMEPAGE="http://www.websvn.info/ http://websvn.tigris.org/"
+DOWNLOAD_NUMBER="49056"
+SRC_URI="http://websvn.tigris.org/files/documents/1380/${DOWNLOAD_NUMBER}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+IUSE="enscript"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[xml]
+	dev-vcs/subversion
+	virtual/httpd-php:*
+	enscript? ( app-text/enscript )"
+RESTRICT="mirror"
+
+PATCHES=(
+	"${FILESDIR}/13_security_CVE-2013-6892.patch"
+	"${FILESDIR}/30_CVE-2016-2511.patch"
+	"${FILESDIR}/31_CVE-2016-1236.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	webapp_src_preinst
+
+	DOCS=( changes.txt )
+	HTML_DOCS=( doc/* )
+	einstalldocs
+
+	mv include/{dist,}config.php
+	rm -rf license.txt changes.txt doc/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/include/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/wsvn.php
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/cache
+
+	webapp_src_install
+}
diff --git a/www-apps/wiliki/Manifest b/www-apps/wiliki/Manifest
new file mode 100644
index 000000000000..649c17e881b9
--- /dev/null
+++ b/www-apps/wiliki/Manifest
@@ -0,0 +1,7 @@
+AUX wiliki-0.6.1-cgi-gentoo.patch 812 SHA256 2e0f8e5d8a381524ad4e4e1793a2edbe9a925b0f9387fd2c3f8262f3c0165551 SHA512 46f1972f046d07a4bc0f5ce17d57bf6211588128f3b8e0387d13fa3c6d75ea72f8b514955960332de6d4befbd00174965f113ab50fc3cb38202b3c356b052673 WHIRLPOOL ce2e850d10c6bb3228ce7ef819ebc77ec623ac3dcee9c32d69e4d7018292f1a5c5950a2bcd0c2e82e381196962b69b29891b05444e103cb02f3751c76914de4a
+AUX wiliki-po-gentoo.patch 426 SHA256 67f584a529abb63d17810ea5833638ea4d543f50dafae212657174006acbc968 SHA512 0d4eaedff0debe4e964bb4a0a8cdf348b8a4996e4ef403f4e66c8ea57e4b3080c8c33bfb293fe117e86ab3057039da365fdd44349bca26b0319f65a50e6d7cd5 WHIRLPOOL 8f6cc05ea9dc528297346f63f54a7c9c086ec69389f29d11476c02e0dec08b9a463cbe75505010e1f1f03d8b3dc53ac7e524e89b2b0435ab6fd8f389886271d3
+DIST WiLiKi-0.6.1.tgz 123954 SHA256 060b612c09d132932c56be7beadb61abb4bf7d6f25743ba016639e5e40c9254d SHA512 de781f028d38edd37db43384dbdc8a57e9fbfd8b71f12c24840a90a6f000b0a2a85425f5cf3b49c5837bc3d104e2080dbb9c8e763cea54121dac779e3c5d7021 WHIRLPOOL 8b02675ca91fcaba5514688e76b19ad5f2dd17240fa8928dde051fdd6743265e25a205ec90a4e4c7b46cb3a7514eed5111a2428369d55b499f6c364c4e7dd041
+EBUILD wiliki-0.6.1.ebuild 1434 SHA256 b928edfc25799b8bfa245de1adaeceacf59263becd8533a5febbf337c015d520 SHA512 64b3c6a1dea7a8961dc2b44c0989525adb2a601083bf42f719250d5edee4625ffa9b9f548d23b27a23e2f747a9b9a05678ff027bbf473afac994287bc54ac897 WHIRLPOOL 7e6936c0c983a0dd8a19a206dbd091a80507f4e646b323fdb201123b15f28709450838b57f103c293a773c45c61c57d2ab3d4f99bace26d1be959d778269be92
+MISC ChangeLog 2495 SHA256 7087703f24fd537c7892738ad1ea18580f4c34dcad02c9016a5dd60e71b4b8c0 SHA512 feaf13a5ecb59b496138b55680188ae71454a64d8f534fb7929cad28266e31345d3f012f15c467a62e42656719359c9370fef78219c9749af6d64d3f9ca6f4cf WHIRLPOOL fe5c80c085b2213dc60c7044fbc999e0b34dc560c19a7d5bc8ae832b792f20542d8330ca203d2c8fd310ea5235281a7a67350b93fea32dc61968621c4d88514b
+MISC ChangeLog-2015 550 SHA256 34bd1697bd09184712042fc23d1034678a3f70f951f8479f2c1293c33962941e SHA512 845452519602d7cf5af8058e9dca47cb52b7b66ada29868282fb1682a8c6c9002304dad0343a8825a15c8eebcb69302847dd61c5ac9ed5e803b88d7d37e72ee0 WHIRLPOOL 64730a9a5234e1edc91f822b04411cc3afeaabe7aa744f6034e62c3d9253c7e251ee03df8b97c29da8cf0049e1df3dafb3fcd9c6f0b58719f9b2fdcfa0d1a9a7
+MISC metadata.xml 692 SHA256 bcb460b88e9574db363bfc9625e2191f951dee1ec3bec50b64133e26a3908a27 SHA512 ed8c01a0526eeb75e36d011af5a619a9882ca2e511e48a8b2dd914545d097968958c000c3898a97b2f60b6f42c81efc25e64ab2442a1bcedec952c764ee5b7e1 WHIRLPOOL 74a60a3e0a2376fc4f8e263ee16a476d4b09df52a483fd082a5d32d5b5a949a8025a94312132369a5256724a1fd093d468cb90bb18889c76c9cdcdfe16dc56af
diff --git a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
new file mode 100644
index 000000000000..55def56d0510
--- /dev/null
+++ b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
@@ -0,0 +1,23 @@
+--- src/wiliki.cgi.orig	2008-01-11 08:52:19.000000000 -0500
++++ src/wiliki.cgi	2009-01-30 11:54:41.000000000 -0500
+@@ -52,13 +52,13 @@
+ (define (main args)
+   (wiliki-main
+    (make <wiliki>
+-     :db-path "/home/shiro/data/wikidata.dbm"
+-     :top-page "WiLiKi"
+-     :title "MyWiliki"
+-     :description "Shiro's Wiliki Site"
+-     :style-sheet "wiliki.css"
+-     :language 'jp
+-     :charsets '((jp . euc-jp) (en . euc-jp))
++     :db-path "/var/www/localhost/wiliki-0.6.1/data/wikidata.dbm"
++     :top-page "Gentoo WiLiKi"
++     :title "Gentoo Wiliki"
++     :description "Gentoo Wiliki Site"
++     :style-sheet "/wiliki/wiliki.css"
++     :language 'en
++     :charsets '((en . utf-8) (jp . euc-jp) (en . euc-jp))
+      :image-urls '((#/^http:\/\/sourceforge.net\/sflogo/ allow))
+      :debug-level 0
+      )))
diff --git a/www-apps/wiliki/files/wiliki-po-gentoo.patch b/www-apps/wiliki/files/wiliki-po-gentoo.patch
new file mode 100644
index 000000000000..3e5e93f79436
--- /dev/null
+++ b/www-apps/wiliki/files/wiliki-po-gentoo.patch
@@ -0,0 +1,11 @@
+--- po/Makefile.in.orig	2008-01-31 21:38:35.000000000 -0500
++++ po/Makefile.in	2009-01-09 14:34:08.000000000 -0500
+@@ -28,7 +28,7 @@
+ PO_FILES = $(addsuffix .po,$(ALL_LINGUAS))
+ MO_FILES = $(addsuffix .gmo,$(ALL_LINGUAS))
+ 
+-MSGDIR = $(datadir)/locale/$$lingua/LC_MESSAGES/
++MSGDIR = $(DESTDIR)/$(datadir)/locale/$$lingua/LC_MESSAGES/
+ 
+ POTFILES = $(top_srcdir)/src/wiliki.scm \
+            $(top_srcdir)/src/wiliki/db.scm \
diff --git a/www-apps/wiliki/metadata.xml b/www-apps/wiliki/metadata.xml
new file mode 100644
index 000000000000..c51eae6b19fe
--- /dev/null
+++ b/www-apps/wiliki/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>
+	WiLiKi is a lightweight Wiki Engine written in Scheme.
+
+	WiLiKi is yet another Wiki-clone suitable for intra-net collaborative work
+	in multilingual environment. The features include multiple back-end
+	databases, permission and version control, and easy access from other
+	programs.
+
+	http://practical-scheme.net/wiliki/
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wiliki</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/wiliki/wiliki-0.6.1.ebuild b/www-apps/wiliki/wiliki-0.6.1.ebuild
new file mode 100644
index 000000000000..b3d0f900c446
--- /dev/null
+++ b/www-apps/wiliki/wiliki-0.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit webapp eutils
+
+MY_PN="WiLiKi"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WiLiKi is a lightweight Wiki engine written in and running on Gauche Scheme"
+HOMEPAGE="http://practical-scheme.net/wiliki/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgi fastcgi"
+
+DEPEND="dev-scheme/gauche
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )"
+RDEPEND="${DEPEND}"
+
+need_httpd_cgi
+
+WEBAPP_MANUAL_SLOT="yes"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-po-gentoo.patch
+	epatch "${FILESDIR}"/${P}-cgi-gentoo.patch
+}
+
+src_install() {
+	webapp_src_preinst
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	insinto "${MY_CGIBINDIR}"
+	doins -r src/wiliki.cgi src/wiliki2.cgi || die "doins failed"
+	fperms +x "${MY_CGIBINDIR}"/wiliki.cgi || die "fperms failed"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins src/wiliki.css src/wiliki2.css || die "doins failed"
+
+	dodir "${MY_HOSTROOTDIR}"/${PF}/data || die "dodir failed"
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/data
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Quickstart:"
+	einfo "	modify wiliki.cgi to customize the WiLiKi's behavior"
+	einfo "	modify wiliki.css to customize the WiLiKi's look"
+	einfo
+	einfo " http://localhost/cgi-bin/wiliki.cgi"
+	einfo
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
new file mode 100644
index 000000000000..e8394a32defd
--- /dev/null
+++ b/www-apps/wordpress/Manifest
@@ -0,0 +1,13 @@
+AUX postinstall-en.txt 1554 SHA256 85ecf09ffd839186f5aeba6847798827191d56c6fb7798783100b9fecdcf64df SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c WHIRLPOOL a9e8d9e1da2c05f3a60cb4e62ec012afe6a64ebcab76ed07eb1aed0c38d01c318a9c9535f4bb0af5e8618f301cdbe5b6cc4fb2c92f59a92404e18468b28e022e
+AUX postupgrade-en.txt 1653 SHA256 e03f88067a62e5d9cb7e418face5f816b65523f873bfaabdca69efa23377e754 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913 WHIRLPOOL 980b90fc21b46402c60885e94c4fc6e8d43d8a4d5b2537a47857ed5e4067c689c594814b1b38d44ab950e63d8b3ee456480bc81ff3e21169715becde1e8ac6d1
+DIST wordpress-4.7.5.tar.gz 8037036 SHA256 95af89101db8efea48711b7cc169c2a7440a2fba17eee1a057f442091cdec01b SHA512 7d6e4feaf95c49ec7e68068687a399145613d90b5867616ac7a324c60f9107f2453c9f745a455b94e84ef12b191cb2ac67e6b4dd3b8f669e344ea63afc6988ca WHIRLPOOL 6d07fc57d2bf89d73d2a4b72c2811c4bba1d30fa9a06f3abc65792e12f42899cca573874942eef7433445ca38614bced1f839fba5e67a312e55d764223347ce2
+DIST wordpress-4.8.1.tar.gz 8178289 SHA256 785f4c715c87aaef9023b3cf796f62ff4aa25f82dfd5c6d895667da184b60843 SHA512 dfc166a48cd3542e277a74c6b6f551af7043fee45ac62ca764077e1a73fb487da62e57f1a60f60348d8bfe6ee4199c3ce261c042e20cf652f1b0233bd97d6b5c WHIRLPOOL 246a4b888edd53bbb2d64b8aa22393b7f328e5f58c06f39352988b437d3343fe7f5df295996bde568e47024b0b6473491a1b6b95c1cbb34be2466fde5cdb7ce7
+DIST wordpress-4.8.2.tar.gz 8183815 SHA256 c2c65d156e1f3f1d81bbb61a4bb7267b108a09130d46d33b9b9c6b2e93e16752 SHA512 e6b9dd7a3f9b510b1c85b0f9963d9303c9111f1d6ad471c5be076c5b9cf44ade5d1c761c336f44276ab88f69d6c842e6f33d637c7d76532ab88f12f49c385ca6 WHIRLPOOL aaca8fd71863ea00cf6b217281f82fae04e9f9518697c48bca200dd1a42e1d9adfcc8adae262640fb6c50a52a1929eac710a63b7aaaf0f0e548bedefc171a1c7
+DIST wordpress-4.8.tar.gz 8169865 SHA256 39210d593700dc26c58a53b38172be63ea3da67020d80bb2cf34b396b732dd4d SHA512 20249cf13dbcec198df3ec1feb3a7381c194c7c9f832262e40449f90c5e5b5d3f4b63b6021e78c65cc615e059b1b601881d33ce03e1e4618231329b680511467 WHIRLPOOL 3b92caddcdd48213a887f68afd73cd3c1973e9232e30cc8429886809802d5786f12e3732540a06e91358ab97716df2dab735a2341799d6949929cc1843f29ee9
+EBUILD wordpress-4.7.5.ebuild 1263 SHA256 f952bfb347fa1790c0855c75f75049716e0b92c04aa9f7d1048790f0db1f4a00 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39 WHIRLPOOL a8e8de47035c970d767ac250f214da1e9fe2fcf066c4be39314bbade3f5113a3b7af70d2145d281e8b3bc1406ec6bbfb32a02e0c746782040aa4009b36f0e098
+EBUILD wordpress-4.8.1.ebuild 1263 SHA256 f952bfb347fa1790c0855c75f75049716e0b92c04aa9f7d1048790f0db1f4a00 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39 WHIRLPOOL a8e8de47035c970d767ac250f214da1e9fe2fcf066c4be39314bbade3f5113a3b7af70d2145d281e8b3bc1406ec6bbfb32a02e0c746782040aa4009b36f0e098
+EBUILD wordpress-4.8.2.ebuild 1263 SHA256 f952bfb347fa1790c0855c75f75049716e0b92c04aa9f7d1048790f0db1f4a00 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39 WHIRLPOOL a8e8de47035c970d767ac250f214da1e9fe2fcf066c4be39314bbade3f5113a3b7af70d2145d281e8b3bc1406ec6bbfb32a02e0c746782040aa4009b36f0e098
+EBUILD wordpress-4.8.ebuild 1263 SHA256 f952bfb347fa1790c0855c75f75049716e0b92c04aa9f7d1048790f0db1f4a00 SHA512 2f4e9d8aa679e09cee89af28ca894df07339663cf0dc47b9ffaac558d95635b52d5c57d08c6eaa49a587f3a323c4de1294cee4dfa62058f2a77ad329039fdc39 WHIRLPOOL a8e8de47035c970d767ac250f214da1e9fe2fcf066c4be39314bbade3f5113a3b7af70d2145d281e8b3bc1406ec6bbfb32a02e0c746782040aa4009b36f0e098
+MISC ChangeLog 4597 SHA256 9347cfed4725ca2c0f7fba85e4aca41f4cc6a6f8e02b81d8d933ee39bfdae4de SHA512 f0b32b1584c8e79b618083117717ce8f846a24ac32f5c618f0735daf4ee598f32051b0cc98fbff4385c2bd0e81a3a60351a2efbca728cb37f4ad449a8cf4f6f2 WHIRLPOOL 6fa584856397daea15a04e673c308c1ce0789863bb3a4657fbbd9d7a98d56aa17d925dc825b17faca40f1046ab49890ab7a50461ab4c3e5dfa5889ae71528999
+MISC ChangeLog-2015 28739 SHA256 514f23bf39ae41fa4bb51bbec0611d10a74cc4cfa43a91b042dac50903c13340 SHA512 fb8597062844c8c89ad75c244119e1fecc75cfab26c0be94af6dedcee18af3d1ed36dda24a96f27068e424bdb28d4e91656e8e55f0bd3c7178353dfffa2fc5bc WHIRLPOOL 99c380949a87caadee2771a146b2bc73a7b58073003d4969c5f147170db10871d7f405c7ecf5d08e550df9ff53e4e5748f2e490fc31db75e6ca9acd0da34f468
+MISC metadata.xml 392 SHA256 772ad63a51c82a1157b4f86c1c72a39e85885a2131bebfe3dfaa8bd06026bc71 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33 WHIRLPOOL c523b7b79c513ade0b032abd76596f41043576696d6ecdd08eba91c0746908f3a7b1b3fe9c71ed6eff6c5a048dc144312801291460ec0cd5f09e5985def74b08
diff --git a/www-apps/wordpress/files/postinstall-en.txt b/www-apps/wordpress/files/postinstall-en.txt
new file mode 100644
index 000000000000..54c97717bc37
--- /dev/null
+++ b/www-apps/wordpress/files/postinstall-en.txt
@@ -0,0 +1,38 @@
+------------------------------------------------------------------------
+INSTALLATION
+
+You will need to create a table for your WordPress database.  This
+assumes you have some knowledge of MySQL, and already have it
+installed and configured.  If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+http://www.gentoo.org/doc/en/mysql-howto.xml 
+
+Log in to MySQL, and create a new database as well as a user with full
+access to this database. After that you will need to provide the details
+of this database and the associated user within the file
+
+${MY_INSTALLDIR}/wp-config.php 
+
+Finally you should be able to log in to WordPress at
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+                                                            
+------------------------------------------------------------------------
+!!!!!!!!!                 SECURITY WARNING                   !!!!!!!!!!!
+
+Wordpress has had a history of serious security flaws. Any application
+with less widespread use but the same amount of security issues would
+have been removed from the tree.
+
+After a short period of being in the unstable tree we once again decided
+that we hard mask the package.
+
+THIS MEANS THAT THERE IS NO GUARANTEE WHATSOEVER THAT THE PACKAGE WILL
+GET UPGRADED WITHIN A REASONABLE AMOUNT OF TIME EVEN IN THE CASE OF
+SEVERE SECURITY ISSUES.
+
+We consider installing this package a severe risk to your system and 
+you should keep a close eye on the common security trackers so
+that you are able to fix problems with your installation yourself if
+required.
diff --git a/www-apps/wordpress/files/postupgrade-en.txt b/www-apps/wordpress/files/postupgrade-en.txt
new file mode 100644
index 000000000000..5c7b3276db98
--- /dev/null
+++ b/www-apps/wordpress/files/postupgrade-en.txt
@@ -0,0 +1,37 @@
+------------------------------------------------------------------------
+UPGRADE
+
+                                                            
+If you are upgrading from a previous version BACK UP your database.
+
+Once you are done with that, browse to
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/wp-admin/upgrade.php 
+
+and follow the instructions on the screen.
+
+Note that the default theme has changed between Wordpress 2.x and 3.x,
+so if you were using the default theme, your site will fail to load after
+the upgrade. Log in to the admin interface and open the themes section to
+reset to the new default theme. If you face other troubles after the
+upgrade, you might want to look for broken plugins or themes.
+
+------------------------------------------------------------------------
+!!!!!!!!!                 SECURITY WARNING                   !!!!!!!!!!!
+                                                                     
+Wordpress has had a history of serious security flaws. Any application
+with less widespread use but the same amount of security issues would
+have been removed from the tree.
+                                                                     
+After a short period of being in the unstable tree we once again decided
+that we hard mask the package.
+
+THIS MEANS THAT THERE IS NO GUARANTEE WHATSOEVER THAT THE PACKAGE WILL
+GET UPGRADED WITHIN A REASONABLE AMOUNT OF TIME EVEN IN THE CASE OF
+SEVERE SECURITY ISSUES.
+
+We consider installing this package a severe risk to your system and 
+you should keep a close eye on the common security trackers so
+that you are able to fix problems with your installation yourself if
+required.
+
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
new file mode 100644
index 000000000000..0f33ebeaad32
--- /dev/null
+++ b/www-apps/wordpress/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>web-apps@gentoo.org</email>
+<name>Gentoo Webapps</name>
+</maintainer>
+<use>
+<flag name="akismet">Installs Akismet comment spam plug-in</flag>
+<flag name="themes">Installs themes (including default theme)</flag>
+</use>
+</pkgmetadata>
diff --git a/www-apps/wordpress/wordpress-4.7.5.ebuild b/www-apps/wordpress/wordpress-4.7.5.ebuild
new file mode 100644
index 000000000000..c7283f88735a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.7.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/wordpress/wordpress-4.8.1.ebuild b/www-apps/wordpress/wordpress-4.8.1.ebuild
new file mode 100644
index 000000000000..c7283f88735a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/wordpress/wordpress-4.8.2.ebuild b/www-apps/wordpress/wordpress-4.8.2.ebuild
new file mode 100644
index 000000000000..c7283f88735a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.8.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/wordpress/wordpress-4.8.ebuild b/www-apps/wordpress/wordpress-4.8.ebuild
new file mode 100644
index 000000000000..c7283f88735a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /www-apps