summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-misc')
-rw-r--r--www-misc/awstats/Manifest3
-rw-r--r--www-misc/awstats/awstats-7.1.1.ebuild111
-rw-r--r--www-misc/awstats/awstats-7.1_p20121017.ebuild111
-rw-r--r--www-misc/awstats/awstats-7.3.ebuild111
-rw-r--r--www-misc/awstats/files/awstats-7.1-gentoo.diff21
-rw-r--r--www-misc/awstats/metadata.xml8
-rw-r--r--www-misc/bookmarksync/Manifest1
-rw-r--r--www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild43
-rw-r--r--www-misc/bookmarksync/metadata.xml15
-rw-r--r--www-misc/fcgiwrap/Manifest1
-rw-r--r--www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild55
-rw-r--r--www-misc/fcgiwrap/fcgiwrap-9999.ebuild47
-rw-r--r--www-misc/fcgiwrap/metadata.xml14
-rw-r--r--www-misc/gurlchecker/Manifest1
-rw-r--r--www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch15
-rw-r--r--www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch40
-rw-r--r--www-misc/gurlchecker/gurlchecker-0.13.1-r1.ebuild72
-rw-r--r--www-misc/gurlchecker/metadata.xml16
-rw-r--r--www-misc/htdig/Manifest1
-rw-r--r--www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch61
-rw-r--r--www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch15
-rw-r--r--www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch26
-rw-r--r--www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild66
-rw-r--r--www-misc/htdig/metadata.xml5
-rw-r--r--www-misc/litmus/Manifest1
-rw-r--r--www-misc/litmus/files/0.13-autotools-neon-version.patch11
-rw-r--r--www-misc/litmus/litmus-0.13.ebuild62
-rw-r--r--www-misc/litmus/metadata.xml15
-rw-r--r--www-misc/log-toolkit/Manifest1
-rw-r--r--www-misc/log-toolkit/log-toolkit-0.9.6.ebuild24
-rw-r--r--www-misc/log-toolkit/metadata.xml10
-rw-r--r--www-misc/mergelog/Manifest1
-rw-r--r--www-misc/mergelog/files/mergelog-4.5-asneeded.patch32
-rw-r--r--www-misc/mergelog/files/mergelog-4.5-splitlog.patch384
-rw-r--r--www-misc/mergelog/mergelog-4.5-r2.ebuild26
-rw-r--r--www-misc/mergelog/metadata.xml13
-rw-r--r--www-misc/metadata.xml38
-rw-r--r--www-misc/monitorix/Manifest1
-rw-r--r--www-misc/monitorix/files/monitorix-3.5.1.init24
-rw-r--r--www-misc/monitorix/metadata.xml17
-rw-r--r--www-misc/monitorix/monitorix-3.5.1.ebuild96
-rw-r--r--www-misc/multisort/Manifest1
-rw-r--r--www-misc/multisort/metadata.xml7
-rw-r--r--www-misc/multisort/multisort-1.1-r1.ebuild31
-rw-r--r--www-misc/nx_util/Manifest2
-rw-r--r--www-misc/nx_util/files/0.3-fix-install-paths.patch47
-rw-r--r--www-misc/nx_util/files/0.52.1-fix-install-paths.patch49
-rw-r--r--www-misc/nx_util/metadata.xml12
-rw-r--r--www-misc/nx_util/nx_util-0.52.1.ebuild35
-rw-r--r--www-misc/nx_util/nx_util-0.53.1.ebuild35
-rw-r--r--www-misc/profile-sync-daemon/Manifest1
-rw-r--r--www-misc/profile-sync-daemon/metadata.xml10
-rw-r--r--www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1.ebuild35
-rw-r--r--www-misc/reflector/Manifest1
-rw-r--r--www-misc/reflector/metadata.xml8
-rw-r--r--www-misc/reflector/reflector-2011.05.13.1.ebuild44
-rw-r--r--www-misc/surl/Manifest1
-rw-r--r--www-misc/surl/metadata.xml11
-rw-r--r--www-misc/surl/surl-0.7.1.1.ebuild24
-rw-r--r--www-misc/urlwatch/Manifest3
-rw-r--r--www-misc/urlwatch/metadata.xml15
-rw-r--r--www-misc/urlwatch/urlwatch-1.16.ebuild28
-rw-r--r--www-misc/urlwatch/urlwatch-1.17.ebuild28
-rw-r--r--www-misc/urlwatch/urlwatch-1.18.ebuild28
-rw-r--r--www-misc/vdradmin-am/Manifest2
-rw-r--r--www-misc/vdradmin-am/files/vdradmin-3.6.6.conf26
-rw-r--r--www-misc/vdradmin-am/files/vdradmin-3.6.6.logrotate9
-rw-r--r--www-misc/vdradmin-am/files/vdradmin-3.6.7.init57
-rw-r--r--www-misc/vdradmin-am/files/vdradmind.conf2
-rw-r--r--www-misc/vdradmin-am/files/vdradmind.service13
-rw-r--r--www-misc/vdradmin-am/metadata.xml22
-rw-r--r--www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild178
-rw-r--r--www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild178
-rw-r--r--www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild161
-rw-r--r--www-misc/visitors/Manifest1
-rw-r--r--www-misc/visitors/metadata.xml12
-rw-r--r--www-misc/visitors/visitors-0.7-r1.ebuild40
-rw-r--r--www-misc/wsmake/Manifest1
-rw-r--r--www-misc/wsmake/files/wsmake-0.6.4-bv.diff13
-rw-r--r--www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch33
-rw-r--r--www-misc/wsmake/metadata.xml8
-rw-r--r--www-misc/wsmake/wsmake-0.6.4.ebuild34
-rw-r--r--www-misc/xxv/Manifest1
-rw-r--r--www-misc/xxv/files/xxv-1.0-logerror.patch29
-rw-r--r--www-misc/xxv/files/xxv.utf8-v5101
-rw-r--r--www-misc/xxv/files/xxvd-1.0.cfg162
-rw-r--r--www-misc/xxv/files/xxvd-logrotate27
-rw-r--r--www-misc/xxv/metadata.xml19
-rw-r--r--www-misc/xxv/xxv-1.6.1.ebuild191
-rw-r--r--www-misc/zoneminder/Manifest3
-rw-r--r--www-misc/zoneminder/files/10_zoneminder.conf18
-rw-r--r--www-misc/zoneminder/files/README.gentoo27
-rw-r--r--www-misc/zoneminder/files/conf.d6
-rw-r--r--www-misc/zoneminder/files/init.d26
-rw-r--r--www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch11
-rw-r--r--www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch34
-rw-r--r--www-misc/zoneminder/metadata.xml17
-rw-r--r--www-misc/zoneminder/zoneminder-1.27.0.ebuild131
-rw-r--r--www-misc/zoneminder/zoneminder-1.28.0.ebuild149
-rw-r--r--www-misc/zoneminder/zoneminder-1.28.1.ebuild149
100 files changed, 3962 insertions, 0 deletions
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
new file mode 100644
index 000000000000..269c6ec6e8d2
--- /dev/null
+++ b/www-misc/awstats/Manifest
@@ -0,0 +1,3 @@
+DIST awstats-7.1.1.tar.gz 1261038 SHA256 b0051595a38b8b7776f553f20e431760d306bbad1a9e83cf2aca52ef0205f2c0 SHA512 c2bc1604bd15629a057ee7fbbbe4bb0e54992cbd0ed4cd38e4cb9fcbadaa28cd5defd6691352ee8a3f84e98f17b19f9ad953705de4ab36fe4ece95b99b9b685d WHIRLPOOL 37e81b0eb991115b6438f1bf91561c545ae729571de31fd3b46386006027038f2cbed3564f3e9c0dfae6b8fb38f29f05adefe38019ef7deab831c019502da4ca
+DIST awstats-7.1_p20121017.tar.gz 1258135 SHA256 262364b77d825096fee088b207f9f6c3d986dddd89645fca53fe09aa8c1fd850 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53 WHIRLPOOL 678bd6e36634ae2bdee46f42df6d2239a260a188fb1ae07199ef9043a0ad3b54baca7152032873848fabd42f94ef6a92da623e1eb9439d2dbcff15411679f207
+DIST awstats-7.3.tar.gz 2921079 SHA256 39b5b1a4406c30874f020b9635b5d6439ac3acbd7612be1abdcfec65e011c100 SHA512 9dfbab607cef02d8e31fd1738a27effb38ad04b22f2f876674879cc95d8fc56d4b0cd280b4e659ac6c20e65393b9365447fe0b851d00e91601d9e4f618530fbd WHIRLPOOL 193759d0e684099a51af65dcff8e056f52951dcec31361e67acc454bf7cd3227e3f64bfaef59a55d7bae81df73ef4c87c3ce203c18d3709e630bd7bbc2d38daa
diff --git a/www-misc/awstats/awstats-7.1.1.ebuild b/www-misc/awstats/awstats-7.1.1.ebuild
new file mode 100644
index 000000000000..11a4a921642d
--- /dev/null
+++ b/www-misc/awstats/awstats-7.1.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+MY_P=${PN}-${PV%_p*}
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics"
+HOMEPAGE="http://www.awstats.org/"
+
+if [ ${MY_P} != ${P} ]; then
+ SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
+ # The following SRC_URI is useful only when fetching for the first time
+ # after bump; upstream does not bump the version when they change it, so
+ # we rename it to include the date and upload to our mirrors instead.
+ #SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+else
+ SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+ virtual/perl-Time-Local
+ dev-perl/URI
+ geoip? ( dev-perl/Geo-IP )
+ ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+DEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+
+ # change default installation directory
+ find . -type f -exec sed \
+ -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
+ -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
+ -i {} + || die "find/sed failed"
+
+ # set default values for directories; use apache log as an example
+ sed \
+ -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
+ -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+ -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+ # enable plugins
+
+ if use ipv6; then
+ sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ if use geoip; then
+ sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+}
+
+src_install() {
+ dohtml -r docs/*
+ dodoc README.TXT
+ newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+ dodoc -r tools/xslt
+
+ keepdir /var/lib/awstats
+
+ insinto /etc/awstats
+ doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
+
+ # remove extra content that we don't want to install
+ rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
+ "${S}"/wwwroot/classes/src || die
+
+ insinto /usr/share/awstats
+ doins -r wwwroot
+ chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
+
+ cd "${S}"/tools
+ dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+ awstats_updateall.pl
+ newbin logresolvemerge.pl awstats_logresolvemerge.pl
+ newbin maillogconvert.pl awstats_maillogconvert.pl
+ newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+
+ dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+}
+
+pkg_postinst() {
+ elog "The AWStats-Manual is available either inside"
+ elog "the /usr/share/doc/${PF} - folder, or at"
+ elog "http://awstats.sourceforge.net/docs/index.html ."
+ elog
+ elog "Copy the /etc/awstats/awstats.model.conf to"
+ elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+ elog ""
+ ewarn "This ebuild does no longer use webapp-config to install"
+ ewarn "instead you should point your configuration to the stable"
+ ewarn "directory tree in the following path:"
+ ewarn " /usr/share/awstats"
+}
diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.1_p20121017.ebuild
new file mode 100644
index 000000000000..0f00161f67d0
--- /dev/null
+++ b/www-misc/awstats/awstats-7.1_p20121017.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+MY_P=${PN}-${PV%_p*}
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics"
+HOMEPAGE="http://www.awstats.org/"
+
+if [ ${MY_P} != ${P} ]; then
+ SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
+ # The following SRC_URI is useful only when fetching for the first time
+ # after bump; upstream does not bump the version when they change it, so
+ # we rename it to include the date and upload to our mirrors instead.
+ #SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+else
+ SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+ virtual/perl-Time-Local
+ dev-perl/URI
+ geoip? ( dev-perl/Geo-IP )
+ ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+DEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+
+ # change default installation directory
+ find . -type f -exec sed \
+ -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
+ -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
+ -i {} + || die "find/sed failed"
+
+ # set default values for directories; use apache log as an example
+ sed \
+ -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
+ -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+ -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+ # enable plugins
+
+ if use ipv6; then
+ sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ if use geoip; then
+ sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+}
+
+src_install() {
+ dohtml -r docs/*
+ dodoc README.TXT
+ newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+ dodoc -r tools/xslt
+
+ keepdir /var/lib/awstats
+
+ insinto /etc/awstats
+ doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
+
+ # remove extra content that we don't want to install
+ rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
+ "${S}"/wwwroot/classes/src || die
+
+ insinto /usr/share/awstats
+ doins -r wwwroot
+ chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
+
+ cd "${S}"/tools
+ dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+ awstats_updateall.pl
+ newbin logresolvemerge.pl awstats_logresolvemerge.pl
+ newbin maillogconvert.pl awstats_maillogconvert.pl
+ newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+
+ dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+}
+
+pkg_postinst() {
+ elog "The AWStats-Manual is available either inside"
+ elog "the /usr/share/doc/${PF} - folder, or at"
+ elog "http://awstats.sourceforge.net/docs/index.html ."
+ elog
+ elog "Copy the /etc/awstats/awstats.model.conf to"
+ elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+ elog ""
+ ewarn "This ebuild does no longer use webapp-config to install"
+ ewarn "instead you should point your configuration to the stable"
+ ewarn "directory tree in the following path:"
+ ewarn " /usr/share/awstats"
+}
diff --git a/www-misc/awstats/awstats-7.3.ebuild b/www-misc/awstats/awstats-7.3.ebuild
new file mode 100644
index 000000000000..c619d063b85e
--- /dev/null
+++ b/www-misc/awstats/awstats-7.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+MY_P=${PN}-${PV%_p*}
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics"
+HOMEPAGE="http://www.awstats.org/"
+
+if [ ${MY_P} != ${P} ]; then
+ SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
+ # The following SRC_URI is useful only when fetching for the first time
+ # after bump; upstream does not bump the version when they change it, so
+ # we rename it to include the date and upload to our mirrors instead.
+ #SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+else
+ SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+ virtual/perl-Time-Local
+ dev-perl/URI
+ geoip? ( dev-perl/Geo-IP )
+ ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+DEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+
+ # change default installation directory
+ find . -type f -exec sed \
+ -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
+ -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
+ -i {} + || die "find/sed failed"
+
+ # set default values for directories; use apache log as an example
+ sed \
+ -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
+ -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+ -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+ # enable plugins
+
+ if use ipv6; then
+ sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ if use geoip; then
+ sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
+ -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+ fi
+
+ find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+}
+
+src_install() {
+ dohtml -r docs/*
+ dodoc README.TXT
+ newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+ dodoc -r tools/xslt
+
+ keepdir /var/lib/awstats
+
+ insinto /etc/awstats
+ doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
+
+ # remove extra content that we don't want to install
+ rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
+ "${S}"/wwwroot/classes/src || die
+
+ insinto /usr/share/awstats
+ doins -r wwwroot
+ chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
+
+ cd "${S}"/tools
+ dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+ awstats_updateall.pl
+ newbin logresolvemerge.pl awstats_logresolvemerge.pl
+ newbin maillogconvert.pl awstats_maillogconvert.pl
+ newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+
+ dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+}
+
+pkg_postinst() {
+ elog "The AWStats-Manual is available either inside"
+ elog "the /usr/share/doc/${PF} - folder, or at"
+ elog "http://awstats.sourceforge.net/docs/index.html ."
+ elog
+ elog "Copy the /etc/awstats/awstats.model.conf to"
+ elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+ elog ""
+ ewarn "This ebuild does no longer use webapp-config to install"
+ ewarn "instead you should point your configuration to the stable"
+ ewarn "directory tree in the following path:"
+ ewarn " /usr/share/awstats"
+}
diff --git a/www-misc/awstats/files/awstats-7.1-gentoo.diff b/www-misc/awstats/files/awstats-7.1-gentoo.diff
new file mode 100644
index 000000000000..a58ed48bd548
--- /dev/null
+++ b/www-misc/awstats/files/awstats-7.1-gentoo.diff
@@ -0,0 +1,21 @@
+--- awstats-6.3.orig/tools/awstats_configure.pl 2005-01-24 09:28:43.980923725 -0500
++++ awstats-6.3/tools/awstats_configure.pl 2005-01-24 09:28:52.034571769 -0500
+@@ -658,6 +658,18 @@
+ print "\n-----> Restart Web server with '$command'\n";
+ my $ret=`$command`;
+ print "$ret";
++ } elsif (-f "/etc/gentoo-release") {
++ my $command;
++ if (-x "/etc/init.d/apache2") {
++ $command="/etc/init.d/apache2 graceful";
++ } else {
++ print "\n-----> Don't forget to restart manually your web server\n";
++ }
++ if ($command != "") {
++ print "\n-----> Restart Web server with '$command'\n";
++ my $ret=`$command`;
++ print "$ret";
++ }
+ } elsif (-x "/sbin/service") {
+ # We are not on debian
+ my $command="/sbin/service httpd restart";
diff --git a/www-misc/awstats/metadata.xml b/www-misc/awstats/metadata.xml
new file mode 100644
index 000000000000..4767441ed67c
--- /dev/null
+++ b/www-misc/awstats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>web-apps</herd>
+ <maintainer>
+ <email>flameeyes@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-misc/bookmarksync/Manifest b/www-misc/bookmarksync/Manifest
new file mode 100644
index 000000000000..8436dc3efdf6
--- /dev/null
+++ b/www-misc/bookmarksync/Manifest
@@ -0,0 +1 @@
+DIST bookmarksync-0.3.4.tar.gz 14324 SHA256 3111f55a8b1f6dd4d2f343bef4d15b58186a429505760ac8f38e2c4e4592fba8 SHA512 97464e32e9c21010eccf34b9bc94ce67d20f9b7a1f00b4e10e7096c0bde527a8b2a83a05c8623aa009fa0ab1895b025241aba2dfaf6881755bf05682b9e710d0 WHIRLPOOL 9a93d1f06c1dcab0da5c7df437b2d6a18e69d70fba0668ea3a7c59a2f96e30fe6189ea72ca57a8eab40baa31b579866abb81fc3c50d7ce15a3b474c43369c364
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..d2995aaff0e1
--- /dev/null
+++ b/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
+HOMEPAGE="http://sourceforge.net/projects/booksync/"
+SRC_URI="mirror://sourceforge/booksync/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc x86"
+SLOT="0"
+
+IUSE="perl"
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ perl? ( dev-lang/perl )"
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's|g++|$(CXX) $(CFLAGS)|g' \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+ tc-export CXX
+}
+
+src_install () {
+ dobin bookmarksync
+ if use perl ; then
+ dobin tools/bookmarksync.pl
+ dodoc tools/README.tools
+ fi
+ dodoc README TODO DEVELOPERS
+}
+
+pkg_postinst () {
+ use perl && ewarn "You will need to modify bookmarksync.pl before use"
+}
diff --git a/www-misc/bookmarksync/metadata.xml b/www-misc/bookmarksync/metadata.xml
new file mode 100644
index 000000000000..3076f2d83aa9
--- /dev/null
+++ b/www-misc/bookmarksync/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ bookmarksync is a tool used for synchronizing different bookmark files
+ and types. It preserves current bookmark structures and sorts in new
+ ones correctly in existing directorys or create new one if necessary.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">booksync</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
new file mode 100644
index 000000000000..e6596f48a85c
--- /dev/null
+++ b/www-misc/fcgiwrap/Manifest
@@ -0,0 +1 @@
+DIST fcgiwrap-1.1.0.tar.gz 9924 SHA256 4c7de0db2634c38297d5fcef61ab4a3e21856dd7247d49c33d9b19542bd1c61f SHA512 b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc WHIRLPOOL 0df7ab6de6b97db0e516f2ec79185391f0cd2ca2f3ea81b88739546f41a613be3e469394baf3901708b337c8fc7145529e0afb8e884b9ca52d0fba664487e7c0
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..0c7621358a9b
--- /dev/null
+++ b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS=""
+inherit autotools systemd toolchain-funcs ${VCS_ECLASS}
+
+DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
+HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="systemd"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/gnosek/${PN}.git"
+
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~arm x86"
+fi
+
+RDEPEND="dev-libs/fcgi"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( README.rst )
+
+src_prepare() {
+ sed -e "s/-Werror//" \
+ -i configure.ac || die "sed failed"
+
+ sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
+ -i Makefile.in || die "sed failed"
+ tc-export CC
+
+ # Fix systemd units for Gentoo
+ sed -i -e '/User/d' systemd/fcgiwrap.service || die
+ sed -i -e '/Group/d' systemd/fcgiwrap.service || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with systemd) \
+ "$(systemd_with_unitdir)"
+}
+
+pkg_postinst() {
+ einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
+}
diff --git a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild
new file mode 100644
index 000000000000..bb2ab67b6f43
--- /dev/null
+++ b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
+inherit autotools ${VCS_ECLASS}
+
+DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
+HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/gnosek/${PN}.git"
+
+ KEYWORDS=""
+else
+ MY_REV="58ec209"
+ #SRC_URI="http://download.github.com/gnosek-${P}-4-g${MY_REV}.tar.gz"
+ SRC_URI="mirror://gentoo/${P}.tar.gz"
+ S="${WORKDIR}/gnosek-${PN}-${MY_REV}"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="dev-libs/fcgi"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
+
+src_prepare() {
+ sed -e "s/-Werror//" \
+ -i configure.ac || die "sed failed"
+
+ sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
+ -i Makefile.in || die "sed failed"
+
+ eautoreconf
+}
+
+pkg_postinst() {
+ einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
+}
diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
new file mode 100644
index 000000000000..464137ea4fc1
--- /dev/null
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+</maintainer>
+<longdescription lang="en">
+ fcgiwrap is a simple server for running CGI applications over FastCGI. It
+ hopes to provide clean CGI support to Nginx (and other web servers that may
+ need it).
+</longdescription>
+</pkgmetadata>
diff --git a/www-misc/gurlchecker/Manifest b/www-misc/gurlchecker/Manifest
new file mode 100644
index 000000000000..8a0a02ca211a
--- /dev/null
+++ b/www-misc/gurlchecker/Manifest
@@ -0,0 +1 @@
+DIST gurlchecker-0.13.1.tar.gz 709336 SHA256 a94283094a0ca7f6833cade0ef7a043fd97d0cfe55c0072d9bf508165ca45aeb SHA512 25f76f4b0b84467a5751156fbd8497f25e057202a36fe33b24c91e42906f67dd7dbd21531682b050c534862fa4e62ceb0908d19f44926ac335d628cc9919a746 WHIRLPOOL 9c0c29516240fb16d719ba4406a0a3f772dc11a38971a4b339fa1714afaf7ecc8129bb3a06590fc9d21dea61c6d5aa852e4e3ea5f11fe5aab336d7a957773c75
diff --git a/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch b/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch
new file mode 100644
index 000000000000..a3aa4a15c50c
--- /dev/null
+++ b/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch
@@ -0,0 +1,15 @@
+--- a/configure.in 2008-06-23 06:53:17.000000000 +0200
++++ b/configure.in 2008-06-23 20:08:59.000000000 +0200
+@@ -174,10 +174,10 @@
+ [tidyCreate],
+ [
+ AC_CHECK_HEADERS(
+- [tidy.h tidy/tidy.h],
++ [tidy.h],
+ [
+ want_tidy=yes
+- TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
++ TIDY_FLAGS="$TIDY_FLAGS -DENABLE_TIDY"
+ TIDY_LIBS="-ltidy"
+ #LDFLAGS="$LDFLAGS $want_tidy_path"
+ ],
diff --git a/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch b/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch
new file mode 100644
index 000000000000..904eab719f21
--- /dev/null
+++ b/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch
@@ -0,0 +1,40 @@
+# Autofoo of this package is just insane, need to rewrite it someday.
+# Don't touch LDFLAGS, there is no need to
+--- a/configure.in 2008-06-15 21:27:45.000000000 +0200
++++ b/configure.in 2008-06-15 21:34:45.000000000 +0200
+@@ -120,7 +120,7 @@
+ [
+ want_croco=yes
+ CROCO_FLAGS="-DENABLE_CROCO $CROCO_CFLAGS"
+- LDFLAGS="$LDFLAGS $want_croco_path"
++ #LDFLAGS="$LDFLAGS $want_croco_path"
+ ],
+ [
+ want_croco=no
+@@ -178,7 +179,7 @@
+ have_tidy=yes
+ TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
+ TIDY_LIBS="-ltidy"
+- LDFLAGS="$LDFLAGS $want_tidy_path"
++ #LDFLAGS="$LDFLAGS $want_tidy_path"
+ ],
+ [have_tidy=no]
+ )
+@@ -238,7 +240,7 @@
+ have_clamav=yes
+ CLAMAV_FLAGS="$CLAMAV_FLAGS -DENABLE_CLAMAV"
+ CLAMAV_LIBS="-lclamav"
+- LDFLAGS="$LDFLAGS $want_clamav_path"
++ #LDFLAGS="$LDFLAGS $want_clamav_path"
+ ],
+ [have_clamav=no]
+ )
+@@ -298,7 +300,7 @@
+ have_clamav=yes
+ GNUTLS_FLAGS="$GNUTLS_FLAGS -DENABLE_GNUTLS"
+ GNUTLS_LIBS="-lgnutls"
+- LDFLAGS="$LDFLAGS $want_gnutls_path"
++ #LDFLAGS="$LDFLAGS $want_gnutls_path"
+ ],
+ [
+ have_clamav=yes
diff --git a/www-misc/gurlchecker/gurlchecker-0.13.1-r1.ebuild b/www-misc/gurlchecker/gurlchecker-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..c1c3bb4c8837
--- /dev/null
+++ b/www-misc/gurlchecker/gurlchecker-0.13.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome tool that checks links on web pages/sites"
+HOMEPAGE="http://gurlchecker.labs.libre-entreprise.org/"
+SRC_URI="http://labs.libre-entreprise.org/frs/download.php/857/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+IUSE="clamav json sqlite ssl tidy"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.6:2
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/libglade-2:2.0
+ >=dev-libs/libxml2-2.6:2
+ >=net-libs/gnet-2
+ >=dev-libs/libcroco-0.6
+ clamav? ( app-antivirus/clamav )
+ json? ( >=dev-libs/json-glib-0.8 )
+ sqlite? ( >=dev-db/sqlite-3.6:3 )
+ ssl? ( >=net-libs/gnutls-1 )
+ tidy? ( app-text/htmltidy )
+"
+# docbook-sgml-utils used to build the man page
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.30
+ app-text/docbook-sgml-utils
+ >=dev-util/gtk-doc-am-1.1
+"
+
+src_prepare() {
+ # Stop manipulating LDFLAGS for no reason
+ epatch "${FILESDIR}/${PN}-0.13.1-ldflags.patch"
+
+ # Fix tidy.h include dir for Gentoo:
+ epatch "${FILESDIR}/${PN}-0.10.5-autoconf-tidy.patch"
+
+ # Fix .desktop validation
+ sed -e 's/Application;//' \
+ -i gurlchecker.desktop.in || die
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS CONTRIBUTORS ChangeLog FAQ NEWS README THANKS TODO"
+
+ gnome2_src_configure \
+ --with-croco \
+ $(use_with clamav) \
+ $(use_with json) \
+ $(use_with sqlite sqlite3) \
+ $(use_with ssl gnutls) \
+ $(use_with tidy)
+}
+
+src_install() {
+ gnome2_src_install
+
+ rm -r "${D}"/usr/share/doc/${PN} || die
+}
diff --git a/www-misc/gurlchecker/metadata.xml b/www-misc/gurlchecker/metadata.xml
new file mode 100644
index 000000000000..771f8367af9f
--- /dev/null
+++ b/www-misc/gurlchecker/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>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
+ <flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
+</use>
+<longdescription>
+ gURLChecker is a graphical web links checker for GNU/Linux and
+ other POSIX OS. It can work on a whole site, a single local page
+ or a browser bookmarks file.
+</longdescription>
+</pkgmetadata>
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
new file mode 100644
index 000000000000..fb72d6f63610
--- /dev/null
+++ b/www-misc/htdig/Manifest
@@ -0,0 +1 @@
+DIST htdig-3.2.0b6.tar.gz 3104936 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 WHIRLPOOL 63b0635873a24ad84c62fb85b6f9e645b3166630a4db52948604e6179f5f41978ef3c1b663122e8e5b74173c2e1cad269d4d92c5e678dcaf4dbac06d6b930cf3
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
new file mode 100644
index 000000000000..bf455ea8b637
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
@@ -0,0 +1,61 @@
+--- htdig-3.2.0b6/Makefile.config.orig 2006-11-19 08:49:57.000000000 -0800
++++ htdig-3.2.0b6/Makefile.config 2006-11-19 08:51:19.000000000 -0800
+@@ -22,10 +22,7 @@
+ $(LOCAL_DEFINES) $(PROFILING)
+
+ HTLIBS= $(top_builddir)/htnet/libhtnet.la \
+- $(top_builddir)/htcommon/libcommon.la \
+- $(top_builddir)/htword/libhtword.la \
+ $(top_builddir)/htlib/libht.la \
+ $(top_builddir)/htcommon/libcommon.la \
+ $(top_builddir)/htword/libhtword.la \
+- $(top_builddir)/db/libhtdb.la \
+- $(top_builddir)/htlib/libht.la
++ $(top_builddir)/db/libhtdb.la
+--- htdig-3.2.0b6/htlib/Makefile.am.orig 2006-11-19 09:13:47.000000000 -0800
++++ htdig-3.2.0b6/htlib/Makefile.am 2006-11-19 09:17:50.000000000 -0800
+@@ -1,7 +1,8 @@
+ include $(top_srcdir)/Makefile.config
+
+ pkglib_LTLIBRARIES = libht.la
+-
++libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
++libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
+ libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
+ DB2_db.cc IntObject.cc List.cc Object.cc \
+ ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \
+@@ -17,9 +18,6 @@
+ myqsort.c \
+ md5.cc mhash_md5.c
+
+-libht_la_LIBADD=@LTLIBOBJS@
+-# this includes regex.c
+-
+ libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}
+
+ pkginclude_HEADERS = \
+--- htdig-3.2.0b6/htword/Makefile.am.orig 2006-11-19 08:55:08.000000000 -0800
++++ htdig-3.2.0b6/htword/Makefile.am 2006-11-19 08:56:51.000000000 -0800
+@@ -10,7 +10,8 @@
+ LOCAL_DEFINES =
+
+ pkglib_LTLIBRARIES = libhtword.la
+-
++libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la
++libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la
+ libhtword_la_SOURCES = \
+ WordBitCompress.cc \
+ WordContext.cc \
+
+--- htdig-3.2.0b6/htcommon/Makefile.am.orig 2006-11-19 09:32:39.000000000 -0800
++++ htdig-3.2.0b6/htcommon/Makefile.am 2006-11-19 09:33:42.000000000 -0800
+@@ -12,7 +12,8 @@
+ EXTRA_DIST=conf_lexer.cxx conf_parser.cxx
+
+ pkglib_LTLIBRARIES = libcommon.la
+-
++libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la
++libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la
+ libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \
+ HtWordReference.cc HtWordList.cc defaults.cc \
+ HtURLCodec.cc URL.cc URLTrans.cc \
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
new file mode 100644
index 000000000000..58dec13957e2
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
@@ -0,0 +1,15 @@
+diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
+--- htdig-3.2.0b6.orig/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700
++++ htdig-3.2.0b6/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800
+@@ -36,9 +36,9 @@ public:
+ const char *docExcerpt);
+ ~Collection();
+
+- void Collection::Open();
++ void Open();
+
+- void Collection::Close();
++ void Close();
+
+ char *getWordFile() { return wordFile.get(); }
+ DocumentRef *getDocumentRef(int id);
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
new file mode 100644
index 000000000000..57b0e3b78731
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++ String s("invalid sort method");
+
+ displaySyntaxError(s);
+ return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++ String s("invalid sort method");
+
+ displaySyntaxError(s);
+ //return;
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
new file mode 100644
index 000000000000..7fb321645887
--- /dev/null
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+MY_PV=${PV/_beta/b}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="HTTP/HTML indexing and searching system"
+HOMEPAGE="http://www.htdig.org"
+SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+ app-arch/unzip
+ ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc4.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch "${FILESDIR}"/${P}-quoting.patch
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
+ eautoreconf
+}
+
+src_compile() {
+ use prefix || EPREFIX=
+
+ econf \
+ --with-config-dir="${EPREFIX}"/etc/${PN} \
+ --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
+ --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
+ --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
+ --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
+ --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
+ $(use_with ssl)
+
+# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
+
+ emake || die "emake failed"
+}
+
+src_install () {
+ use prefix || ED="${D}"
+
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ dodoc ChangeLog README
+ dohtml -r htdoc
+
+ sed -i "s:${D}::g" \
+ "${ED}"/etc/${PN}/${PN}.conf \
+ "${ED}"/usr/bin/rundig \
+ || die "sed failed (removing \${D} from installed files)"
+
+ # symlink htsearch so it can be easily found. see bug #62087
+ dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
+}
diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml
new file mode 100644
index 000000000000..95c06f0095bb
--- /dev/null
+++ b/www-misc/htdig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+</pkgmetadata>
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
new file mode 100644
index 000000000000..55d8f096bfcc
--- /dev/null
+++ b/www-misc/litmus/Manifest
@@ -0,0 +1 @@
+DIST litmus-0.13.tar.gz 467532 SHA256 09d615958121706444db67e09c40df5f753ccf1fa14846fdeb439298aa9ac3ff SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e WHIRLPOOL a9809b9e3a3faf0f51dc234a117812442bac84dddfe339f1746094237096164bbfcab8eb4739d7c4a325480124828217194374401a1396e1c7f1f1807883e9eb
diff --git a/www-misc/litmus/files/0.13-autotools-neon-version.patch b/www-misc/litmus/files/0.13-autotools-neon-version.patch
new file mode 100644
index 000000000000..c2e0211b6508
--- /dev/null
+++ b/www-misc/litmus/files/0.13-autotools-neon-version.patch
@@ -0,0 +1,11 @@
+--- configure.ac.ori 2014-01-31 01:00:58.796123088 +0100
++++ configure.ac 2014-01-31 01:00:43.767787763 +0100
+@@ -20,7 +20,7 @@
+ dnl List of tests
+ AC_SUBST([TESTS], ["basic copymove props locks http"])
+
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ NEON_WITHOUT_ZLIB
+ NEON_WITHOUT_ACL
+ NEON_TEST
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
new file mode 100644
index 000000000000..90963bd5e11a
--- /dev/null
+++ b/www-misc/litmus/litmus-0.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+# TODO: FAIL (connection refused by '...' port 80: Connection refused)
+# We can't run tests that connect with the internet.
+RESTRICT="test"
+
+DESCRIPTION="WebDAV server protocol compliance test suite"
+HOMEPAGE="http://www.webdav.org/neon/litmus"
+SRC_URI="http://www.webdav.org/neon/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads"
+REQUIRED_USE="?? ( gnutls ssl )
+ ^^ ( expat libxml2 )
+ threads? ( ^^ ( gnutls ssl ) )"
+
+NEON_DEP="net-libs/neon:0="
+DEPEND="${NEON_DEP}[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib]
+
+ expat? ( dev-libs/expat:0 )
+ gnutls? ( net-libs/gnutls:0 )
+ kerberos? ( app-crypt/mit-krb5:0 )
+ libproxy? ( net-libs/libproxy:0 )
+ libxml2? ( dev-libs/libxml2:2 )
+ pkcs11? ( dev-libs/pakchois:0 )
+ ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog FAQ NEWS README THANKS TODO )
+
+src_prepare() {
+ # Accept Neon 0.30.
+ epatch "${FILESDIR}/${PV}-autotools-neon-version.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ # No EGD available in the Portage tree.
+ econf \
+ --enable-warnings \
+ --without-egd \
+ --with-neon \
+ --without-included-neon \
+ $(use_enable debug) \
+ $(use_enable threads threadsafe-ssl posix) \
+ $(use_with gnutls ssl gnutls) \
+ $(use_with ssl ssl openssl) \
+ $(use_with expat) \
+ $(use_with libxml2) \
+ $(use_with kerberos gssapi) \
+ $(use_with pkcs11 pakchois) \
+ $(use_with libproxy)
+}
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
new file mode 100644
index 000000000000..f0b5e4cd5d70
--- /dev/null
+++ b/www-misc/litmus/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>beber@meleeweb.net</email>
+ <name>Bertrand Jacquin</name>
+ </maintainer>
+ <longdescription>WebDAV server protocol compliance test suite</longdescription>
+ <use>
+ <flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag>
+ <flag name="libxml2">Use dev-libs/libxml2 to parse XML</flag>
+ <flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag>
+ </use>
+</pkgmetadata>
diff --git a/www-misc/log-toolkit/Manifest b/www-misc/log-toolkit/Manifest
new file mode 100644
index 000000000000..0f2a973e828a
--- /dev/null
+++ b/www-misc/log-toolkit/Manifest
@@ -0,0 +1 @@
+DIST log-toolkit-0.9.6.tar.bz2 69062 SHA256 d742400c8efeaaafa2430708174974e8d3fded314ea1961ccf1a2566f6111728
diff --git a/www-misc/log-toolkit/log-toolkit-0.9.6.ebuild b/www-misc/log-toolkit/log-toolkit-0.9.6.ebuild
new file mode 100644
index 000000000000..b5eebe5d699a
--- /dev/null
+++ b/www-misc/log-toolkit/log-toolkit-0.9.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit depend.apache
+
+DESCRIPTION="set of tools to manipulate and maintain webserver logfiles"
+HOMEPAGE="http://sourceforge.net/projects/log-toolkit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+need_apache
+
+src_install() {
+ make DESTDIR="${D}" install || die "install failed"
+ dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/www-misc/log-toolkit/metadata.xml b/www-misc/log-toolkit/metadata.xml
new file mode 100644
index 000000000000..91d9973cf9fc
--- /dev/null
+++ b/www-misc/log-toolkit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">log-toolkit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest
new file mode 100644
index 000000000000..44228d35efba
--- /dev/null
+++ b/www-misc/mergelog/Manifest
@@ -0,0 +1 @@
+DIST mergelog-4.5.tar.gz 39407 SHA256 fd97c5b9ae88fbbf57d3be8d81c479e0df081ed9c4a0ada48b1ab8248a82676d SHA512 f2259cb8981871c1f9d7cadc5414997789aa13eed0e18701673ffbddedc74954e137e282c1357cafaf515e18b39e256f890ec31568a305feefa1089a9347991f WHIRLPOOL 2c4382a3787c47ae5375492850fdb7cefff225537d4331fed2f97bdec76df6f324afae4888c341923709e9ea2b89199df6376ab5d738de974892dddaa722be2a
diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch
new file mode 100644
index 000000000000..77573cc60f9e
--- /dev/null
+++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch
@@ -0,0 +1,32 @@
+Index: mergelog-4.5/configure.in
+===================================================================
+--- mergelog-4.5.orig/configure.in
++++ mergelog-4.5/configure.in
+@@ -10,6 +10,7 @@ AC_PROG_INSTALL()
+
+ dnl Checks for programs.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lz:
+Index: mergelog-4.5/src/Makefile.am
+===================================================================
+--- mergelog-4.5.orig/src/Makefile.am
++++ mergelog-4.5/src/Makefile.am
+@@ -1,7 +1,10 @@
+ bin_PROGRAMS=mergelog zmergelog
+
+-mergelog: mergelog.c
+- $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall mergelog.c -o $@
+-
+-zmergelog: mergelog.c
+- $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall -DUSE_ZLIB mergelog.c -o $@
++# This is a bit of a hack, but it preserves the original design of the
++# upstream Makefile.am in assuming that $VERSION will be defined in the
++# Makefile that is actually fed to make.
++AM_CPPFLAGS=-DVERSION=\"@VERSION@\"
++AM_CFLAGS=-Wall
++mergelog_SOURCES = mergelog.c
++zmergelog_SOURCES = mergelog.c
++zmergelog_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_ZLIB
diff --git a/www-misc/mergelog/files/mergelog-4.5-splitlog.patch b/www-misc/mergelog/files/mergelog-4.5-splitlog.patch
new file mode 100644
index 000000000000..ddc0348543be
--- /dev/null
+++ b/www-misc/mergelog/files/mergelog-4.5-splitlog.patch
@@ -0,0 +1,384 @@
+Index: mergelog-4.5/configure.in
+===================================================================
+--- mergelog-4.5.orig/configure.in
++++ mergelog-4.5/configure.in
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
+ AC_INIT(src/mergelog.c)
+
+ PACKAGE=mergelog
+-VERSION=4.5
++VERSION=4.5-split
+ AM_INIT_AUTOMAKE($PACKAGE,$VERSION,nosubst)
+
+ AC_ARG_PROGRAM
+Index: mergelog-4.5/man/mergelog.1
+===================================================================
+--- mergelog-4.5.orig/man/mergelog.1
++++ mergelog-4.5/man/mergelog.1
+@@ -1,8 +1,9 @@
+-.TH MERGELOG 1 "22 Jan 2001"
++.TH MERGELOG 1 "20 Jun 2001"
+ .SH NAME
+ mergelog \- a fast tool to merge http log files by date
+ .SH SYNOPSIS
+ .B mergelog
++.IR [-vh]\ [-o\ outfmt]
+ .IR logfile1
+ .IR logfile2 \ ...
+ .SH DESCRIPTION
+Index: mergelog-4.5/man/zmergelog.1
+===================================================================
+--- mergelog-4.5.orig/man/zmergelog.1
++++ mergelog-4.5/man/zmergelog.1
+@@ -1,8 +1,9 @@
+-.TH ZMERGELOG 1 "22 Jan 2001"
++.TH ZMERGELOG 1 "20 Jun 2001"
+ .SH NAME
+ zmergelog \- a fast tool to merge gzipped http log files by date
+ .SH SYNOPSIS
+ .B zmergelog
++.IR [-vh]\ [-o\ outfmt]
+ .IR logfile1
+ .IR logfile2 \ ...
+ .SH DESCRIPTION
+Index: mergelog-4.5/src/mergelog.c
+===================================================================
+--- mergelog-4.5.orig/src/mergelog.c
++++ mergelog-4.5/src/mergelog.c
+@@ -45,12 +45,16 @@
+ #define mygets(a,b,c,d) fast_gzgets(a,b,c,d)
+ #define myrewind gzrewind
+ #define myclose gzclose
++#define mywrite(f,b,l) gzwrite((f),(b),(l))
++#define MYSUFFIX ".gz"
+ #else
+ #define myFH FILE
+ #define myopen fopen
+ #define mygets(a,b,c,d) fgets(a,b,c)
+ #define myrewind rewind
+ #define myclose fclose
++#define mywrite(f,b,l) fwrite((b),1,(l),(f))
++#define MYSUFFIX
+ #endif
+
+
+@@ -112,20 +116,141 @@ int main (int argc, char *argv[]) {
+ char *trans_digits[60];
+ char *trans_year[200];
+ char months[24]="anebarprayunulugepctovec";
++ int goc;
++ int goUsage = 0, goVerbose = 0;
++ const char* goOutput = NULL;
++ const char* argv0 = *argv;
++ struct tm gotmFlags;
++ const char* goOutPtr;
++ myFH *outFile = NULL;
++ char outFileName[512];
++ struct tm outFileTM;
++ char outFileNewName[512];
++ size_t outBytes;
++
++ while((goc=getopt(argc,argv,"vho:"))!=-1) {
++ switch(goc) {
++ case 'h': /* -h print usage */
++ goUsage++;
++ break;
++ case 'v': /* -v verbose */
++ goVerbose++;
++ break;
++ case 'o': /* -o fmt output specification */
++ goOutput = optarg;
++ break;
++ default: /* whatever.. but we better print out usage */
++ goUsage++;
++ break;
++ }
++ }
++ argv = &argv[optind];
++ argc -= optind;
+
+- /*
+- print usage if necessary
+- */
+- if (argc == 1) {
+- fprintf(stderr,"usage: %s logfile1 logfile2 ...\nmergelog %s Copyright (C) 2000-2001 Bertrand Demiddelaer\n",argv[0],VERSION);
++ if(argc<1)
++ goUsage++;
++ if(goUsage) {
++ printf(
++ "mergelog " VERSION " Copyright (c) 2000-2001 Bertrand Demiddelaer\n\n"
++ "I have at least %d reason(s) for lending you a helping hand on using the program.\n\n"
++ "Usage: %s [-vh] [-o fmt] logfile1 logfile2 ..\n\n"
++ " -h Print this message\n"
++ " -v Increase verbosity\n"
++ " -o Give template for output file name to write log to\n"
++ " instead of standard output in strftime(3) form.\n"
++ " ( eg. -o %%Y-%%m-%%d-access.log" MYSUFFIX ")\n",
++ goUsage,argv0);
+ exit(1);
+ }
+
++ /* Analyze output format if given. It's better than trying to
++ * regenerate file name and compare it to the filename currently being
++ * written each time we want to dump one line. */
++ if(goOutput) {
++ memset(&gotmFlags,0,sizeof(gotmFlags));
++ for(goOutPtr=goOutput;*goOutPtr;goOutPtr++) {
++ if( (*goOutPtr=='%') && goOutPtr[1]) {
++ switch(*(++goOutPtr)) {
++ case 'a': /* abbreviated weekday */
++ case 'A': /* full weekday */
++ case 'u': /* day of week number */
++ case 'w': /* zerobased weekday number */
++ gotmFlags.tm_wday = 1;
++ break;
++ case 'b': /* abbreviated month */
++ case 'h': /* %b */
++ case 'B': /* full month */
++ case 'm': /* month number */
++ gotmFlags.tm_mon = 1;
++ break;
++ case 'C': /* century */
++ case 'y': /* centuryless year */
++ case 'Y': /* year with a century */
++ gotmFlags.tm_year = 1;
++ break;
++ case 'd': /* day of month */
++ case 'e': /* day of month space padded */
++ gotmFlags.tm_mday = 1;
++ break;
++ case 'D': /* %m/%d/%y americanism */
++ gotmFlags.tm_mon = gotmFlags.tm_mday = gotmFlags.tm_year = 1;
++ break;
++ case 'G': /* ISO 8601 year repsesentation. depends on week */
++ case 'g': /* ISO 8601 year repsesentation without century. depends on week */
++ case 'U': /* sunday-based week number */
++ case 'V': /* ISO 8601 week number */
++ case 'W': /* monday-based week number */
++ case 'x': /* preferred date representation for locale without the time */
++ gotmFlags.tm_yday = gotmFlags.tm_year = 1;
++ break;
++ case 'H': /* 24h format hour */
++ case 'I': /* 12h format hour */
++ case 'k': /* 24h format hour space padded */
++ case 'l': /* 12h format hour space padded */
++ case 'p': /* AM/PM indicator */
++ case 'P': /* am/pm indicator */
++ gotmFlags.tm_hour = 1;
++ break;
++ case 'j': /* day of year */
++ gotmFlags.tm_yday = 1;
++ break;
++ case 'M': /* minute */
++ gotmFlags.tm_min = 1;
++ break;
++ case 'n': /* newline character */
++ case 't': /* tab character */
++ case 'z': /* time zone as an offset from GMT */
++ case 'Z': /* timezone name or abbreviation */
++ case '%': /* % character */
++ break;
++ case 'r': /* %I:%M:%S %p time in am/pm notation*/
++ case 'T': /* %H:%M:%S time in 24h notation */
++ case 'X': /* preferred time representation for locale without the date */
++ gotmFlags.tm_hour = gotmFlags.tm_min = gotmFlags.tm_sec = 1;
++ break;
++ case 'R': /* %H:%M time in 24h notation without seconds */
++ gotmFlags.tm_hour = gotmFlags.tm_min = 1;
++ break;
++ case 'S': /* second */
++ gotmFlags.tm_sec = 1;
++ break;
++ case 'c': /* preferred date and time representation for locale */
++ case 'E': /* weird modifier */
++ case 'O': /* weird modifier */
++ case 's': /* number of seconds since epoch */
++ case '+': /* date and time in date(1) format */
++ memset(&gotmFlags,0xFF,sizeof(gotmFlags));
++ break;
++ }
++ }
++ }
++ }
++
+ #ifdef USE_ZLIB
+ /*
+ check if there are enough gunzip buffers
+ */
+- if(argc>MAX_FILES) {
++ if(argc>=MAX_FILES) {
+ fputs("too many gzipped log files, aborting\n",stderr);
+ exit(1);
+ }
+@@ -134,9 +259,9 @@ int main (int argc, char *argv[]) {
+ /*
+ open log files
+ */
+- for (i=1;i<argc;i++) {
+- log_file[i-1]=myopen(argv[i],"r");
+- if (log_file[i-1] == NULL) {
++ for (i=0;i<argc;i++) {
++ log_file[i]=myopen(argv[i],"r");
++ if (log_file[i] == NULL) {
+ fprintf(stderr,"can't open %s, aborting\n",argv[i]);
+ exit(1);
+ }
+@@ -174,8 +299,8 @@ int main (int argc, char *argv[]) {
+ /*
+ init things for each log file and get the older date to start with
+ */
+- nb_files=argc-1;
+- for (i=0;i<argc-1;i++) {
++ nb_files=argc;
++ for (i=0;i<argc;i++) {
+
+ #ifdef USE_ZLIB
+ /*
+@@ -230,7 +355,7 @@ int main (int argc, char *argv[]) {
+ */
+ log_date=memchr(log_scan[i],'[',SCAN_SIZE);
+ if (log_date == NULL) {
+- fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i],log_buffer[i]);
+ exit(1);
+ }
+
+@@ -239,7 +364,7 @@ int main (int argc, char *argv[]) {
+ */
+ for (j=0;((j == 12)&&(memcmp(months+2*j,log_date+5,2) != 0));j++);
+ if (j == 12) {
+- fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i],log_buffer[i]);
+ exit(1);
+ }
+ memcpy(log_month[i],trans_digits[j],2);
+@@ -255,7 +380,7 @@ int main (int argc, char *argv[]) {
+ extract the date of this first line
+ */
+ if (sscanf(log_date+1,"%d/%3c/%d:%d:%d:%d",&day,month,&year,&hour,&minut,&second) < 6) {
+- fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i],log_buffer[i]);
+ exit(1);
+ }
+
+@@ -270,7 +395,7 @@ int main (int argc, char *argv[]) {
+ date->tm_isdst=-1;
+ for (j=0;((j<12)&&(memcmp(months+2*j,month+1,2) != 0));j++);
+ if (j == 12) {
+- fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"abort due to a problem with %s:\n%s\n",argv[i],log_buffer[i]);
+ exit(1);
+ }
+ date->tm_mon=j;
+@@ -303,6 +428,8 @@ int main (int argc, char *argv[]) {
+ exit if we have only empty files
+ */
+ if (nb_files == 0) {
++ if(outFile)
++ myclose(outFile);
+ exit(0);
+ }
+
+@@ -323,7 +450,7 @@ int main (int argc, char *argv[]) {
+ /*
+ start to compute since this date
+ */
+- nb_files_orig=argc-1;
++ nb_files_orig=argc;
+ for(;;) {
+
+ /*
+@@ -377,7 +504,55 @@ int main (int argc, char *argv[]) {
+ write the log line
+ faster than a puts and we are sure to find a '\0' in log_buffer[i]
+ */
+- write(1,log_buffer[i],(size_t)((char *)memchr(log_buffer[i],0,BUFFER_SIZE)-log_buffer[i]));
++ if(goOutput) {
++ /* Check whether any of the date/time components concerned
++ * have changes or if we have no output file opened. It
++ * doesn't make much sense to do all the comparinsons in case
++ * we have no output file opened, but it makes even less sense
++ * to check for file handle each time we evaluate date. */
++ if(
++# define TMCOMPARE(tmpart) ( gotmFlags.tm_##tmpart && (outFileTM.tm_##tmpart!=date->tm_##tmpart) )
++ TMCOMPARE(sec) || TMCOMPARE(min) || TMCOMPARE(hour)
++ || TMCOMPARE(mday) || TMCOMPARE(mon) || TMCOMPARE(year)
++ || TMCOMPARE(wday) || TMCOMPARE(yday)
++ || !outFile
++# undef TMCOMPARE
++ ) {
++ if(!strftime(outFileNewName,sizeof(outFileNewName)-1,goOutput,date)) {
++ fprintf(stderr,"abort due to a failed attempt to generate output file name\n");
++ if(outFile)
++ myclose(outFile);
++ exit(1);
++ }
++ if( (!outFile) || strcmp(outFileName,outFileNewName) ) {
++ /* okay, we're about to change output file or start
++ * writing first file */
++ if(outFile) {
++ myclose(outFile);
++ }
++ if(goVerbose)
++ fprintf(stderr, "Writing to \"%s\"..\n",outFileNewName);
++ outFile = myopen(outFileNewName,"a");
++ if(!outFile) {
++ fprintf(stderr, "abort due to a failed attempt to open/create output file %s: %m\n",outFileNewName);
++ exit(1);
++ }
++ memmove(outFileName,outFileNewName,sizeof(outFileName));
++ memmove(&outFileTM,date,sizeof(outFileTM));
++ }
++ }
++ /* %Y-%m-%d_%H-%M-%S-access.log */
++ outBytes = (size_t)((char *)memchr(log_buffer[i],0,BUFFER_SIZE)-log_buffer[i]);
++ if( mywrite(outFile,log_buffer[i],outBytes) != outBytes) {
++ fprintf(stderr,"abort due to a failed write operation on output file %s: %m\n",outFileName);
++ if(outFile)
++ myclose(outFile);
++ exit(1);
++ }
++ }else{
++ /* do it the way we would do without */
++ write(1,log_buffer[i],(size_t)((char *)memchr(log_buffer[i],0,BUFFER_SIZE)-log_buffer[i]));
++ }
+
+ /*
+ is it an end of file ?
+@@ -388,7 +563,9 @@ int main (int argc, char *argv[]) {
+ close all log files and exit if all end of files are reached
+ */
+ if (--nb_files == 0) {
+- for (j=0;j<argc-1;j++) {
++ if(outFile)
++ myclose(outFile);
++ for (j=0;j<argc;j++) {
+ myclose(log_file[j]);
+ }
+ exit(0);
+@@ -425,7 +602,7 @@ int main (int argc, char *argv[]) {
+ } else {
+ for (j=0;((j<12)&&(memcmp(months+2*j,log_date+5,2) != 0));j++);
+ if (j == 12) {
+- fprintf(stderr,"problem with %s:\n%s\ncontinuing...\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"problem with %s:\n%s\ncontinuing...\n",argv[i],log_buffer[i]);
+ } else {
+ memcpy(log_month[i],trans_digits[j],2);
+ memcpy(log_month[i]+2,months+2*j,2);
+@@ -439,7 +616,7 @@ int main (int argc, char *argv[]) {
+ }
+ }
+ } else {
+- fprintf(stderr,"problem with %s:\n%s\ncontinuing...\n",argv[i+1],log_buffer[i]);
++ fprintf(stderr,"problem with %s:\n%s\ncontinuing...\n",argv[i],log_buffer[i]);
+ }
+ }
+ }
+@@ -451,3 +628,7 @@ int main (int argc, char *argv[]) {
+ */
+ exit(1);
+ }
++/* vim:set textwidth=72: */
++/* vim:set cindent smartindent: */
++/* vim:set formatoptions-=t formatoptions+=croql: */
++/* vim:set expandtab shiftwidth=2: */
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
new file mode 100644
index 000000000000..fb51b5b73ba0
--- /dev/null
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils
+
+DESCRIPTION="A utility to merge apache logs in chronological order"
+SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
+HOMEPAGE="http://mergelog.sourceforge.net"
+
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README)
+PATCHES=(
+ "${FILESDIR}"/${P}-splitlog.patch
+ "${FILESDIR}"/${P}-asneeded.patch
+)
diff --git a/www-misc/mergelog/metadata.xml b/www-misc/mergelog/metadata.xml
new file mode 100644
index 000000000000..1958abb71792
--- /dev/null
+++ b/www-misc/mergelog/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">mergelog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/metadata.xml b/www-misc/metadata.xml
new file mode 100644
index 000000000000..811b23e1852c
--- /dev/null
+++ b/www-misc/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The www-misc category contains various miscellaneous world wide web
+ software.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie www-misc enthält verschiedene Programme für das World
+ Wide Web (z.B. htdig, squidanalyser)
+ </longdescription>
+ <longdescription lang="es">
+ La categoría www-misc contiene software misceláneo relacionado con la
+ world wide web (WWW).
+ </longdescription>
+ <longdescription lang="ja">
+ www-miscカテゴリーには多種多様なワールド・ワイド・ウェブの
+ ソフトウェアが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De www-misc categorie bevat verschillende programma's voor het WWW zoals
+ htdig en squidanalyser.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm www-misc chứa các phần mềm www khác nhau.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria www-misc contiene software per il world wide web (WWW).
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria www-misc contém vários programas de world wide web
+ (WWW) mistos.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria www-misc zawiera dodatkowe oprogramowanie związane z WWW.
+ </longdescription>
+</catmetadata>
+
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
new file mode 100644
index 000000000000..68479e414bd0
--- /dev/null
+++ b/www-misc/monitorix/Manifest
@@ -0,0 +1 @@
+DIST monitorix-3.5.1.tar.gz 218548 SHA256 8cbd749153f48e17a253791c2079912e50b499026de0083e5f25b87a782f3004 SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c WHIRLPOOL 2b894222f4defd5396c9c82554caeaccdcb64dd387dd78a0f2beabf896c6fedbf4571b2f2822786b2dc4165946588f72b5d4e1f6f5d2f4acde17beddd57ceab7
diff --git a/www-misc/monitorix/files/monitorix-3.5.1.init b/www-misc/monitorix/files/monitorix-3.5.1.init
new file mode 100644
index 000000000000..1c21d21818cb
--- /dev/null
+++ b/www-misc/monitorix/files/monitorix-3.5.1.init
@@ -0,0 +1,24 @@
+#! /sbin/runscript
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting monitorix"
+ start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix/monitorix.conf -p /var/run/monitorix.pid
+ local i=0
+ local timeout=5
+ while [ ! -f /var/run/monitorix.pid ] && [ $i -le $timeout ]; do
+ sleep 1
+ i=$(($i + 1))
+ done
+ [ $timeout -gt $i ]
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping monitorix"
+ start-stop-daemon --stop --signal QUIT --stop --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid
+ eend $?
+}
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
new file mode 100644
index 000000000000..2f125e497b2e
--- /dev/null
+++ b/www-misc/monitorix/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ A lightweight system monitoring tool.
+ </longdescription>
+ <use>
+ <flag name='apcupsd'>Make use of a daemon that controls APC UPSes with <pkg>sys-power/apcupsd</pkg>.</flag>
+ <flag name='hddtemp'>Use SMART to monitor the temperature of hard drives with <pkg>app-admin/hddtemp</pkg>.</flag>
+ <flag name='httpd'>Enables the CGI webserver with any package that satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
+ <flag name='lm_sensors'>Additional hardware mnitoring sensors with <pkg>sys-apps/lm_sensors</pkg>.</flag>
+ <flag name='postfix'>Analyze postfix logs with <pkg>net-mail/pflogsumm</pkg>.</flag>
+ </use>
+</pkgmetadata>
diff --git a/www-misc/monitorix/monitorix-3.5.1.ebuild b/www-misc/monitorix/monitorix-3.5.1.ebuild
new file mode 100644
index 000000000000..b638a226b887
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils systemd user
+
+DESCRIPTION="A lightweight system monitoring tool"
+HOMEPAGE="http://www.${PN}.org/"
+SRC_URI="http://www.${PN}.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apcupsd hddtemp httpd lm_sensors postfix"
+
+DEPEND="sys-apps/sed"
+RDEPEND="dev-perl/Config-General
+ dev-perl/DBI
+ dev-perl/HTTP-Server-Simple
+ dev-perl/IO-Socket-SSL
+ dev-perl/libwww-perl
+ dev-perl/MIME-Lite
+ dev-perl/XML-Simple
+ net-analyzer/rrdtool[perl]
+ dev-perl/CGI
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ httpd? ( virtual/httpd-cgi )
+ lm_sensors? ( sys-apps/lm_sensors )
+ postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+ # Put better Gentoo defaults in the configuration file.
+ sed -i "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" ${PN}.conf
+ sed -i "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" ${PN}.conf
+ sed -i "s|nobody|${PN}|g" ${PN}.conf
+}
+
+src_install() {
+ dosbin ${PN}
+
+ newinitd "${FILESDIR}"/${P}.init ${PN}
+
+ insinto /etc/monitorix
+ doins ${PN}.conf
+
+ dodir /etc/${PN}/conf.d
+
+ insinto /etc/logrotate.d
+ newins docs/${PN}.logrotate ${PN}
+
+ dodoc Changes README{,.nginx} docs/${PN}.service docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
+ doman man/man5/${PN}.conf.5
+ doman man/man8/${PN}.8
+
+ insinto /var/lib/${PN}/www
+ doins logo_bot.png logo_top.png ${PN}ico.png
+
+ dodir /var/lib/${PN}/imgs
+ dosym /var/lib/${PN}/imgs /var/lib/${PN}/www/imgs
+
+ exeinto /var/lib/${PN}/www/cgi
+ doexe ${PN}.cgi
+
+ dodir /usr/lib/${PN}
+ exeinto /usr/lib/${PN}
+ doexe lib/*.pm
+
+ dodir /var/lib/${PN}/usage
+ insinto /var/lib/${PN}/reports
+ doins -r reports/*
+
+ systemd_dounit docs/${PN}.service
+}
+
+pkg_postinst() {
+ chown monitorix:monitorix /var/lib/${PN}/imgs
+
+ elog "WARNING: ${PN} has changed its config format twice, in versions"
+ elog "3.0.0 and 3.4.0; this format may be incompatible with your existing"
+ elog "config file. Please take care if upgrading from an old version."
+ elog ""
+
+ elog "${PN} includes its own web server as of version 3.0.0."
+ elog "For this reason, the dependency on the webapp framework"
+ elog "has been removed. If you wish to use your own web server,"
+ elog "the ${PN} web data can be found at:"
+ elog "/var/lib/${PN}/www/"
+}
diff --git a/www-misc/multisort/Manifest b/www-misc/multisort/Manifest
new file mode 100644
index 000000000000..7519472dee53
--- /dev/null
+++ b/www-misc/multisort/Manifest
@@ -0,0 +1 @@
+DIST multisort-1.1.tar.gz 3520 SHA256 50cc0e84738f1c9b4b587e4d13564c233be20c693fd2154f2e8a293f3d5bc17d SHA512 346be785a223814086536bfc8aacb11122ca91cf6cb63c8bbe2ae70f323bd36812f25575114c1422c431f658328bbb7fc75b839e74b7f37c12c4a3f179e05e1b WHIRLPOOL 81be8d7acf6f3810e8e4c07ce2b7d889952d35b5a049a9ced0cfbb998269520277741ca1cb1aea3c7d08ce6d6f21945a6a92aceca5a0ac7e6934a06fe9e0bae9
diff --git a/www-misc/multisort/metadata.xml b/www-misc/multisort/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/www-misc/multisort/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/www-misc/multisort/multisort-1.1-r1.ebuild b/www-misc/multisort/multisort-1.1-r1.ebuild
new file mode 100644
index 000000000000..589d64898d66
--- /dev/null
+++ b/www-misc/multisort/multisort-1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="multisort takes any number of httpd logfiles in the Common Log Format and merges them together"
+HOMEPAGE="http://www.xach.com/multisort/"
+SRC_URI="http://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_prepare() {
+ # respect LDFLAGS wrt bug #337359
+ sed -i -e 's/$(CFLAGS)/& \$(LDFLAGS)/' Makefile || die 'sed on Makefile failed'
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dosbin multisort
+}
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest
new file mode 100644
index 000000000000..0e0cbf60dd9f
--- /dev/null
+++ b/www-misc/nx_util/Manifest
@@ -0,0 +1,2 @@
+DIST ngx_http_naxsi-0.52-1.tar.gz 162044 SHA256 0f23b0f17f03591775e95294a115d609ad47e2874e5f01c4fed1ebb680ea07bc SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 WHIRLPOOL b42c4dc99c2a0b670b4e06ee9b5a0eb1b38b96f670c04c56fa30f13b8d3263836b54ff641dc1effd0e461f0fb3e0b935f945c2467b27c83f80b8407a3b42f739
+DIST ngx_http_naxsi-0.53-1.tar.gz 165627 SHA256 cde175f940cd2e8c595b95512642cd3f8ae6f3c4a2ee10c2fda214ffeb808274 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385 WHIRLPOOL 67c5cb73cc04381bf874222f9aa20d8ec063f074d139b8fa882bc9a84526f5d192f066b621a429086f93b1a55ea235e98623dfcb69952451dd870bcf316bd928
diff --git a/www-misc/nx_util/files/0.3-fix-install-paths.patch b/www-misc/nx_util/files/0.3-fix-install-paths.patch
new file mode 100644
index 000000000000..919c94ac4ed4
--- /dev/null
+++ b/www-misc/nx_util/files/0.3-fix-install-paths.patch
@@ -0,0 +1,47 @@
+diff --git a/nx_util.conf b/nx_util.conf
+index cd2a591..818daaf 100644
+--- a/nx_util.conf
++++ b/nx_util.conf
+@@ -1,4 +1,4 @@
+ [nx_util]
+-data_dir=/usr/local/nx_datas
++data_dir=/usr/share/nx_datas
+ database_dir=
+ naxsi_core_rules=/etc/nginx/naxsi_core.rules
+diff --git a/nx_util.py b/nx_util.py
+index 81c5030..eb7e888 100755
+--- a/nx_util.py
++++ b/nx_util.py
+@@ -61,8 +61,8 @@ nginx/naxsi log parser, whitelist and report generator.
+
+ # Configuration
+ parser.add_option("-c", "--config", dest="conf_path",
+- help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)",
+- type="string", default="/usr/local/etc/nx_util.conf")
++ help="Path to configuration (defaults to /etc/nx_util.conf)",
++ type="string", default="/etc/nx_util.conf")
+
+ # Filtering options should go here :)
+ parser.add_option("-f", "--filters", dest="usr_filter",
+diff --git a/setup.py b/setup.py
+index c08f4e6..7b15fd8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -8,14 +8,14 @@ setup(name='nx_util',
+ author='Naxsi Dev Team',
+ author_email='thibault.koechlin@nbs-system.com',
+ url='naxsi.googlecode.com',
+- scripts=['nx_util.py'],
++ scripts=['nx_util'],
+ packages=['nx_lib'],
+- data_files=[('nx_datas', ['nx_datas/bootstrap.min.css',
++ data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css',
+ 'nx_datas/bootstrap-responsive.min.css',
+ 'nx_datas/highcharts.js',
+ 'nx_datas/map.tpl',
+ 'nx_datas/bootstrap.min.js',
+ 'nx_datas/country2coords.txt']),
+ ('/usr/share/man/man1', ['nx_util.1.gz']),
+- ('/usr/local/etc/', ['nx_util.conf'])]
++ ('/etc/', ['nx_util.conf'])]
+ )
diff --git a/www-misc/nx_util/files/0.52.1-fix-install-paths.patch b/www-misc/nx_util/files/0.52.1-fix-install-paths.patch
new file mode 100644
index 000000000000..1a2752e3b20b
--- /dev/null
+++ b/www-misc/nx_util/files/0.52.1-fix-install-paths.patch
@@ -0,0 +1,49 @@
+diff --git a/nx_util/nx_util.conf b/nx_util/nx_util.conf
+index cd2a591..818daaf 100644
+--- a/nx_util/nx_util.conf
++++ b/nx_util/nx_util.conf
+@@ -1,4 +1,4 @@
+ [nx_util]
+-data_dir=/usr/local/nx_datas
++data_dir=/usr/share/nx_datas
+ database_dir=
+ naxsi_core_rules=/etc/nginx/naxsi_core.rules
+diff --git a/nx_util/nx_util.py b/nx_util/nx_util.py
+old mode 100644
+new mode 100755
+index 0509b51..38be37e
+--- a/nx_util/nx_util.py
++++ b/nx_util/nx_util.py
+@@ -62,8 +62,8 @@ if __name__ == "__main__":
+
+ # Configuration
+ parser.add_option("-c", "--config", dest="conf_path",
+- help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)",
+- type="string", default="/usr/local/etc/nx_util.conf")
++ help="Path to configuration (defaults to /etc/nx_util.conf)",
++ type="string", default="/etc/nx_util.conf")
+
+ # Filtering options should go here :)
+ parser.add_option("-f", "--filters", dest="usr_filter",
+diff --git a/nx_util/setup.py b/nx_util/setup.py
+index cc48a5c..b855459 100644
+--- a/nx_util/setup.py
++++ b/nx_util/setup.py
+@@ -8,14 +8,14 @@ setup(name='nx_util',
+ author='Naxsi Dev Team',
+ author_email='thibault.koechlin@nbs-system.com',
+ url='naxsi.googlecode.com',
+- scripts=['nx_util.py'],
++ scripts=['nx_util'],
+ packages=['nx_lib'],
+- data_files=[('nx_datas', ['nx_datas/bootstrap.min.css',
++ data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css',
+ 'nx_datas/bootstrap-responsive.min.css',
+ 'nx_datas/highcharts.js',
+ 'nx_datas/map.tpl',
+ 'nx_datas/bootstrap.min.js',
+ 'nx_datas/country2coords.txt']),
+ ('/usr/share/man/man1', ['nx_util.1.gz']),
+- ('/usr/local/etc/', ['nx_util.conf'])]
++ ('/etc/', ['nx_util.conf'])]
+ )
diff --git a/www-misc/nx_util/metadata.xml b/www-misc/nx_util/metadata.xml
new file mode 100644
index 000000000000..8235a31b325b
--- /dev/null
+++ b/www-misc/nx_util/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>
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">naxsi</remote-id>
+ <remote-id type="github">nbs-system/naxsi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/nx_util/nx_util-0.52.1.ebuild b/www-misc/nx_util/nx_util-0.52.1.ebuild
new file mode 100644
index 000000000000..158d75287f21
--- /dev/null
+++ b/www-misc/nx_util/nx_util-0.52.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 versionator
+
+MY_PV="$(replace_version_separator 2 '-')"
+
+DESCRIPTION="Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)"
+HOMEPAGE="https://github.com/nbs-system/naxsi"
+# keep the name in sync with what's in the nginx ebuild to avoid duplication
+SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]"
+
+PATCHES=( "${FILESDIR}/${PV}-fix-install-paths.patch" )
+
+S="${WORKDIR}/naxsi-${MY_PV}/nx_util"
+
+src_prepare() {
+ distutils-r1_src_prepare
+ mv nx_util{.py,} || die "renaming script failed"
+}
diff --git a/www-misc/nx_util/nx_util-0.53.1.ebuild b/www-misc/nx_util/nx_util-0.53.1.ebuild
new file mode 100644
index 000000000000..3f6c610f4c9a
--- /dev/null
+++ b/www-misc/nx_util/nx_util-0.53.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 versionator
+
+MY_PV="$(replace_version_separator 2 '-')"
+
+DESCRIPTION="Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)"
+HOMEPAGE="https://github.com/nbs-system/naxsi"
+# keep the name in sync with what's in the nginx ebuild to avoid duplication
+SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="www-servers/nginx[nginx_modules_http_naxsi]"
+
+PATCHES=( "${FILESDIR}/0.52.1-fix-install-paths.patch" )
+
+S="${WORKDIR}/naxsi-${MY_PV}/nx_util"
+
+src_prepare() {
+ distutils-r1_src_prepare
+ mv nx_util{.py,} || die "renaming script failed"
+}
diff --git a/www-misc/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
new file mode 100644
index 000000000000..7aa277ca65a9
--- /dev/null
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -0,0 +1 @@
+DIST profile-sync-daemon-5.45.1.tar.gz 25543 SHA256 da4e215f053ca3f2b4cfae3f83e8a8e8370ef328aa343eea1011719a3ca9ede8 SHA512 8a61ebfe52031bd59c70416adfd477edc313641cec93a4e96c80f316517cdb53f49840cfd7711ea2f6180ecce8e8e5d45f01d7bd85ba787c3fe288a14426b944 WHIRLPOOL 07a377c71557c4e285893a2b03513cedf99b5f2c4c7805de1c297393716873d32be2d003090c59fa2a260da64cf48611d910515ffcb907cfe9637614ddfc90bd
diff --git a/www-misc/profile-sync-daemon/metadata.xml b/www-misc/profile-sync-daemon/metadata.xml
new file mode 100644
index 000000000000..5182ce937a17
--- /dev/null
+++ b/www-misc/profile-sync-daemon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">graysky2/profile-sync-daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1.ebuild
new file mode 100644
index 000000000000..295f34a18211
--- /dev/null
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-5.45.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils vcs-snapshot
+
+DESCRIPTION="Symlinks and syncs browser profile dirs to RAM"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Profile-sync-daemon"
+SRC_URI="https://github.com/graysky2/profile-sync-daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="systemd"
+
+RDEPEND="
+ app-shells/bash
+ net-misc/rsync
+ systemd? ( sys-apps/systemd )"
+
+src_install() {
+ emake -j1 DESTDIR="${ED}" \
+ install-openrc-all \
+ $(usex systemd "install-systemd" "")
+
+ fperms -x /etc/cron.hourly/psd-update
+}
+
+pkg_postinst() {
+ elog "The cronjob is -x by default."
+ elog "You might want to set it +x if you don't use"
+ elog "the systemd provided \"psd-resync.timer\"."
+}
diff --git a/www-misc/reflector/Manifest b/www-misc/reflector/Manifest
new file mode 100644
index 000000000000..06458d8b564c
--- /dev/null
+++ b/www-misc/reflector/Manifest
@@ -0,0 +1 @@
+DIST reflector-2011.05.13.1.tar.gz 11490 SHA256 e02a1d8297a0dbc201f9268e2b36a9027b4103ecadf95f675b27e29b2ed5199f
diff --git a/www-misc/reflector/metadata.xml b/www-misc/reflector/metadata.xml
new file mode 100644
index 000000000000..548448307c18
--- /dev/null
+++ b/www-misc/reflector/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>
+ <email>binki@gentoo.org</email>
+ <name>Nathan Phillip Brink</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-misc/reflector/reflector-2011.05.13.1.ebuild b/www-misc/reflector/reflector-2011.05.13.1.ebuild
new file mode 100644
index 000000000000..cb57585798fd
--- /dev/null
+++ b/www-misc/reflector/reflector-2011.05.13.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
+PYTHON_DEPEND="*:2.6"
+RESTRICT_PYTHON_ABIS="2.[45]"
+SUPPORT_PYTHON_ABIS=1
+
+inherit eutils distutils
+
+DESCRIPTION="archlinux's take on mirrorselect"
+HOMEPAGE="http://xyne.archlinux.ca/projects/reflector/"
+SRC_URI="http://xyne.archlinux.ca/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PYTHON_MODNAME="Reflector.py"
+
+src_prepare() {
+ distutils_src_prepare
+
+ my_src_prepare() {
+ [[ $(python_get_version --major) == 2 ]] && epatch 3to2.patch
+ :
+ }
+
+ python_execute_function -s my_src_prepare
+
+ python_convert_shebangs "" ${PN}
+}
+
+src_install() {
+ distutils_src_install
+
+ dobin ${PN} || die
+}
diff --git a/www-misc/surl/Manifest b/www-misc/surl/Manifest
new file mode 100644
index 000000000000..67dc97c21ebc
--- /dev/null
+++ b/www-misc/surl/Manifest
@@ -0,0 +1 @@
+DIST surl-0.7.1.1.tar.gz 23873 SHA256 17fab62195630ba6289fa1d2e07b8854ed71b176108a2a015fa2ef713a2810da SHA512 45895431d1b6a2854bf19e183f635689388c77b61823933f7d9ee6d87ff40510259018baa969a0253b2c96580aed04ef35a037608313cbf5a6bf558f10269257 WHIRLPOOL 3f79fd3d0034ff9ed11a188af6e121b8188dcef0865aae75901459d4fedf181078dbbbb9c926ec8c027b7513c692c22ea1b6fa44255130d82f67f2ab62e82c37
diff --git a/www-misc/surl/metadata.xml b/www-misc/surl/metadata.xml
new file mode 100644
index 000000000000..d2438aa74789
--- /dev/null
+++ b/www-misc/surl/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>
+ <email>wired@gentoo.org</email>
+ <name>Alex Alexander</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">surl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/surl/surl-0.7.1.1.ebuild b/www-misc/surl/surl-0.7.1.1.ebuild
new file mode 100644
index 000000000000..b75bdaa7f267
--- /dev/null
+++ b/www-misc/surl/surl-0.7.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="URL shortening command line application that supports various sites"
+HOMEPAGE="http://launchpad.net/surl"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV%.*}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+ distutils-r1_src_install
+
+ dodoc AUTHORS || die "doc install failed"
+}
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
new file mode 100644
index 000000000000..1c2b6843a71f
--- /dev/null
+++ b/www-misc/urlwatch/Manifest
@@ -0,0 +1,3 @@
+DIST urlwatch-1.16.tar.gz 14416 SHA256 2e382100d6c72e739fcf66712e775854bfb53a06c2f27ebe01d5719540aac179 SHA512 d9b918fb90c457d8167543107abf59feca2857bfcde8192f6740b29988fe2f27f330a49f2656f0b769c70ce3642a097d6cb7f98f56b1d167d691c15465770b9d WHIRLPOOL d58e72982267a78958e7321034fe4217f0ac92c7900e0c90cffe2686472264da7d2e069706a668ac23df470749a2431f79ec1ad63d3b35b53035371fd520dc19
+DIST urlwatch-1.17.tar.gz 14647 SHA256 006f04c124cf3dace3d071921e5ed452f6fbd463495bc8aa7879b915407c88f6 SHA512 67026913083fcc99e99cfb33a31873ac48a2ee69db34b8c13fcccc3bdd051787954cfbf3d3ef73a331c03540e254f53ba6d2661967f89de204798aaf35033cd0 WHIRLPOOL 0cade08f009e4c71c6bd8e554f9d6e34d44fa4ff18a3b91c78317599f8e3df62d9dbe3cedd75d8f85478ba8b893c4d36b69965c074312d0ea04fce8c8ca132f3
+DIST urlwatch-1.18.tar.gz 14987 SHA256 6b17411b6658f3aeb5839d1b32458f020ce40ee1e62a3d40387a2622fa731824 SHA512 ffbfb41e5b6ca71abf19132424dc1bfb3d0cfc30a644615c34539bb5b00acea5803d4c30637c58e9682820c5411227f7c579344c1e212f575431a1c650a7e520 WHIRLPOOL 49915ef83cc835b8ac67216eaeb61391195f28fa28b5716c7e1cc8c8dac465d9f3670beb408c80dc3fa5315683467524b02b1663fb671f26338059acfa247b23
diff --git a/www-misc/urlwatch/metadata.xml b/www-misc/urlwatch/metadata.xml
new file mode 100644
index 000000000000..0710a69773a9
--- /dev/null
+++ b/www-misc/urlwatch/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>
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <maintainer>
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">urlwatch</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/urlwatch/urlwatch-1.16.ebuild b/www-misc/urlwatch/urlwatch-1.16.ebuild
new file mode 100644
index 000000000000..8eeaecb8e5e1
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-1.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="http://thp.io/2008/urlwatch/ http://pypi.python.org/pypi/urlwatch"
+SRC_URI="http://thp.io/2008/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ || ( www-client/lynx app-text/html2text )"
+
+python_prepare() {
+ if [[ ${EPYTHON} == python3.* ]]; then
+ 2to3 -nw --no-diffs urlwatch lib/urlwatch/*.py \
+ share/urlwatch/examples/hooks.py.example setup.py || die
+ fi
+}
diff --git a/www-misc/urlwatch/urlwatch-1.17.ebuild b/www-misc/urlwatch/urlwatch-1.17.ebuild
new file mode 100644
index 000000000000..96f5b76b45fa
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-1.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="http://thp.io/2008/urlwatch/ http://pypi.python.org/pypi/urlwatch"
+SRC_URI="http://thp.io/2008/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ || ( www-client/lynx app-text/html2text )"
+
+python_prepare() {
+ if [[ ${EPYTHON} == python3.* ]]; then
+ 2to3 -nw --no-diffs urlwatch lib/urlwatch/*.py \
+ share/urlwatch/examples/hooks.py.example setup.py || die
+ fi
+}
diff --git a/www-misc/urlwatch/urlwatch-1.18.ebuild b/www-misc/urlwatch/urlwatch-1.18.ebuild
new file mode 100644
index 000000000000..8eeaecb8e5e1
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-1.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="http://thp.io/2008/urlwatch/ http://pypi.python.org/pypi/urlwatch"
+SRC_URI="http://thp.io/2008/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ || ( www-client/lynx app-text/html2text )"
+
+python_prepare() {
+ if [[ ${EPYTHON} == python3.* ]]; then
+ 2to3 -nw --no-diffs urlwatch lib/urlwatch/*.py \
+ share/urlwatch/examples/hooks.py.example setup.py || die
+ fi
+}
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
new file mode 100644
index 000000000000..e92b371d60a5
--- /dev/null
+++ b/www-misc/vdradmin-am/Manifest
@@ -0,0 +1,2 @@
+DIST vdradmin-am-3.6.10.tar.bz2 606665 SHA256 a206b85f26860d0adc65bea93756445bf418db1d19e51c83b1caa3355cd496a6 SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597 WHIRLPOOL 91286787f4693a6f5045d50661668254c66afe155866f5c8d3dfa9c2744c36b6109098914bb8f136b2b96af05465d6872310d6b8a7e6f431d2315646dbaaa495
+DIST vdradmin-am-3.6.9.tar.bz2 562006 SHA256 5f0421ca0ea2b4c7669d5332d43b04af8b0c40d2964dd152a265c18f4d7f2715 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5 WHIRLPOOL 25f21395fda80a35b7e67fdcf1bdf2a789af73ba59c049d3604da8ecd4863e85c2e551334757d0ac53bfc33d128747ee570520171648be3818a406baa23b0737
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.6.conf b/www-misc/vdradmin-am/files/vdradmin-3.6.6.conf
new file mode 100644
index 000000000000..fe6efecbab89
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.6.conf
@@ -0,0 +1,26 @@
+# Settings for vdradmin-am
+
+# Run vdradmin-am as this user:
+#
+# If you want vdradmin to run on a port below 1024 you
+# should nevertheless have vdradmin running as root.
+#
+VDRADMIN_USER="vdradmin"
+
+# Use ssl connection
+# Allowed values: yes no
+# SSL using will disable non SSL connections
+#SSL=no
+
+# Use the ipv6 protocol [EXPERIMENTAL]
+# Allowed values: yes no
+#IPV6=no
+
+# Enable Logging
+# Allowed values: syslog file no
+# Setting this value to file will log to /var/log/vdradmin/vdradmind.log
+#LOGGING=no
+
+# Set loglevel
+# Allowed values: 0-7
+#LOGLEVEL=4
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.6.logrotate b/www-misc/vdradmin-am/files/vdradmin-3.6.6.logrotate
new file mode 100644
index 000000000000..a4f726c63c15
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.6.logrotate
@@ -0,0 +1,9 @@
+/var/log/vdradmin/vdradmind.log {
+ compress
+ rotate 4
+ weekly
+ delaycompress
+ copytruncate
+ missingok
+ notifempty
+}
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.7.init b/www-misc/vdradmin-am/files/vdradmin-3.6.7.init
new file mode 100644
index 000000000000..c28fa9b5f961
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmin-3.6.7.init
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+depend() {
+ use vdr
+}
+
+start() {
+ ebegin "Starting vdradmin"
+
+ : ${VDRADMIN_USER:=vdradmin}
+
+ local dir vdradmin_opts
+
+ # Prepare directories
+ for dir in cache log run; do
+ checkpath -q -d -m 0755 -o ${VDRADMIN_USER}:vdradmin "/var/${dir}/vdradmin"
+ done
+ checkpath -q -d -m 0755 -o ${VDRADMIN_USER}:vdradmin "/etc/vdradmin" \
+ "/etc/vdradmin/certs"
+ checkpath -q -f -m 0644 -o ${VDRADMIN_USER}:vdradmin "/etc/vdradmin/vdradmind.conf" \
+ "/etc/vdradmin/certs/server-cert.pem" \
+ "/etc/vdradmin/certs/server-key.pem"
+
+ if [ "${SSL}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ssl"; fi
+ if [ "${IPV6}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ipv6"; fi
+ vdradmin_opts="${vdradmin_opts} --log ${LOGLEVEL:=4}"
+
+ if [ "${LOGGING}" = "syslog" ]; then
+ sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 1-" /etc/vdradmin/vdradmind.conf
+ sed -i -e "/LOGFILE/s-LOGFILE.*-LOGFILE = syslog-" /etc/vdradmin/vdradmind.conf
+ elif [ "${LOGGING}" = "file" ]; then
+ sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 1-" /etc/vdradmin/vdradmind.conf
+ sed -i -e "/LOGFILE/s-LOGFILE.*-LOGFILE = vdradmind.log-" /etc/vdradmin/vdradmind.conf
+ else
+ sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 0-" /etc/vdradmin/vdradmind.conf
+ fi
+
+ if [ -n "${RC_UNAME}" ]; then
+ # running on baselayout-2/openrc
+ start-stop-daemon --start --background --user "${VDRADMIN_USER}" \
+ --pidfile /var/run/vdradmin/vdradmind.pid \
+ --exec /usr/bin/perl /usr/bin/vdradmind -- ${vdradmin_opts}
+ else
+ start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" \
+ --exec /usr/bin/vdradmind -- ${vdradmin_opts}
+ fi
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping vdradmin"
+ start-stop-daemon --stop --quiet --pidfile /var/run/vdradmin/vdradmind.pid
+ eend $?
+}
diff --git a/www-misc/vdradmin-am/files/vdradmind.conf b/www-misc/vdradmin-am/files/vdradmind.conf
new file mode 100644
index 000000000000..a5208a89b1b9
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmind.conf
@@ -0,0 +1,2 @@
+d /var/cache/vdradmin 0755 vdradmin vdradmin -
+d /var/log/vdradmin 0755 vdradmin vdradmin -
diff --git a/www-misc/vdradmin-am/files/vdradmind.service b/www-misc/vdradmin-am/files/vdradmind.service
new file mode 100644
index 000000000000..c7cd8752b3d6
--- /dev/null
+++ b/www-misc/vdradmin-am/files/vdradmind.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=WWW interface daemon for VDR
+Documentation=man:vdradmind(8)
+Documentation=file:///usr/share/doc/vdradmin-am/INSTALL
+
+[Service]
+ExecStart=/usr/bin/vdradmind --nofork
+User=vdradmin
+StandardOutput=syslog
+SyslogLevel=warning
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
new file mode 100644
index 000000000000..613721190802
--- /dev/null
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>media-tv</herd>
+ <maintainer>
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ To program and steer central service over a Browser the VDR
+ </longdescription>
+ <longdescription lang="de">
+ Zentraler Dienst um ueber einen Browser den VDR zu programmiern
+ und zu steuern.
+ </longdescription>
+ <use>
+ <flag name="vdr">
+ Support for media-video/vdr.
+ Disable this if the VDR you want to control runs at a remote machine.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
new file mode 100644
index 000000000000..8a59565a1714
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils ssl-cert systemd user
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="dev-lang/perl
+ dev-perl/Template-Toolkit
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/Locale-gettext
+ virtual/perl-IO-Compress
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( dev-perl/IO-Socket-SSL )
+ virtual/perl-libnet
+ dev-perl/Authen-SASL
+ dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+ # The ssl-cert eclass is not flexible enough so do some steps manually
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+ gen_cnf || return 1
+
+ gen_key 1 || return 1
+ gen_csr 1 || return 1
+ gen_crt 1 || return 1
+}
+
+pkg_setup() {
+ enewgroup ${VDRADMIN_GROUP}
+ enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+}
+
+src_unpack() {
+ unpack ${A}
+ cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+ sed -i vdradmind.pl \
+ -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
+
+ if use ipv6; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
+
+ if use ssl; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+ newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+ systemd_dounit "${WORKDIR}"/vdradmind.service
+ systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+ newbin vdradmind.pl vdradmind
+
+ insinto ${LIB_DIR}/template
+ doins -r "${S}"/template/*
+
+ insinto ${LIB_DIR}/lib/Template/Plugin
+ doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+ insinto /usr/share/locale/
+ doins -r "${S}"/locale/*
+
+ newman vdradmind.pl.1 vdradmind.8
+
+ dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+ docinto contrib
+ dodoc "${S}"/contrib/*
+
+ diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+ keepdir ${ETC_DIR}
+ use ssl && keepdir ${CERTS_DIR}
+}
+
+pkg_preinst() {
+ install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+
+ if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+ cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+ else
+ elog
+ elog "Creating a new config-file."
+ echo
+
+ cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
+ VDRCONFDIR = "${ROOT%/}"/etc/vdr
+ VIDEODIR = "${ROOT%/}"/var/vdr/video
+ EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
+ EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+ PASSWORD = gentoo-vdr
+ USERNAME = gentoo-vdr
+ EOF
+ # Feed it with newlines
+ yes "" \
+ | "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+ |sed -e 's/: /: \n/g'
+
+ [[ ${PIPESTATUS[1]} == "0" ]] \
+ || die "Failed to create initial configuration."
+
+ elog
+ elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+ elog
+ elog "You can run \"emerge --config ${PN}\" if the default-values"
+ elog "do not match your installation or change them in the Setup-Menu"
+ elog "of the Web-Interface."
+ fi
+}
+
+pkg_postinst() {
+ if use ipv6; then
+ elog
+ elog "To make use of the ipv6 protocol"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+ fi
+
+ if use ssl; then
+ elog
+ elog "To use ssl connection to your vdr"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+
+ if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
+ ! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+ create_ssl_cert
+ local base=$(get_base 1)
+ install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+ install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+ fi
+ fi
+
+ elog
+ elog "To extend ${PN} you can emerge"
+ elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
+ elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+ elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+ elog "(depend on your vdr version) to rename recordings"
+ elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/vdradmind -c
+}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
new file mode 100644
index 000000000000..8a59565a1714
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils ssl-cert systemd user
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="dev-lang/perl
+ dev-perl/Template-Toolkit
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/Locale-gettext
+ virtual/perl-IO-Compress
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( dev-perl/IO-Socket-SSL )
+ virtual/perl-libnet
+ dev-perl/Authen-SASL
+ dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+ # The ssl-cert eclass is not flexible enough so do some steps manually
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+ gen_cnf || return 1
+
+ gen_key 1 || return 1
+ gen_csr 1 || return 1
+ gen_crt 1 || return 1
+}
+
+pkg_setup() {
+ enewgroup ${VDRADMIN_GROUP}
+ enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+}
+
+src_unpack() {
+ unpack ${A}
+ cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+ sed -i vdradmind.pl \
+ -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
+
+ if use ipv6; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
+
+ if use ssl; then
+ sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+ -i "${WORKDIR}"/vdradmind.service
+ fi
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+ newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+ systemd_dounit "${WORKDIR}"/vdradmind.service
+ systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+ newbin vdradmind.pl vdradmind
+
+ insinto ${LIB_DIR}/template
+ doins -r "${S}"/template/*
+
+ insinto ${LIB_DIR}/lib/Template/Plugin
+ doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+ insinto /usr/share/locale/
+ doins -r "${S}"/locale/*
+
+ newman vdradmind.pl.1 vdradmind.8
+
+ dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+ docinto contrib
+ dodoc "${S}"/contrib/*
+
+ diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+ keepdir ${ETC_DIR}
+ use ssl && keepdir ${CERTS_DIR}
+}
+
+pkg_preinst() {
+ install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+
+ if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+ cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+ else
+ elog
+ elog "Creating a new config-file."
+ echo
+
+ cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
+ VDRCONFDIR = "${ROOT%/}"/etc/vdr
+ VIDEODIR = "${ROOT%/}"/var/vdr/video
+ EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
+ EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+ PASSWORD = gentoo-vdr
+ USERNAME = gentoo-vdr
+ EOF
+ # Feed it with newlines
+ yes "" \
+ | "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+ |sed -e 's/: /: \n/g'
+
+ [[ ${PIPESTATUS[1]} == "0" ]] \
+ || die "Failed to create initial configuration."
+
+ elog
+ elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+ elog
+ elog "You can run \"emerge --config ${PN}\" if the default-values"
+ elog "do not match your installation or change them in the Setup-Menu"
+ elog "of the Web-Interface."
+ fi
+}
+
+pkg_postinst() {
+ if use ipv6; then
+ elog
+ elog "To make use of the ipv6 protocol"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+ fi
+
+ if use ssl; then
+ elog
+ elog "To use ssl connection to your vdr"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+
+ if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
+ ! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+ create_ssl_cert
+ local base=$(get_base 1)
+ install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+ install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+ fi
+ fi
+
+ elog
+ elog "To extend ${PN} you can emerge"
+ elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
+ elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+ elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+ elog "(depend on your vdr version) to rename recordings"
+ elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/vdradmind -c
+}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
new file mode 100644
index 000000000000..d4ef85fb431d
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils ssl-cert user
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ipv6 ssl +vdr"
+
+DEPEND="dev-lang/perl
+ dev-perl/Template-Toolkit
+ dev-perl/libwww-perl
+ dev-perl/URI
+ dev-perl/Locale-gettext
+ virtual/perl-IO-Compress
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( dev-perl/IO-Socket-SSL )
+ vdr? ( media-video/vdr )
+ virtual/perl-libnet
+ dev-perl/Authen-SASL
+ dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+ # The ssl-cert eclass is not flexible enough so do some steps manually
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+ gen_cnf || return 1
+
+ gen_key 1 || return 1
+ gen_csr 1 || return 1
+ gen_crt 1 || return 1
+}
+
+pkg_setup() {
+ enewgroup ${VDRADMIN_GROUP}
+ enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+}
+
+src_prepare() {
+ sed -i vdradmind.pl \
+ -e "s-FILES_IN_SYSTEM = 0;-FILES_IN_SYSTEM = 1;-g" || die
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+ newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+ newbin vdradmind.pl vdradmind
+
+ insinto ${LIB_DIR}/template
+ doins -r "${S}"/template/*
+
+ insinto ${LIB_DIR}/lib/Template/Plugin
+ doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+ insinto /usr/share/locale/
+ doins -r "${S}"/locale/*
+
+ newman vdradmind.pl.1 vdradmind.8
+
+ dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+ docinto contrib
+ dodoc "${S}"/contrib/*
+
+ diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+ keepdir ${ETC_DIR}
+ use ssl && keepdir ${CERTS_DIR}
+}
+
+pkg_preinst() {
+ install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+
+ if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+ cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+ "${D}"${ETC_DIR}/vdradmind.conf || die
+ else
+ elog
+ elog "Creating a new config-file."
+ echo
+
+ cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
+ VDRCONFDIR = "${ROOT%/}"/etc/vdr
+ VIDEODIR = "${ROOT%/}"/var/vdr/video
+ EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
+ EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+ PASSWORD = gentoo-vdr
+ USERNAME = gentoo-vdr
+ EOF
+ # Feed it with newlines
+ yes "" \
+ | "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+ |sed -e 's/: /: \n/g'
+
+ [[ ${PIPESTATUS[1]} == "0" ]] \
+ || die "Failed to create initial configuration."
+
+ elog
+ elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+ elog
+ elog "You can run \"emerge --config ${PN}\" if the default-values"
+ elog "do not match your installation or change them in the Setup-Menu"
+ elog "of the Web-Interface."
+ fi
+}
+
+pkg_postinst() {
+ if use ipv6; then
+ elog
+ elog "To make use of the ipv6 protocol"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+ fi
+
+ if use ssl; then
+ elog
+ elog "To use ssl connection to your vdr"
+ elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+
+ if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
+ ! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+ create_ssl_cert
+ local base=$(get_base 1)
+ install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+ install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+ "${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+ fi
+ fi
+
+ elog
+ elog "To extend ${PN} you can emerge"
+ elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
+ elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+ elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+ elog "(depend on your vdr version) to rename recordings"
+ elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/vdradmind -c
+}
diff --git a/www-misc/visitors/Manifest b/www-misc/visitors/Manifest
new file mode 100644
index 000000000000..37174fccc6c0
--- /dev/null
+++ b/www-misc/visitors/Manifest
@@ -0,0 +1 @@
+DIST visitors-0.7.tar.gz 100154 RMD160 8819becac412ff79de4d88dd2aadb7c5faf2f167 SHA1 cdccdfb82001c7c3dadf68456574cac1a5d941e3 SHA256 d2149e33ffe96b1f52b0587cff65973b0bc0b24ec43cdf072a782c1bd52148ab
diff --git a/www-misc/visitors/metadata.xml b/www-misc/visitors/metadata.xml
new file mode 100644
index 000000000000..e590d622d2d1
--- /dev/null
+++ b/www-misc/visitors/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Visitors is a very fast web log analyzer for Linux, Windows, and other
+ Unix-like operating systems. It takes as input a web server log file, and
+ outputs statistics in form of different types of reports.
+ </longdescription>
+</pkgmetadata>
diff --git a/www-misc/visitors/visitors-0.7-r1.ebuild b/www-misc/visitors/visitors-0.7-r1.ebuild
new file mode 100644
index 000000000000..fa4c73a67e1b
--- /dev/null
+++ b/www-misc/visitors/visitors-0.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast web log analyzer"
+HOMEPAGE="http://www.hping.org/visitors/"
+SRC_URI="http://www.hping.org/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${P/-/_}"
+
+src_prepare() {
+ sed -i doc.html \
+ -e 's:graph\.gif:graph.png:' \
+ || die "sed doc.html"
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+}
+
+src_compile() {
+ emake \
+ CC=$(tc-getCC) \
+ CFLAGS="${CFLAGS} -Wall -W" \
+ DEBUG="" \
+ || die "emake failed"
+}
+
+src_install() {
+ dobin visitors
+ dodoc AUTHORS Changelog README TODO
+ dohtml doc.html visitors.css visitors.png
+}
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
new file mode 100644
index 000000000000..18c4f0e6d8e6
--- /dev/null
+++ b/www-misc/wsmake/Manifest
@@ -0,0 +1 @@
+DIST wsmake-0.6.4.tar.bz2 351688 RMD160 cfb48e73191b63cfb57fe318de8111d4feb11666 SHA1 7bd163c0f76f1ad768458964cebdf495a3fa18ce SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
new file mode 100644
index 000000000000..d10aa5769c2d
--- /dev/null
+++ b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
@@ -0,0 +1,13 @@
+--- libwsmake/wsUtil.cpp.orig Sat Sep 1 22:09:13 2001
++++ libwsmake/wsUtil.cpp Tue Sep 3 20:19:04 2002
+@@ -714,7 +714,8 @@
+ if(__wsmake_quiet) return;
+
+ vfprintf(out,output,*ap);
+- va_end((void*&)*ap);
++ //BV: this does not compile: va_end((void*&)*ap);
++ va_end((char*&)*ap);
+ }
+
+ #ifdef DEBUG
+
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
new file mode 100644
index 000000000000..0ecfe62003f5
--- /dev/null
+++ b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/show_bug.cgi?id=251745
+https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982
+
+--- libwsmake/wsSubTag.cpp
++++ libwsmake/wsSubTag.cpp.new
+@@ -22,6 +22,7 @@
+ ***********************************************************************/
+ #include <cstdio>
+ #include <cstring>
++#include <cstdlib>
+
+ #include <unistd.h>
+ #ifdef HAVE_SYS_WAIT_H
+--- libwsmake/wsWebPage.cpp
++++ libwsmake/wsWebPage.cpp.new
+@@ -23,6 +23,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <ctime>
++#include <cstdlib>
+
+ #include "wsmake.h"
+
+--- libwsmake/wsUtil.cpp
++++ libwsmake/wsUtil.cpp.new
+@@ -28,6 +28,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <cstring>
++#include <cstdlib>
+
+ #ifdef HAVE_UTIME_H
+ #include <utime.h>
diff --git a/www-misc/wsmake/metadata.xml b/www-misc/wsmake/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/www-misc/wsmake/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>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
new file mode 100644
index 000000000000..4036e741f61c
--- /dev/null
+++ b/www-misc/wsmake/wsmake-0.6.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Website Pre-processor"
+HOMEPAGE="http://www.wsmake.org/"
+SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2"
+
+KEYWORDS="x86"
+LICENSE="GPL-2 Artistic"
+SLOT="0"
+IUSE=""
+
+src_unpack () {
+ unpack ${A} && cd "${S}"
+ epatch "${FILESDIR}"/${P}-bv.diff
+ epatch "${FILESDIR}"/${P}-gcc43.patch # 251745
+}
+
+src_compile () {
+ econf || die "econf failed"
+ emake || die "emake failed"
+ cd doc
+ tar -cf examples.tar examples || die
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
+ cd doc
+ dodoc manual.txt examples.tar
+}
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
new file mode 100644
index 000000000000..2268bd6ca9fb
--- /dev/null
+++ b/www-misc/xxv/Manifest
@@ -0,0 +1 @@
+DIST xxv-1.6.1.tgz 992065 SHA256 14288f7fb4c16c536e0c861b4f213bc1a7bf19e036b6d37777989acaa9b82643
diff --git a/www-misc/xxv/files/xxv-1.0-logerror.patch b/www-misc/xxv/files/xxv-1.0-logerror.patch
new file mode 100644
index 000000000000..3c65bbda47e4
--- /dev/null
+++ b/www-misc/xxv/files/xxv-1.0-logerror.patch
@@ -0,0 +1,29 @@
+--- html/bloecke/tooltip.tmpl (Revision 1189)
++++ html/bloecke/tooltip.tmpl (Arbeitskopie)
+@@ -7,6 +7,6 @@
+ IF !ttp_offset;ttp_offset = 0;END %?>
+ <a href="<?% IF link;link;ELSE;"#";END %?>"<?% IF eventid %?>
+ onmouseover="ttpreq(this, '<?% escape(title) %?>
+- <?% IF subtitle.length > 0 %?>~<?% escape(subtitle) %?>
++ <?% IF subtitle && subtitle.length > 0 %?>~<?% escape(subtitle) %?>
+ <?% END %?>',<?% eventid %?>, <?% ttp_offset %?>);"
+ <?% END %?> >
+Index: html/tlist.tmpl
+===================================================================
+--- html/tlist.tmpl (Revision 1189)
++++ html/tlist.tmpl (Arbeitskopie)
+@@ -51,10 +51,10 @@
+ <?% END %?>
+ </tr>
+ <?% FOREACH zeile = data %?>
+- <?% aktiv = ( zeile.1 mod 2 );
+- vps = zeile.1 mod 8 div 4;
++ <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
++ vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
+ day = date.format(zeile.9, "%A, %x", locale);
+- IF aktiv; rest = rest - zeile.last; END;
++ IF aktiv; rest = rest - zeile.13; END;
+ %?>
+ <?% IF oldDay != day %?>
+ <tr><td colspan='<?% zeile.size + 1 %?>' bgcolor='#DDDDDD'><b><?% day %?></b></td><tr>
+
diff --git a/www-misc/xxv/files/xxv.utf8-v5 b/www-misc/xxv/files/xxv.utf8-v5
new file mode 100644
index 000000000000..7ddd4332a6e6
--- /dev/null
+++ b/www-misc/xxv/files/xxv.utf8-v5
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+RUNAS_USER="vdr"
+
+# Set Verbose Level 0 -> 5
+VERBOSE="1"
+
+#export LANG=de_DE.utf8
+
+depend() {
+ need vdr
+}
+
+# some fixed Path
+CONFIGFILE="/etc/xxv/xxvd.cfg"
+PIDFILE="/var/run/xxv/xxvd.pid"
+XXV_BIN="/usr/bin/xxvd"
+LOGFILE="/var/log/xxv/xxvd.log"
+
+xxv_logger() {
+ printf "\tXXV running as user: ${RUNAS_USER}\n" >> "${LOGFILE}"
+ printf "\tVerbose Level: ${VERBOSE}\n" >> "${LOGFILE}"
+ printf "\tYou can change this in xxv init script\n\n" >> "${LOGFILE}"
+}
+
+check_vdradmin() {
+
+ # Check at first, is VDR-Admin running
+ # Stopping, while running on same ports
+ if [ -n "`netstat -anp | grep vdradmin | grep 8080`" ] ; then
+ echo
+ eerror "VDR-Admin will Stop at first now"
+ eerror "vdradmin and xxv can not run on the same port"
+ echo
+ /etc/init.d/vdradmin stop
+ fi
+}
+
+xxv_kill_pid() {
+
+ # After unclear stop, xxvd.pid will not removed, fixed with next line
+ if [ ! -x /etc/init.d/root ]; then
+ if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then
+ rm ${PIDFILE}
+ killall xxvd 2> /dev/null
+ fi
+ fi
+
+}
+
+xxv_kill_initfile() {
+
+ # After unclear stop, init file in /var/lib/init.d/started/ still not removed
+
+ if [ ! -x /etc/init.d/root ]; then
+ if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then
+ rm /var/lib/init.d/started/xxv
+ /etc/init.d/xxv zap
+ killall xxvd 2> /dev/null
+ fi
+ fi
+
+}
+
+start() {
+ check_vdradmin
+ xxv_logger
+
+ ebegin "Start xxv"
+ echo
+ einfo "xxv running as user: ${RUNAS_USER}"
+ einfo "Verbose Level: ${VERBOSE}"
+
+ start-stop-daemon --nicelevel 15 --pidfile ${PIDFILE} --start -u ${RUNAS_USER} --exec ${XXV_BIN} -- \
+ -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
+ eend $?
+}
+
+
+stop() {
+
+ ebegin "Stopping xxvd"
+ start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+
+ xxv_kill_pid
+ xxv_kill_initfile
+
+ eend $?
+}
+
+#restart() {
+
+# xxv_kill_pid
+# xxv_kill_initfile
+
+# svc_stop
+# svc_start
+#}
diff --git a/www-misc/xxv/files/xxvd-1.0.cfg b/www-misc/xxv/files/xxvd-1.0.cfg
new file mode 100644
index 000000000000..b18f899ba581
--- /dev/null
+++ b/www-misc/xxv/files/xxvd-1.0.cfg
@@ -0,0 +1,162 @@
+[AUTOTIMER]
+active=y
+exclude=POS > 250
+interval=300
+
+[CHANNELS]
+empty=n
+file=/etc/vdr/channels.conf
+filterCA=0,1,2,3,4
+interval=300
+stripCH=short,long;provider
+
+[EPG]
+epgfile=/var/vdr/epg.data
+epgimages=/var/vdr/video/epgimages
+interval=300
+periods=12:00,18:00,20:20,22:00,23:00,00:00,02:00,04:00
+restart=3
+timeframe=2
+
+[GRAB]
+file=/tmp/live.jpg
+font=VeraBI.ttf
+imgfontsize=12
+imgquality=90
+imgtext=[?- i = channel.split(" ") -?][[? i.shift ?]] [? i.join(" ") ?]: [? event.Title ?]
+vpos=20
+xsize=480
+ysize=360
+
+[General]
+DSN=DBI:mysql:database=xxv;host=localhost;port=3306
+Language=de_DE
+PWD=xpix97
+USR=xpix
+initscript=/etc/init.d/xxv
+
+[HTTPD]
+Clients=1000
+HtmlRoot=html
+Port=8080
+StartPage=schema
+active=y
+
+[INTERFACE]
+Clients=5
+Port=8002
+active=y
+
+[LOGREAD]
+active=y
+rows=100
+syslog=/var/log/syslog
+tail=/usr/bin/tail
+
+[MUSIC]
+active=y
+clients=5
+coverimages=/var/cache/xxv/cover
+host=192.168.0.23
+path=/var/lib/video.00/MUSIC
+port=8100
+proxy=
+
+[NEWS::JABBER]
+active=n
+level=1
+passwd=password
+receiveUser=receiveUser@jabber.org
+user=newsxxv@jabber.org
+
+[NEWS::MAIL]
+active=n
+address=xxv@example.com
+interval=6
+level=1
+smtp=smtp.googlemail.com
+spwd=password
+susr=user
+
+[NEWS::RSS]
+active=y
+level=1
+
+[NEWS::VDR]
+active=y
+level=1
+
+[RECORDS]
+commandfile=/etc/vdr/reccmds.conf
+interval=600
+previewbinary=/usr/bin/vdr2jpeg
+previewcommand=vdr2jpeg
+previewcount=3
+previewimages=/var/cache/xxv/preview
+previewlistthumbs=n
+previewlog=/var/log/xxv/xxvd_mplayer.log
+vfat=n
+videodir=/var/vdr/video
+
+[REMOTE]
+active=y
+commands=/etc/vdr/commands.conf
+
+[REPORT]
+active=y
+host=www.dyndns.org
+interval=6
+
+[ROBOT]
+active=y
+interval=3600
+
+[STATUS]
+active=y
+dfBinary=/bin/df
+font=VeraBI.ttf
+history=1
+interval=15
+wcBinary=/usr/bin/wc
+whoBinary=/usr/bin/who
+
+[STREAM]
+host=192.168.0.23
+netvideo=\\192.168.0.23\video
+
+[SVDRP]
+VdrHost=localhost
+VdrPort=2001
+
+[TELNET]
+Clients=5
+Port=8001
+active=y
+
+[TIMERS]
+DVBCards=1
+Lifetime=50
+Priority=50
+afterminutes=5
+deactive=y
+file=/etc/vdr/timers.conf
+interval=300
+prevminutes=1
+
+[USER]
+active=y
+noAuth=192.168.0.0/24, 127.0.0.1/32
+tempimages=/var/cache/xxv/temp
+withAuth=192.168.1.0/24
+
+[VTX]
+active=y
+cache=packed
+dir=/var/cache/vdr/vtx
+vtximages=./share/vtx
+
+[WAPD]
+Clients=5
+Port=8085
+WMLRoot=/usr/share/xxv-0.91_pre1126/wml
+active=y
diff --git a/www-misc/xxv/files/xxvd-logrotate b/www-misc/xxv/files/xxvd-logrotate
new file mode 100644
index 000000000000..abd07be96f63
--- /dev/null
+++ b/www-misc/xxv/files/xxvd-logrotate
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+/var/log/xxv/xxvd.log {
+ compress
+ daily
+ dateext
+ maxage 365
+ rotate 99
+ size=+4096k
+ notifempty
+ missingok
+ copytruncate
+}
+
+/var/log/xxv/xxvd_mplayer.log {
+ compress
+ daily
+ dateext
+ maxage 365
+ rotate 99
+ size=+4096k
+ notifempty
+ missingok
+ copytruncate
+}
diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
new file mode 100644
index 000000000000..a1e5d37641f2
--- /dev/null
+++ b/www-misc/xxv/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>
+ <email>hd_brummy@gentoo.org</email>
+ <name>Joerg Bornkessel</name>
+ </maintainer>
+ <longdescription lang="en">
+ To program and steer central service over a Browser the VDR
+ </longdescription>
+ <longdescription lang="de">
+ Zentraler Dienst um ueber einen Browser den VDR zu programmiern
+ und zu steuern.
+ </longdescription>
+ <use>
+ <flag name='themes'>Enable more themes via
+ <pkg>x11-themes/xxv-skins</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/www-misc/xxv/xxv-1.6.1.ebuild b/www-misc/xxv/xxv-1.6.1.ebuild
new file mode 100644
index 000000000000..ea5d2066fa57
--- /dev/null
+++ b/www-misc/xxv/xxv-1.6.1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator
+
+VERSION="718" # every bump, new version
+
+DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
+HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
+ mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-mplayer themes"
+
+RDEPEND=">=media-video/vdr-1.2.6
+ media-video/vdr2jpeg
+ media-fonts/corefonts
+ virtual/mysql
+ dev-perl/CGI
+ virtual/perl-Digest-MD5
+ virtual/perl-Getopt-Long
+ virtual/perl-MIME-Base64
+ virtual/perl-Time-HiRes
+ virtual/perl-IO-Compress
+ dev-perl/Config-Tiny
+ dev-perl/DateManip
+ dev-perl/DBD-mysql
+ dev-perl/DBI
+ dev-perl/Digest-HMAC
+ dev-perl/Encode-Detect
+ dev-perl/Event
+ dev-perl/Font-TTF
+ dev-perl/GD[png,gif]
+ dev-perl/IO-Socket-INET6
+ dev-perl/JSON
+ dev-perl/JSON-XS
+ dev-perl/Linux-Inotify2
+ dev-perl/Locale-gettext
+ dev-perl/MP3-Info
+ dev-perl/Net-Amazon
+ dev-perl/Net-Telnet
+ dev-perl/Net-XMPP
+ dev-perl/Proc-ProcessTable
+ dev-perl/SOAP-Lite
+ dev-perl/TextToHTML
+ dev-perl/Template-GD
+ dev-perl/Template-Toolkit
+ dev-perl/XML-RSS
+ themes? ( >=x11-themes/${PN}-skins-1.6 )"
+
+PDEPEND="mplayer? ( media-video/mplayer )"
+
+SHAREDIR="/usr/share/${PN}"
+LIBDIR="/usr/lib/${PN}"
+
+DB_VERS="32"
+
+db_update_check() {
+
+ DB_VERS_OLD="`cat /var/db/pkg/www-misc/xxv-*/xxv-*.ebuild | grep DB_VERS | head -n 1 | cut -c10-11`"
+
+ if [ "${DB_VERS_OLD}" -lt "${DB_VERS}" ]; then
+ echo
+ elog "An update of the XXV Database is necessary !!!"
+ echo
+ elog "\tcd ${SHAREDIR}/contrib"
+ echo
+ elog "\tIt is really important to edit the create-database.sql file first"
+ elog "\tdue to UTF-8 Support changes in the MySQL DB !!!"
+ echo
+ elog "\tafter this run ./update-xxv -h for more info"
+ echo
+ else
+ echo
+ elog "If this is a new install"
+ elog "You have to create an empty DB for XXV"
+ echo
+ elog "do this by:"
+ elog "cd ${SHAREDIR}/contrib"
+ eerror "read the README"
+ elog "For UTF-8 support it is really important to"
+ elog "edit create-database.sql file first and run"
+ elog "emerge --config ${PN}"
+ elog "afterwards"
+ echo
+ elog "Set your own language in"
+ elog "${SHAREDIR}/locale"
+ echo
+ elog "The default user/password is:"
+ elog "User/Password: xxv:xxv"
+ elog "You should change it immediately!"
+ echo
+ eerror "edit /etc/xxv/xxvd.cfg !"
+ fi
+}
+
+pkg_setup() {
+
+ if ! has_version "www-misc/${PN}"; then
+ echo
+ einfo "After you install xxv the very first time you should consider to read"
+ einfo "http://www.vdr-wiki.de/wiki/index.php/Xxv (German only)"
+ echo
+ fi
+
+ db_update_check
+}
+
+src_prepare() {
+
+ sed -i "${S}"/bin/xxvd \
+ -e "s:debian:Gentoo:" \
+ -e "s:/var/log/xxvd.log:/var/log/xxv/xxvd.log:" \
+ -e "s:/var/run/xxvd.pid:/var/run/xxv/xxvd.pid:" \
+ -e "s:\$RealBin/../lib:${LIBDIR}:" \
+ -e "s:\$RealBin/../locale:${SHAREDIR}/locale:" \
+ -e "s:\$RealBin/../lib/XXV/MODULES:${LIBDIR}/XXV/MODULES:" \
+ -e "s:\$RealBin/../etc/xxvd.cfg:/etc/xxv/xxvd.cfg:" \
+ -e "s:\$RealBin/../doc:/usr/share/doc/${P}:" \
+ -e "s:HTMLDIR => \"\$RealBin/../:HTMLDIR => \"${SHAREDIR}/skins:" \
+ -e "s:\$RealBin/../share/vtx:${SHAREDIR}/vtx:" \
+ -e "s:\$Real Bin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \
+ -e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \
+ -e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \
+ -e "s:\$RealBin/../share/fonts/ttf-bitstream-vera:/usr/share/fonts/corefonts:" \
+ -e "s:\$RealBin/../share/xmltv:${SHAREDIR}/xmltv:"
+
+ sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl
+}
+
+src_install() {
+
+ newinitd "${FILESDIR}"/xxv.utf8-v5 xxv
+
+ dobin bin/xxvd
+
+ insinto /etc/"${PN}"
+ newins "${FILESDIR}"/xxvd-1.0.cfg xxvd.cfg
+ chown vdr:vdr "${D}"/etc/"${PN}"/xxvd.cfg
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/xxvd-logrotate xxvd
+
+ diropts -m755 -ovdr -gvdr
+ keepdir /var/cache/xxv
+ keepdir /var/run/xxv
+ keepdir /var/log/xxv
+
+ insinto "${LIBDIR}"
+ doins -r "${S}"/lib/*
+
+ insinto "${SHAREDIR}"
+ doins -r "${S}"/share/{news,xmltv}
+
+ insinto "${SHAREDIR}"/locale
+ doins -r "${S}"/locale/*
+ fperms 0755 "${SHAREDIR}"/locale/xgettext.pl
+
+ insinto "${SHAREDIR}"/contrib
+ doins -r "${S}"/contrib/*
+ fperms 0755 "${SHAREDIR}"/contrib/update-xxv
+
+ insinto "${SHAREDIR}"/skins
+ doins -r "${S}"/{html,wml}
+ doins "${S}"/doc/docu.tmpl
+
+ cd "${S}"/doc
+ insinto /usr/share/doc/"${P}"
+ doins docu.tmpl CHANGELOG README
+ fowners vdr:vdr /usr/share/doc/"${P}"
+
+ doman xxvd.1
+}
+
+pkg_config() {
+
+ cd "${ROOT}"/"${SHAREDIR}"
+ cat ./contrib/create-database.sql | mysql -u root -p
+}
+
+pkg_postrm() {
+
+ einfo "Cleanup for old "${P}" files"
+ rm -r /usr/share/doc/"${P}"
+}
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
new file mode 100644
index 000000000000..f62a219ad90c
--- /dev/null
+++ b/www-misc/zoneminder/Manifest
@@ -0,0 +1,3 @@
+DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 WHIRLPOOL 869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0
+DIST zoneminder-1.28.0.tar.gz 2804199 SHA256 b9ee65635753e094dcad6cdb480acc42bff8b8f023ee008790883a4308273ca2 SHA512 ac2a036adac436d76db8bb0b161d063111cc7cc7f6bcb9ca1b46862cfb0285b291926df716df645c0be47b7465bbbf3b1050c85529ff5068bdcc34f1c8ba6df1 WHIRLPOOL 012a088ab6411cf7a1ec1e0c4d9c9f1e61889c3729ea736baafb5174a20f61a82c280b7c5bfd669e031b3e1844abe1de0a577e73f82295b080d88b4ae43b627b
+DIST zoneminder-1.28.1.tar.gz 3864811 SHA256 e55fa6ce1fd6c27912cd1de67fca3f80fad579f330020a384dc82838704d11ba SHA512 0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1 WHIRLPOOL 62a52810437c0360fb83eb6f8210d6f089448bc6b9cf7b46e6ad8db7f952c3e3ba9832f2e25be65a476655991e3dd7ae70ed83198c7a4563cff68283e7f06226
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
new file mode 100644
index 000000000000..277d680d24b4
--- /dev/null
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -0,0 +1,18 @@
+ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
+ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
+
+<Directory "/usr/libexec/zoneminder/cgi-bin">
+ AllowOverride All
+ Options ExecCGI
+ Order allow,deny
+ Allow from all
+</Directory>
+
+Alias /zoneminder "%ZM_WEBDIR%"
+
+<Directory "%ZM_WEBDIR%">
+ Options -Indexes MultiViews FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+</Directory>
diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
new file mode 100644
index 000000000000..2ada7c7d0a45
--- /dev/null
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -0,0 +1,27 @@
+1. If this is a new installation, you will need to create a MySQL
+ database for zoneminder to use
+ (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
+ E.g., when logged into mysql as root,
+ mysql> CREATE DATABASE \`zm\`;
+ mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
+ Once you completed that you should execute the following:
+ cd /usr/share/zoneminder
+ mysql -u zmuser -p < db/zm_create.sql
+
+2. Set your database settings in /etc/zm.conf, including above topsecretpassword
+
+3. Configure apache to use zoneminder, see /usr/share/doc/zoneminder*/10_zoneminder.conf
+ for an example configuration snippet.
+
+4. Enable PHP in your webserver configuration,
+ enable short_open_tags in php.ini,
+ set the time zone in php.ini,
+ and restart/reload the webserver.
+
+5. Start the zoneminder daemon:
+ /etc/init.d/zoneminder start
+
+6. Finally point your browser to http://your.webserver/zoneminder
+
+If you are upgrading, you will need to run the zmupdate.pl script:
+ /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]
diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
new file mode 100644
index 000000000000..d2e03363867a
--- /dev/null
+++ b/www-misc/zoneminder/files/conf.d
@@ -0,0 +1,6 @@
+ZM_SCRIPT=/usr/bin/zmpkg.pl
+
+# Commands for starting and stopping the server
+
+CMD_START="${ZM_SCRIPT} start"
+CMD_STOP="${ZM_SCRIPT} stop"
diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
new file mode 100644
index 000000000000..06435b85f108
--- /dev/null
+++ b/www-misc/zoneminder/files/init.d
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need mysql
+ need apache2
+}
+
+start_pre() {
+ checkpath -d -m 0775 -o apache:apache /var/run/zm
+ checkpath -d -m 0775 -o apache:apache /var/tmp/zm
+}
+
+start() {
+ ebegin "Starting zoneminder"
+ ${CMD_START}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping zoneminder"
+ ${CMD_STOP}
+ eend $?
+}
diff --git a/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch b/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
new file mode 100644
index 000000000000..41b537c4167a
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
@@ -0,0 +1,11 @@
+--- ZoneMinder-1.24.1/zm.conf.in.orig 2009-03-23 13:55:43.000000000 +0000
++++ ZoneMinder-1.24.1/zm.conf.in 2009-03-23 13:57:22.000000000 +0000
+@@ -13,7 +13,7 @@
+ ZM_VERSION=@VERSION@
+
+ # Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
++ZM_PATH_BUILD=/usr/share/zoneminder
+
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
new file mode 100644
index 000000000000..266bd649baa6
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83e9d81..8619c8b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,6 +171,7 @@ else(PCRE_LIBRARIES)
+ set(optlibsnotfound "${optlibsnotfound} PCRE")
+ endif(PCRE_LIBRARIES)
+
++if(HAVE_GCRYPT)
+ # gcrypt (using find_library and find_path)
+ find_library(GCRYPT_LIBRARIES gcrypt)
+ if(GCRYPT_LIBRARIES)
+@@ -187,7 +188,11 @@ if(GCRYPT_LIBRARIES)
+ else(GCRYPT_LIBRARIES)
+ set(optlibsnotfound "${optlibsnotfound} GCrypt")
+ endif(GCRYPT_LIBRARIES)
++else(HAVE_GCRYPT)
++ set(optlibsnotfound "${optlibsnotfound} GCrypt")
++endif(HAVE_GCRYPT)
+
++if(HAVE_GNUTLS)
+ # gnutls (using find_library and find_path)
+ find_library(GNUTLS_LIBRARIES gnutls)
+ if(GNUTLS_LIBRARIES)
+@@ -205,6 +210,9 @@ if(GNUTLS_LIBRARIES)
+ else(GNUTLS_LIBRARIES)
+ set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+ endif(GNUTLS_LIBRARIES)
++else(HAVE_GNUTLS)
++ set(optlibsnotfound "${optlibsnotfound} GnuTLS")
++endif(HAVE_GNUTLS)
+
+ # mysqlclient (using find_library and find_path)
+ find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
diff --git a/www-misc/zoneminder/metadata.xml b/www-misc/zoneminder/metadata.xml
new file mode 100644
index 000000000000..3332f01d1a32
--- /dev/null
+++ b/www-misc/zoneminder/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>
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Huettel</name>
+ </maintainer>
+ <use>
+ <flag name="curl">Enable using net-misc/curl for streaming from cameras</flag>
+ <flag name="gcrypt">...</flag>
+ <flag name="vlc">Enable using media-libs/vlc for streaming from cameras</flag>
+ <flag name="openssl">...</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">ZoneMinder/ZoneMinder</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
new file mode 100644
index 000000000000..7870564c22b4
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TO DO:
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then
+# $(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# dev-perl/Archive-Zip
+# dev-perl/Device-SerialPort
+# dev-perl/MIME-Lite
+# dev-perl/MIME-tools
+# dev-perl/PHP-Serialization
+# virtual/perl-Archive-Tar
+# virtual/perl-libnet
+# virtual/perl-Module-Load
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+
+MY_PN="ZoneMinder"
+
+DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system"
+HOMEPAGE="http://www.zoneminder.com/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="curl gcrypt gnutls +mmap +openssl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+ || ( openssl gnutls )
+"
+
+DEPEND="
+ dev-lang/perl:=
+ dev-libs/libpcre
+ dev-perl/DateManip
+ dev-perl/DBD-mysql
+ dev-perl/DBI
+ dev-perl/libwww-perl
+ sys-libs/zlib
+ virtual/ffmpeg
+ virtual/jpeg
+ virtual/mysql
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Getopt-Long
+ virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ curl? ( net-misc/curl )
+ gcrypt? ( dev-libs/libgcrypt )
+ gnutls? ( net-libs/gnutls )
+ mmap? ( dev-perl/Sys-Mmap )
+ openssl? ( dev-libs/openssl )
+ vlc? ( media-video/vlc )
+"
+RDEPEND="${DEPEND}"
+
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
+
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
+pkg_setup() {
+ require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+ append-cxxflags -D__STDC_CONSTANT_MACROS
+ perl_set_version
+
+ mycmakeargs=(
+ -DZM_PERL_SUBPREFIX=${VENDOR_LIB}
+ -DZM_TMPDIR=/var/tmp/zm
+ -DZM_WEB_USER=apache
+ -DZM_WEB_GROUP=apache
+ -DZM_WEBDIR=${MY_ZM_WEBDIR}
+ $(cmake-utils_useno mmap ZM_NO_MMAP)
+ -DZM_NO_X10=OFF
+ -DZM_NO_FFMPEG=OFF
+ $(cmake-utils_useno curl ZM_NO_CURL)
+ $(cmake-utils_useno vlc ZM_NO_LIBVLC)
+ $(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+ $(cmake-utils_use_has gnutls)
+ $(cmake-utils_use_has gcrypt)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # the log directory
+ keepdir /var/log/zm
+ fowners apache:apache /var/log/zm
+
+ # now we duplicate the work of zmlinkcontent.sh
+ dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+ fperms -R 0775 /var/lib/zoneminder
+ fowners -R apache:apache /var/lib/zoneminder
+ dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
+ dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
+
+ # the configuration file
+ fperms 0640 /etc/zm.conf
+ fowners root:apache /etc/zm.conf
+
+ # init scripts etc
+ newinitd "${FILESDIR}"/init.d zoneminder
+ newconfd "${FILESDIR}"/conf.d zoneminder
+
+ cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+ sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
+
+ dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
+
+ readme.gentoo_src_install
+}
diff --git a/www-misc/zoneminder/zoneminder-1.28.0.ebuild b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
new file mode 100644
index 000000000000..0168b2a2e5f2
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TO DO:
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then
+# $(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# dev-perl/Archive-Zip
+# dev-perl/Device-SerialPort
+# dev-perl/MIME-Lite
+# dev-perl/MIME-tools
+# dev-perl/PHP-Serialization
+# virtual/perl-Archive-Tar
+# virtual/perl-libnet
+# virtual/perl-Module-Load
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+
+MY_PN="ZoneMinder"
+
+DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system"
+HOMEPAGE="http://www.zoneminder.com/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="curl gcrypt gnutls +mmap +openssl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+ || ( openssl gnutls )
+"
+
+DEPEND="
+ app-eselect/eselect-php[apache2]
+ dev-lang/perl:=
+ dev-lang/php[apache2,cgi,curl,inifile,pdo,mysql,mysqli,sockets]
+ dev-libs/libpcre
+ dev-perl/Archive-Zip
+ dev-perl/DateManip
+ dev-perl/DBD-mysql
+ dev-perl/DBI
+ dev-perl/URI-Encode
+ dev-perl/libwww-perl
+ sys-auth/polkit
+ sys-libs/zlib
+ virtual/ffmpeg
+ virtual/jpeg
+ virtual/mysql
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Getopt-Long
+ virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ www-servers/apache
+ curl? ( net-misc/curl )
+ gcrypt? ( dev-libs/libgcrypt )
+ gnutls? ( net-libs/gnutls )
+ mmap? ( dev-perl/Sys-Mmap )
+ openssl? ( dev-libs/openssl )
+ vlc? ( media-video/vlc[live] )
+"
+RDEPEND="${DEPEND}"
+
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
+
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
+pkg_setup() {
+ require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+ append-cxxflags -D__STDC_CONSTANT_MACROS
+ perl_set_version
+
+ mycmakeargs=(
+ -DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
+ -DZM_TMPDIR=/var/tmp/zm
+ -DZM_SOCKDIR=/var/run/zm
+ -DZM_WEB_USER=apache
+ -DZM_WEB_GROUP=apache
+ -DZM_WEBDIR=${MY_ZM_WEBDIR}
+ $(cmake-utils_useno mmap ZM_NO_MMAP)
+ -DZM_NO_X10=OFF
+ -DZM_NO_FFMPEG=OFF
+ $(cmake-utils_useno curl ZM_NO_CURL)
+ $(cmake-utils_useno vlc ZM_NO_LIBVLC)
+ $(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+ $(cmake-utils_use_has gnutls)
+ $(cmake-utils_use_has gcrypt)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # the log directory
+ keepdir /var/log/zm
+ fowners apache:apache /var/log/zm
+
+ # now we duplicate the work of zmlinkcontent.sh
+ dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+ fperms -R 0775 /var/lib/zoneminder
+ fowners -R apache:apache /var/lib/zoneminder
+ dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
+ dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
+
+ # bug 523058
+ keepdir ${MY_ZM_WEBDIR}/temp
+ fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
+
+ # the configuration file
+ fperms 0640 /etc/zm.conf
+ fowners root:apache /etc/zm.conf
+
+ # init scripts etc
+ newinitd "${FILESDIR}"/init.d zoneminder
+ newconfd "${FILESDIR}"/conf.d zoneminder
+
+ cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+ sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
+
+ dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
+
+ perl_delete_packlist
+
+ readme.gentoo_src_install
+}
+
+pkg_postinst() {
+ local myold=${REPLACING_VERSIONS}
+ [ "${myold}" = ${PV} ] || elog "You have upgraded zoneminder and may have to upgrade your database now."
+}
diff --git a/www-misc/zoneminder/zoneminder-1.28.1.ebuild b/www-misc/zoneminder/zoneminder-1.28.1.ebuild
new file mode 100644
index 000000000000..0168b2a2e5f2
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.28.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TO DO:
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then
+# $(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# dev-perl/Archive-Zip
+# dev-perl/Device-SerialPort
+# dev-perl/MIME-Lite
+# dev-perl/MIME-tools
+# dev-perl/PHP-Serialization
+# virtual/perl-Archive-Tar
+# virtual/perl-libnet
+# virtual/perl-Module-Load
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+
+MY_PN="ZoneMinder"
+
+DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system"
+HOMEPAGE="http://www.zoneminder.com/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="curl gcrypt gnutls +mmap +openssl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+ || ( openssl gnutls )
+"
+
+DEPEND="
+ app-eselect/eselect-php[apache2]
+ dev-lang/perl:=
+ dev-lang/php[apache2,cgi,curl,inifile,pdo,mysql,mysqli,sockets]
+ dev-libs/libpcre
+ dev-perl/Archive-Zip
+ dev-perl/DateManip
+ dev-perl/DBD-mysql
+ dev-perl/DBI
+ dev-perl/URI-Encode
+ dev-perl/libwww-perl
+ sys-auth/polkit
+ sys-libs/zlib
+ virtual/ffmpeg
+ virtual/jpeg
+ virtual/mysql
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Getopt-Long
+ virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ www-servers/apache
+ curl? ( net-misc/curl )
+ gcrypt? ( dev-libs/libgcrypt )
+ gnutls? ( net-libs/gnutls )
+ mmap? ( dev-perl/Sys-Mmap )
+ openssl? ( dev-libs/openssl )
+ vlc? ( media-video/vlc[live] )
+"
+RDEPEND="${DEPEND}"
+
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
+
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
+pkg_setup() {
+ require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+ append-cxxflags -D__STDC_CONSTANT_MACROS
+ perl_set_version
+
+ mycmakeargs=(
+ -DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
+ -DZM_TMPDIR=/var/tmp/zm
+ -DZM_SOCKDIR=/var/run/zm
+ -DZM_WEB_USER=apache
+ -DZM_WEB_GROUP=apache
+ -DZM_WEBDIR=${MY_ZM_WEBDIR}
+ $(cmake-utils_useno mmap ZM_NO_MMAP)
+ -DZM_NO_X10=OFF
+ -DZM_NO_FFMPEG=OFF
+ $(cmake-utils_useno curl ZM_NO_CURL)
+ $(cmake-utils_useno vlc ZM_NO_LIBVLC)
+ $(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+ $(cmake-utils_use_has gnutls)
+ $(cmake-utils_use_has gcrypt)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # the log directory
+ keepdir /var/log/zm
+ fowners apache:apache /var/log/zm
+
+ # now we duplicate the work of zmlinkcontent.sh
+ dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+ fperms -R 0775 /var/lib/zoneminder
+ fowners -R apache:apache /var/lib/zoneminder
+ dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
+ dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
+
+ # bug 523058
+ keepdir ${MY_ZM_WEBDIR}/temp
+ fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
+
+ # the configuration file
+ fperms 0640 /etc/zm.conf
+ fowners root:apache /etc/zm.conf
+
+ # init scripts etc
+ newinitd "${FILESDIR}"/init.d zoneminder
+ newconfd "${FILESDIR}"/conf.d zoneminder
+
+ cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+ sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
+
+ dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
+
+ perl_delete_packlist
+
+ readme.gentoo_src_install
+}
+
+pkg_postinst() {
+ local myold=${REPLACING_VERSIONS}
+ [ "${myold}" = ${PV} ] || elog "You have upgraded zoneminder and may have to upgrade your database now."
+}