diff --git a/app-admin/keepass/keepass-2.34-r1.ebuild b/app-admin/keepass/keepass-2.34-r1.ebuild
new file mode 100644
index 000000000000..b790b54c4dac
--- /dev/null
+++ b/app-admin/keepass/keepass-2.34-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils mono-env multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Force text mode for >grep-2.21 (bug #574480)
+ epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch"
+
+ # Remove Windows-specific things
+ pushd Build > /dev/null || die
+ . PrepMonoDev.sh || die
+ popd > /dev/null || die
+
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass
+ epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+ # bug # 558094
+ if has_version ">=dev-lang/mono-4" ; then
+ sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+ sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+ fi
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto /usr/share/${PN}/XSL
+ doins Ext/XSL/*
+
+ insinto /usr/$(get_libdir)/${PN}/
+ exeinto /usr/$(get_libdir)/${PN}/
+ doins Ext/KeePass.exe.config
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages/
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this realllllly sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-admin/logcheck/logcheck-1.3.15-r1.ebuild b/app-admin/logcheck/logcheck-1.3.15-r1.ebuild
index 9fa7be737e5e..d0cf98dff9f7 100644
--- a/app-admin/logcheck/logcheck-1.3.15-r1.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -41,6 +41,6 @@ src_install() {
pkg_postinst() {
chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
- elog "Please read the guide ad https://www.gentoo.org/doc/en/logcheck.xml"
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
elog "for installation instructions."
}
diff --git a/app-admin/logcheck/logcheck-1.3.15-r2.ebuild b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
index e199c0d797ec..7f6dc7645648 100644
--- a/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -47,6 +47,6 @@ src_install() {
pkg_postinst() {
chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
- elog "Please read the guide ad https://www.gentoo.org/doc/en/logcheck.xml"
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
elog "for installation instructions."
}
diff --git a/app-admin/logcheck/logcheck-1.3.16.ebuild b/app-admin/logcheck/logcheck-1.3.16.ebuild
index cb630c591628..e68b56fea640 100644
--- a/app-admin/logcheck/logcheck-1.3.16.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -47,6 +47,6 @@ src_install() {
pkg_postinst() {
chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
- elog "Please read the guide ad https://www.gentoo.org/doc/en/logcheck.xml"
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
elog "for installation instructions."
}
diff --git a/app-admin/logcheck/logcheck-1.3.17.ebuild b/app-admin/logcheck/logcheck-1.3.17.ebuild
index a12bcda7472e..3e287860751f 100644
--- a/app-admin/logcheck/logcheck-1.3.17.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -47,6 +47,6 @@ src_install() {
pkg_postinst() {
chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
- elog "Please read the guide ad https://www.gentoo.org/doc/en/logcheck.xml"
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
elog "for installation instructions."
}
diff --git a/app-admin/logstash-bin/files/logstash.confd2 b/app-admin/logstash-bin/files/logstash.confd2
new file mode 100644
index 000000000000..dd861d0633f3
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd2
@@ -0,0 +1,37 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# pidfiles location
+#LS_PIDFILE=/run/logstash/logstash.pid
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd4 b/app-admin/logstash-bin/files/logstash.initd4
new file mode 100644
index 000000000000..b9e9055ea779
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd4
@@ -0,0 +1,73 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+ --chdir ${LS_HOME}
+ --nicelevel ${LS_NICE}
+ --env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+ --env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+ --env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+ if [ ! -f ${LS_CONF_DIR}/* ]; then
+ eerror "Please put your configuration in ${LS_CONF_DIR}"
+ exit 1
+ fi
+
+ ebegin "Checking your configuration"
+ ${command} ${command_args} --config.test_and_exit
+ eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ rc_ulimit="-n ${LS_OPEN_FILES}"
+
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_INSTALL_DIR}/data"
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_LOG_DIR}"
+ checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_DIR}/logstash-plain.log"
+}
+
+stop() {
+ ebegin "Stopping logstash"
+ if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+ start-stop-daemon --stop \
+ --pidfile=${pidfile} \
+ --retry=TERM/5/KILL/5
+ else
+ start-stop-daemon --stop \
+ --pidfile=${pidfile}
+ fi
+}
diff --git a/app-admin/logstash-bin/logstash-bin-5.0.1-r1.ebuild b/app-admin/logstash-bin/logstash-bin-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..6bd8d2c8d96b
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.0.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ doins "${FILESDIR}/agent.conf.sample"
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+}
+
+pkg_postinst() {
+ ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
+ ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
+ ewarn "/etc/conf.d/${MY_PN}"
+ einfo
+ einfo "Getting started with logstash:"
+ einfo " https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+ einfo ""
+ einfo "Packages that might be interesting:"
+ einfo " app-misc/elasticsearch"
+ einfo " dev-python/elasticsearch-curator"
+ einfo " www-apps/kibana-bin"
+}
diff --git a/app-arch/pigz/pigz-2.3.4.ebuild b/app-arch/pigz/pigz-2.3.4.ebuild
index d66c1c266e6d..4a2265e14b3c 100644
--- a/app-arch/pigz/pigz-2.3.4.ebuild
+++ b/app-arch/pigz/pigz-2.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~mips ~sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
IUSE="static symlink test"
LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
diff --git a/app-arch/unrar/unrar-5.4.5.ebuild b/app-arch/unrar/unrar-5.4.5.ebuild
index 4b23b9998020..c2c72e4dfe8c 100644
--- a/app-arch/unrar/unrar-5.4.5.ebuild
+++ b/app-arch/unrar/unrar-5.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-backup/obnam/obnam-1.18.2-r2.ebuild b/app-backup/obnam/obnam-1.18.2-r2.ebuild
index dc2efb705dad..ce4caf8eeb05 100644
--- a/app-backup/obnam/obnam-1.18.2-r2.ebuild
+++ b/app-backup/obnam/obnam-1.18.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -41,11 +41,3 @@ src_install() {
doins "${FILESDIR}"/obnam.conf
keepdir /var/log/obnam
}
-
-pkg_postinst() {
- if [[ $REPLACING_VERSIONS < "1.2" ]]; then
- elog "You will need to setup a config file before running obnam for the first time."
- elog "For details, please see the obnam(1) manual page."
- elog "An example file has been installed as /etc/obnam.conf for your convenience."
- fi
-}
diff --git a/app-backup/obnam/obnam-1.19.1.ebuild b/app-backup/obnam/obnam-1.19.1.ebuild
index fe090cbe7750..46d86fb0af07 100644
--- a/app-backup/obnam/obnam-1.19.1.ebuild
+++ b/app-backup/obnam/obnam-1.19.1.ebuild
@@ -41,11 +41,3 @@ src_install() {
doins "${FILESDIR}"/obnam.conf
keepdir /var/log/obnam
}
-
-pkg_postinst() {
- if [[ $REPLACING_VERSIONS < "1.2" ]]; then
- elog "You will need to setup a config file before running obnam for the first time."
- elog "For details, please see the obnam(1) manual page."
- elog "An example file has been installed as /etc/obnam.conf for your convenience."
- fi
-}
diff --git a/app-backup/obnam/obnam-1.20.ebuild b/app-backup/obnam/obnam-1.20.ebuild
index fe090cbe7750..46d86fb0af07 100644
--- a/app-backup/obnam/obnam-1.20.ebuild
+++ b/app-backup/obnam/obnam-1.20.ebuild
@@ -41,11 +41,3 @@ src_install() {
doins "${FILESDIR}"/obnam.conf
keepdir /var/log/obnam
}
-
-pkg_postinst() {
- if [[ $REPLACING_VERSIONS < "1.2" ]]; then
- elog "You will need to setup a config file before running obnam for the first time."
- elog "For details, please see the obnam(1) manual page."
- elog "An example file has been installed as /etc/obnam.conf for your convenience."
- fi
-}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 80e13a9dc919..eed951ec3c94 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,5 +1,3 @@
DIST containerd-0.2.0.tar.gz 635248 SHA256 1462e0c233763800b91ac2a670d82994ba1988560928e153f751fb1c0a6608c0 SHA512 381c0a21733fb79e90364649b46cbdadbc32d07245bd7a320465f6619ee5895e9552b7cc4393cb8d409295a7b867b7e461c079715cf1938e6313d4b888d81518 WHIRLPOOL d4e70a8be832227be671c13b77242a790cdf8645ff294c31d72e8cf01de2b30b9d78c691a156624adb004de42af6f133cb88b46aff37a33bc94d72bf87a0ee8a
-DIST containerd-0.2.2.tar.gz 635882 SHA256 a21efc7ea4bb97306ae9807caadca6782358679f38d3afd606cb599b6853bc52 SHA512 db6111984ccce01e928d46f0a22aaeed8d0eb50c2578df4e0cd5f56f43f8bdea43aad3203c2afb743ccf82908bd5961792681eafe07818a4057ca5f5f31c5396 WHIRLPOOL ce80bf79970faeacc3329cb4e365973a88539508904003da3d0f32afce9966e89bdf13a8894657e1fd983392cf2ab88b053393cbbc2018f509d9cbc57ab835cc
-DIST containerd-0.2.3.tar.gz 997239 SHA256 247c459179b451cb235354d3f23876ad1a326a6bda430608f9306beeb0364287 SHA512 f850ea7558a3c772930d42352d7913ec00ec24536676720f8872153ec87b92785259645648d885bb5b27514ca01de7f207a931665c3074e787d8b74b48c51952 WHIRLPOOL ac5f5f38ce874146571017bb5ac0229af43782ccf7eb378c6c39ecfb4725cf6941a12a1b05b9a6840a75c85599a881d429eaea030148356a36d2b401874e01e4
DIST containerd-0.2.4.tar.gz 1002344 SHA256 34805aef6300fbf37adcf4362a2315fac1ea57a9ceb8b0c7b1a0859cba975428 SHA512 f35d8d31cc76c1bf3dcbe25178868ce64624e6032756813e13222816155c10941abdaf7ba0558297f87557336a6e3d07eda06dbfd1099ee8de328f1ecc93c413 WHIRLPOOL 1f3c4b2f5a9e0d2265ec2d4162ff1a4b609ba28d3a94794e1a73129c070a240fd6ee9a3c2cfdcd76ff2fe378a7549b390cacb34e2ed7915fa5a304bb84b397c7
DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4
diff --git a/app-emulation/containerd/containerd-0.2.2.ebuild b/app-emulation/containerd/containerd-0.2.2.ebuild
deleted file mode 100644
index 86b0d911d175..000000000000
--- a/app-emulation/containerd/containerd-0.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-EGO_PN="github.com/docker/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_/-}"
- EGIT_COMMIT="v${MY_PV}"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+seccomp"
-
-DEPEND=""
-RDEPEND="
- =app-emulation/runc-0.1.1*
- seccomp? ( sys-libs/libseccomp )
-"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_compile() {
- local options=( $(usex seccomp "seccomp") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS= emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
- dobin bin/containerd* bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-0.2.3.ebuild b/app-emulation/containerd/containerd-0.2.3.ebuild
deleted file mode 100644
index 583f6783b1ed..000000000000
--- a/app-emulation/containerd/containerd-0.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-EGO_PN="github.com/docker/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_/-}"
- EGIT_COMMIT="v${MY_PV}"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/runc-1.0.0_rc1
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_compile() {
- local options=( $(usex seccomp "seccomp") )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS= emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
- dobin bin/containerd* bin/ctr
-}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 0bfefbcbaca9..b246e8ff46a8 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,6 +1,5 @@
DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
DIST docker-1.12.3.tar.gz 13678274 SHA256 cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 SHA512 8577bcfe892d1fae6ca4edcd72c1a1c0a223ea3e322f3b63674dcb4833605c2dd2365cf376e4e08c0a900db50a927aaa0518ceb25f9542fe30c52a28903b0201 WHIRLPOOL 853f0a55836d4a34010f87399e875b9402703f1fb665e760255b198da6a68417c50b162cffe65e2c704e076be0520e3ecdb1418749cd3ddf63f426851bc0fbde
-DIST docker-1.12.4.tar.gz 13688795 SHA256 7028c71bc08b18256b79b6bca83f860d3214cc466d3f36c18220bab86e862b83 SHA512 b47ecb73c3e08acc19be5157ba6b49b84d0e17dd22c9f8638c54f853336fcd79eda462b1285b8148b708e1a4f890dd9266f1c8d4b66d5d997d905f8893872dd6 WHIRLPOOL 22391a91b95e0baa9609ab3056039cc705d24fd505882bd73fc781acd33716e301a0c4c421f29cee0e681b4ce048275951c28fac4e7d488b5c1b0b9cefadaa2d
DIST docker-1.12.5.tar.gz 13693501 SHA256 81b337368efafb631a75f6ad5469413fd5828ce672592c374adf894dc05abd38 SHA512 a116f6c7ae83c21a0560b7860872f55d095687bf276685e78ebfaec5d63b6108fb1553ea0f5ea9d143bd495a4b213398a4d1032b6f4f4fb29b6e8c07c509deb2 WHIRLPOOL 8cf85f3954926491996b304bb0b4a136813e78039facf192222fed0d6d054853f6b6dfa221962fb3731884a4d1e01f3a34516b7d64eff4a74365de442faacf3c
-DIST docker-1.13.0_rc2.tar.gz 7708479 SHA256 290ecfbcdf117b4358be383243294c35bfc46ee4321d1e5f44ee2e48299c5104 SHA512 f8910a29166a9356a41b4ac744ef97bd3dfbaf302ebb756e97a737081d8ac16f81f9a017741f8cd2f134a481316364e74f69f7bd8794b470a077f447a7d42aff WHIRLPOOL ac7edb8af35af107344c41f34bf150208c41497f16d0394004b33788cdb8b8adb774b2158c8ea68bdd6d623639a2f62cb6e8180c07318a0a41ed53132fc63818
DIST docker-1.13.0_rc3.tar.gz 7722545 SHA256 4180849430a43b310d6c3e5cfe3d49bd2e12b3807c6de4a3ea93eb194851339b SHA512 d7b515411b8bcaa5da6846c0d5db722f99d9f81a5a336f503cf2f62ab7bd7f921a9ccd7ccbd1090e385b14a003564709c54673b7074dcbb905c8342c23a93699 WHIRLPOOL 4dc2f0c425e86dd12a854c5a268c3deff490c1786491e646d94188760b3241a0cbf0943091133290c9fd5bf754b6040ecbb6fa1b342574607d2620d7fcd30be9
+DIST docker-1.13.0_rc4.tar.gz 7734320 SHA256 1dedaf5171da17e71b51e5c2fec137dd379096a66be02473f7a2625f3e537aee SHA512 ced0fba2ef279db6061ed07c79e13912fc2af23a3736f5fd41ae7af23fe219b39c9461b878c0e68e40f22af2f4901f1b25466451a36c4f207e2070fa5715af7c WHIRLPOOL 42a33357ea821f772bc9ead821067314809858d00a475378c48aec8eb88ed8c4541a48d43e4b87221ef35c1254e1a9b97610dd12f154c29ea347f4cc2478e490
diff --git a/app-emulation/docker/docker-1.12.4.ebuild b/app-emulation/docker/docker-1.12.4.ebuild
deleted file mode 100644
index b2f46586311d..000000000000
--- a/app-emulation/docker/docker-1.12.4.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker"
-
-if [[ ${PV} = *9999* ]]; then
- # Docker cannot be fetched via "go get", thanks to autogenerated code
- EGIT_REPO_URI="https://${EGO_PN}.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
- inherit git-r3
-else
- MY_PV="${PV/_/-}"
- DOCKER_GITCOMMIT="1564f02"
- EGIT_COMMIT="v${MY_PV}"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
- inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +device-mapper experimental hardened overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
- >=dev-db/sqlite-3.7.9:3
- device-mapper? (
- >=sys-fs/lvm2-2.02.89[thin]
- )
- seccomp? ( >=sys-libs/libseccomp-2.2.1 )
- apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
- ${CDEPEND}
-
- dev-go/go-md2man
-
- btrfs? (
- >=sys-fs/btrfs-progs-3.8
- )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
- ${CDEPEND}
-
- !app-emulation/docker-bin
- >=net-firewall/iptables-1.4
- sys-process/procps
- >=dev-vcs/git-1.7
- >=app-arch/xz-utils-4.9
-
- >app-emulation/containerd-0.2.2
- app-emulation/runc[apparmor?,seccomp?]
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
- ~KEYS
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
- ~NF_NAT ~NF_NAT_NEEDED
- ~POSIX_MQUEUE
-
- ~USER_NS
- ~SECCOMP
- ~CGROUP_PIDS
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
- ~CGROUP_PERF
- ~CGROUP_HUGETLB
- ~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT
-
- ~VXLAN
- ~XFRM_ALGO ~XFRM_USER
- ~IPVLAN
- ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
- if kernel_is lt 3 10; then
- ewarn ""
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
- fi
-
- # for where these kernel versions come from, see:
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
- if ! {
- kernel_is ge 3 16 \
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
- || { kernel_is 3 12 && kernel_is ge 3 12 25; }
- }; then
- ewarn ""
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
- ewarn ""
- ewarn "See also https://github.com/docker/docker/issues/2960"
- fi
-
- if kernel_is le 3 18; then
- CONFIG_CHECK+="
- ~RESOURCE_COUNTERS
- "
- fi
-
- if kernel_is le 3 13; then
- CONFIG_CHECK+="
- ~NETPRIO_CGROUP
- "
- else
- CONFIG_CHECK+="
- ~CGROUP_NET_PRIO
- "
- fi
-
- if kernel_is lt 4 5; then
- CONFIG_CHECK+="
- ~MEMCG_KMEM
- "
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
- fi
-
- if kernel_is lt 4 7; then
- CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES
- "
- fi
-
- if use aufs; then
- CONFIG_CHECK+="
- ~AUFS_FS
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
- fi
-
- if use btrfs; then
- CONFIG_CHECK+="
- ~BTRFS_FS
- ~BTRFS_FS_POSIX_ACL
- "
- fi
-
- if use device-mapper; then
- CONFIG_CHECK+="
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- fi
-
- if use overlay; then
- CONFIG_CHECK+="
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
- "
- fi
-
- linux-info_pkg_setup
-
- # create docker group for the code checking for it in /etc/group
- enewgroup docker
-}
-
-src_compile() {
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
-
- # setup CFLAGS and LDFLAGS for separate build target
- # see https://github.com/tianon/docker-overlay/pull/10
- export CGO_CFLAGS="-I${ROOT}/usr/include"
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
- # if we're building from a tarball, we need the GITCOMMIT value
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
- if use hardened; then
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
- -i hack/make/dynbinary-client || die
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
- -i hack/make/dynbinary-daemon || die
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
- grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
- fi
-
- # let's set up some optional features :)
- export DOCKER_BUILDTAGS=''
- for gd in aufs btrfs device-mapper overlay; do
- if ! use $gd; then
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
- fi
- done
-
- for tag in apparmor seccomp; do
- if use $tag; then
- DOCKER_BUILDTAGS+=" $tag"
- fi
- done
-
- # https://github.com/docker/docker/pull/13338
- if use experimental; then
- export DOCKER_EXPERIMENTAL=1
- else
- unset DOCKER_EXPERIMENTAL
- fi
-
- # time to build!
- ./hack/make.sh dynbinary || die 'dynbinary failed'
-
- # build the man pages too
- ./man/md2man-all.sh || die "unable to generate man pages"
-}
-
-src_install() {
- VERSION="$(cat VERSION)"
- newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
- newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
- newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
- dosym containerd /usr/bin/docker-containerd
- dosym containerd-shim /usr/bin/docker-containerd-shim
- dosym runc /usr/bin/docker-runc
-
- newinitd contrib/init/openrc/docker.initd docker
- newconfd contrib/init/openrc/docker.confd docker
-
- systemd_dounit contrib/init/systemd/docker.{service,socket}
-
- udev_dorules contrib/udev/*.rules
-
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
- dodoc -r docs/*
- doman man/man*/*
-
- dobashcomp contrib/completion/bash/*
-
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/_*
-
- insinto /usr/share/vim/vimfiles
- doins -r contrib/syntax/vim/ftdetect
- doins -r contrib/syntax/vim/syntax
-
- # note: intentionally not using "doins" so that we preserve +x bits
- dodir /usr/share/${PN}/contrib
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
- udev_reload
-
- elog
- elog "To use Docker, the Docker daemon must be running as root. To automatically"
- elog "start the Docker daemon at boot, add Docker to the default runlevel:"
- elog " rc-update add docker default"
- elog "Similarly for systemd:"
- elog " systemctl enable docker.service"
- elog
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
- elog " usermod -aG docker youruser"
- elog
-}
diff --git a/app-emulation/docker/docker-1.13.0_rc2.ebuild b/app-emulation/docker/docker-1.13.0_rc4.ebuild
similarity index 99%
rename from app-emulation/docker/docker-1.13.0_rc2.ebuild
rename to app-emulation/docker/docker-1.13.0_rc4.ebuild
index d2aae5bbfec8..b7b934e4c229 100644
--- a/app-emulation/docker/docker-1.13.0_rc2.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
MY_PV="${PV/_/-}"
- DOCKER_GITCOMMIT="1f9b3ef"
+ DOCKER_GITCOMMIT="88862e7"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 9c0b7dca214a..4d3e3e09d8a1 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,3 @@
-DIST runc-0.0.2.tar.gz 370712 SHA256 3d0aa68ebb1622853d0bbed432ebd4b6c9ef210881ac74f3a695b4e914d246dc SHA512 e0a44d5dd8a1b8eaeaf7d466cebc7dc8beaa26f49bd0e76d3a955cef9c5c266d2afe6652f28fa905a408b5b93966f52e345112fa7aef373216561ad7069181c5 WHIRLPOOL e7ed1ee3d159a81fb0b2b0f5fac9a9a66116035babc88f6f266a6c8455953ce372e93351baf7c621c42ab8c5907961fd899b1d158e7f7b1335f83fcef7252c71
-DIST runc-0.0.5.tar.gz 441874 SHA256 e80323412883e4afcfcf8e1b2eaefdcb74632628d02fd7f48618caf78e5e4aa0 SHA512 625d67ec02e23c66a3d1a97113a0c58f3f200404866839556bc3cd5b3e34342230b8091613d17ef4a38d05ca51df586cd7366dc6bddeeddd6b69bb9a2ae7efda WHIRLPOOL 862b08621b67fc57286940ad5e20557d90cfef63aae5be0a90fc6f5b764d032b187ba5ad5dcb1fa99fb5ec59d6217941aa19ca9048637bd02b64e52c8cecdce6
DIST runc-0.1.0.tar.gz 496358 SHA256 681d6d89541ae2e06757f999a242a1f97bbcb1ad6e10f4cdee287ec4a9d2bff9 SHA512 8a9ff02b0161eda0a730194b0fbf7ad76e8f379992e74061ef49302da3492fd0c53f06db9153ded4d934d67bbf6f4291d6154254f1b924ef73c97c44cd14ffcf WHIRLPOOL 81f488a4f1e23e8704a9fa8404965b2f12f74a875ba8e67dc15de93f43b075dc538cd0d89c7a1187cb74ac6320317b5985855945fb8bf8f749d6736df47b844a
DIST runc-0.1.1.tar.gz 496416 SHA256 f9955daed1e73e842b2f28a258fba51f4e72a6b4b64cc3fc06415481d55ce000 SHA512 074482636fd2342c490c450d7a379cd14cd6c7b1ec6109cf729c4b451cc8cfb0e6b286d0df8e0cc0dba7b24d63d12bd5978013e08301a785db5e4280c595fdaa WHIRLPOOL f605e70d2bea88b5ba10f6375543824167509630cc3ed839575d5e0d3b05bb07edcac8fcee168aa3ae89adaf0ccf5ab816a201b27022ddcf31fd0218bd59c357
DIST runc-1.0.0_rc2.tar.gz 550449 SHA256 638742c48426b9a3281aeb619e27513d972de228bdbd43b478baea99c186d491 SHA512 83a3d45efbb86d3d583b96062202b9e60121d250af2c0dd37d07fda574b642aa6f05e29cac6644ad3d624647400db694082e280383e41ca9f31dc0a33b87ed76 WHIRLPOOL 990a45739689db80bbeed43b0fd3a4ce4d0563ea833361b9112e750782313f19e638c4bfbd455f5dd1882d64c724dcf0213701322029c2c9f98f624863c744f3
diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
index f69f23e99a54..5a682ed8ba1f 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@@ -13,6 +13,10 @@
williamh@gentoo.org
William Hubbs
+
+ mrueg@gentoo.org
+ Manuel Rüger
+